From 09bbb8e43414fef3084232bce09ceb95dedaffc1 Mon Sep 17 00:00:00 2001 From: Raod <1130305001@qq.com> Date: Tue, 29 Jun 2021 15:40:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=B7=E6=96=B0=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/report/bigscreen/designer/tools.js | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/report-ui/src/views/report/bigscreen/designer/tools.js b/report-ui/src/views/report/bigscreen/designer/tools.js index 556991e6..0406e8d7 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools.js +++ b/report-ui/src/views/report/bigscreen/designer/tools.js @@ -1939,6 +1939,14 @@ const widgetTools = [ ], value: 'staticData', }, + { + type: 'el-input-number', + label: '刷新时间(毫秒)', + name: 'refreshTime', + relactiveDom: 'dataType', + relactiveDomValue: 'dynamicData', + value: 5000 + }, { type: 'el-button', label: '静态数据', @@ -2574,6 +2582,14 @@ const widgetTools = [ ], value: 'staticData', }, + { + type: 'el-input-number', + label: '刷新时间(毫秒)', + name: 'refreshTime', + relactiveDom: 'dataType', + relactiveDomValue: 'dynamicData', + value: 5000 + }, { type: 'el-button', label: '静态数据', @@ -3186,6 +3202,14 @@ const widgetTools = [ ], value: 'staticData', }, + { + type: 'el-input-number', + label: '刷新时间(毫秒)', + name: 'refreshTime', + relactiveDom: 'dataType', + relactiveDomValue: 'dynamicData', + value: 5000 + }, { type: 'el-button', label: '静态数据', @@ -3559,6 +3583,14 @@ const widgetTools = [ ], value: 'staticData', }, + { + type: 'el-input-number', + label: '刷新时间(毫秒)', + name: 'refreshTime', + relactiveDom: 'dataType', + relactiveDomValue: 'dynamicData', + value: 5000 + }, { type: 'el-button', label: '静态数据', @@ -3933,6 +3965,14 @@ const widgetTools = [ ], value: 'staticData', }, + { + type: 'el-input-number', + label: '刷新时间(毫秒)', + name: 'refreshTime', + relactiveDom: 'dataType', + relactiveDomValue: 'dynamicData', + value: 5000 + }, { type: 'el-button', label: '静态数据', @@ -4299,6 +4339,14 @@ const widgetTools = [ ], value: 'staticData', }, + { + type: 'el-input-number', + label: '刷新时间(毫秒)', + name: 'refreshTime', + relactiveDom: 'dataType', + relactiveDomValue: 'dynamicData', + value: 5000 + }, { type: 'el-button', label: '静态数据', @@ -4444,6 +4492,14 @@ const widgetTools = [ ], value: 'staticData', }, + { + type: 'el-input-number', + label: '刷新时间(毫秒)', + name: 'refreshTime', + relactiveDom: 'dataType', + relactiveDomValue: 'dynamicData', + value: 5000 + }, { type: 'el-button', label: '静态数据', @@ -4824,6 +4880,14 @@ const widgetTools = [ ], value: 'staticData', }, + { + type: 'el-input-number', + label: '刷新时间(毫秒)', + name: 'refreshTime', + relactiveDom: 'dataType', + relactiveDomValue: 'dynamicData', + value: 5000 + }, { type: 'el-button', label: '静态数据', From bcec99454f0437142034304523d4697ee5618454 Mon Sep 17 00:00:00 2001 From: Raod <1130305001@qq.com> Date: Tue, 29 Jun 2021 15:45:55 +0800 Subject: [PATCH 2/2] color --- report-ui/src/views/report/bigscreen/designer/tools.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/report-ui/src/views/report/bigscreen/designer/tools.js b/report-ui/src/views/report/bigscreen/designer/tools.js index 650cb443..9504e6b9 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools.js +++ b/report-ui/src/views/report/bigscreen/designer/tools.js @@ -3556,7 +3556,7 @@ const widgetTools = [ label: '', name: 'customColor', required: false, - value: [{ color: '#ED0E0E' }, { color: '#6CCD17' }, { color: '#172CCD' }, { color: '#B817CD' }, { color: '#AFCD17' }], + value: [{ color: '#0CD2E6' }, { color: '#00BFA5' }, { color: '#FFC722' }, { color: '#886EFF' }, { color: '#008DEC' }], }, ], }, @@ -3938,7 +3938,7 @@ const widgetTools = [ label: '', name: 'customColor', required: false, - value: [{ color: '#ED0E0E' }, { color: '#6CCD17' }, { color: '#172CCD' }, { color: '#B817CD' }, { color: '#AFCD17' }], + value: [{ color: '#0CD2E6' }, { color: '#00BFA5' }, { color: '#FFC722' }, { color: '#886EFF' }, { color: '#008DEC' }], }, ], },