From 93211fe5eb69eca5839e2e2592473d47ece127f3 Mon Sep 17 00:00:00 2001 From: qianming Date: Mon, 27 Sep 2021 17:20:12 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bigscreen/designer/tools/componentsJSON/widget-table.js | 6 +++--- .../views/report/bigscreen/designer/widget/widgetTable.vue | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-table.js b/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-table.js index f2a531bd..153fdb3f 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-table.js +++ b/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-table.js @@ -1,6 +1,6 @@ /* * @Descripttion: 表格json - * @version: + * @version: * @Author: qianlishi * @Date: 2021-08-29 07:16:10 * @LastEditors: qianlishi @@ -131,14 +131,14 @@ export const widgetTable = { placeholder: '', value: '#fff', }, - { +/* { type: 'vue-color', label: '表格背景', name: 'tableBgColor', require: false, placeholder: '', value: '', - }, + },*/ { type: 'vue-color', label: '奇行颜色', diff --git a/report-ui/src/views/report/bigscreen/designer/widget/widgetTable.vue b/report-ui/src/views/report/bigscreen/designer/widget/widgetTable.vue index 1fec0164..a50d46f3 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/widgetTable.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/widgetTable.vue @@ -67,7 +67,7 @@ export default { height: allStyle.height + "px", left: allStyle.left + "px", top: allStyle.top + "px", - background: this.optionsSetUp.tableBgColor + //background: this.optionsSetUp.tableBgColor }; }, headerTableStlye() { @@ -92,7 +92,7 @@ export default { "border-width": bodyStyle.borderWidth + "px", "border-color": bodyStyle.borderColor, color: bodyStyle.bodyColor, - "background-color": bodyStyle.tableBgColor + //"background-color": bodyStyle.tableBgColor }; } }, From a7ca19913429f704cfbd7761e2fb00f09c2c576b Mon Sep 17 00:00:00 2001 From: qianming Date: Mon, 27 Sep 2021 17:38:08 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../designer/tools/componentsJSON/widget-table.js | 6 +++--- .../report/bigscreen/designer/widget/widgetTable.vue | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-table.js b/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-table.js index 153fdb3f..86ac09dd 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-table.js +++ b/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-table.js @@ -131,14 +131,14 @@ export const widgetTable = { placeholder: '', value: '#fff', }, -/* { + { type: 'vue-color', - label: '表格背景', + label: '表格背景色', name: 'tableBgColor', require: false, placeholder: '', value: '', - },*/ + }, { type: 'vue-color', label: '奇行颜色', diff --git a/report-ui/src/views/report/bigscreen/designer/widget/widgetTable.vue b/report-ui/src/views/report/bigscreen/designer/widget/widgetTable.vue index a50d46f3..63e0ae5a 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/widgetTable.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/widgetTable.vue @@ -67,7 +67,7 @@ export default { height: allStyle.height + "px", left: allStyle.left + "px", top: allStyle.top + "px", - //background: this.optionsSetUp.tableBgColor + background: this.optionsSetUp.tableBgColor }; }, headerTableStlye() { @@ -92,7 +92,7 @@ export default { "border-width": bodyStyle.borderWidth + "px", "border-color": bodyStyle.borderColor, color: bodyStyle.bodyColor, - //"background-color": bodyStyle.tableBgColor + "background-color": bodyStyle.tableBgColor }; } }, @@ -215,11 +215,11 @@ export default { width: 100%; } -.txtScroll-top .infoList li:nth-child(n) { +/*.txtScroll-top .infoList li:nth-child(n) { background: rgb(0, 59, 81); } .txtScroll-top .infoList li:nth-child(2n) { background: rgb(10, 39, 50); -} +}*/ From f64063a8c9ccdf6330ce54a7e1843edcbf6b2716 Mon Sep 17 00:00:00 2001 From: Raod <1130305001@qq.com> Date: Tue, 28 Sep 2021 09:39:26 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=9B=86=E4=B8=8B=E6=8B=89=E6=A1=86=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=80=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/dataset/service/impl/DataSetServiceImpl.java | 1 + .../modules/datasource/service/impl/DataSourceServiceImpl.java | 1 + 2 files changed, 2 insertions(+) diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/service/impl/DataSetServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/service/impl/DataSetServiceImpl.java index ed529a5f..1282bfca 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/service/impl/DataSetServiceImpl.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/service/impl/DataSetServiceImpl.java @@ -302,6 +302,7 @@ public class DataSetServiceImpl implements DataSetService { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); wrapper.select(DataSet::getSetCode, DataSet::getSetName, DataSet::getSetDesc, DataSet::getId) .eq(DataSet::getEnableFlag, Enabled.YES.getValue()); + wrapper.orderByDesc(DataSet::getUpdateTime); return dataSetMapper.selectList(wrapper); } diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/impl/DataSourceServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/impl/DataSourceServiceImpl.java index 92af651a..0485a294 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/impl/DataSourceServiceImpl.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/impl/DataSourceServiceImpl.java @@ -75,6 +75,7 @@ public class DataSourceServiceImpl implements DataSourceService { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); wrapper.select(DataSource::getSourceCode, DataSource::getSourceName) .eq(DataSource::getEnableFlag, Enabled.YES.getValue()); + wrapper.orderByDesc(DataSource::getUpdateTime); return dataSourceMapper.selectList(wrapper); } From 8d9c0bb2a46217f063cf3df5f9a4e10d23244895 Mon Sep 17 00:00:00 2001 From: Raod <1130305001@qq.com> Date: Tue, 28 Sep 2021 13:16:36 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/report/datasource/components/EditDataSource.vue | 2 +- report-ui/src/views/report/excelreport/index.vue | 2 +- report-ui/src/views/report/report/index.vue | 4 +++- .../src/views/report/resultset/components/EditDataSet.vue | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/report-ui/src/views/report/datasource/components/EditDataSource.vue b/report-ui/src/views/report/datasource/components/EditDataSource.vue index 563bcb11..03a3ea63 100644 --- a/report-ui/src/views/report/datasource/components/EditDataSource.vue +++ b/report-ui/src/views/report/datasource/components/EditDataSource.vue @@ -11,7 +11,7 @@ - + diff --git a/report-ui/src/views/report/excelreport/index.vue b/report-ui/src/views/report/excelreport/index.vue index ce54af4f..2806fc4f 100644 --- a/report-ui/src/views/report/excelreport/index.vue +++ b/report-ui/src/views/report/excelreport/index.vue @@ -6,7 +6,7 @@ !-->