From 24487d5892ff02e7bf0d6fd6c26dd499207f8e86 Mon Sep 17 00:00:00 2001 From: Raod <1130305001@qq.com> Date: Tue, 29 Jun 2021 15:33:44 +0800 Subject: [PATCH 1/7] widget --- report-ui/src/views/report/bigscreen/designer/widget/temp.vue | 4 ++++ .../src/views/report/bigscreen/designer/widget/widget.vue | 3 ++- .../designer/widget/widgetUniversalComponentsChart.vue | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 report-ui/src/views/report/bigscreen/designer/widget/widgetUniversalComponentsChart.vue diff --git a/report-ui/src/views/report/bigscreen/designer/widget/temp.vue b/report-ui/src/views/report/bigscreen/designer/widget/temp.vue index 5b7b5d3a..0386f8c9 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/temp.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/temp.vue @@ -22,10 +22,12 @@ import WidgetIframe from './widgetIframe.vue' import widgetBarchart from './widgetBarchart.vue' import widgetLinechart from './widgetLinechart.vue' import widgetBarlinechart from './widgetBarlinechart' +import widgetGradientColorBarchart from "./bar/widgetGradientColorBarchart.vue"; import WidgetPiechart from './widgetPiechart.vue' import WidgetHollowPiechart from './widgetHollowPiechart.vue' import WidgetFunnel from './widgetFunnel.vue' import WidgetGauge from './widgetGauge.vue' +import WidgetPieNightingaleRoseArea from "./pie/widgetPieNightingaleRoseArea"; export default { name: 'WidgetTemp', components: { @@ -38,12 +40,14 @@ export default { widgetVideo, WidgetIframe, widgetBarchart, + widgetGradientColorBarchart, widgetLinechart, widgetBarlinechart, WidgetPiechart, WidgetHollowPiechart, WidgetFunnel, WidgetGauge, + WidgetPieNightingaleRoseArea }, model: { prop: 'value', diff --git a/report-ui/src/views/report/bigscreen/designer/widget/widget.vue b/report-ui/src/views/report/bigscreen/designer/widget/widget.vue index bdfd65f9..dcdbba5f 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/widget.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/widget.vue @@ -101,7 +101,8 @@ export default { return this.value.position.zIndex || 1; } }, - mounted() {}, + mounted() { + }, methods: { handleFocus({ index, left, top, width, height }) {}, handleBlur({ index, left, top, width, height }) { diff --git a/report-ui/src/views/report/bigscreen/designer/widget/widgetUniversalComponentsChart.vue b/report-ui/src/views/report/bigscreen/designer/widget/widgetUniversalComponentsChart.vue new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/report-ui/src/views/report/bigscreen/designer/widget/widgetUniversalComponentsChart.vue @@ -0,0 +1 @@ + From 47ce20b46b10f70f622fa25a29429dba7d58ecee Mon Sep 17 00:00:00 2001 From: Raod <1130305001@qq.com> Date: Tue, 29 Jun 2021 15:37:10 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=88=86=E5=89=B2=E7=BA=BF=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/report/bigscreen/designer/tools.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/report-ui/src/views/report/bigscreen/designer/tools.js b/report-ui/src/views/report/bigscreen/designer/tools.js index 6d67f96a..556991e6 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools.js +++ b/report-ui/src/views/report/bigscreen/designer/tools.js @@ -1178,7 +1178,7 @@ const widgetTools = [ name: 'isShowSplitLineX', require: false, placeholder: '', - value: true, + value: false, }, { type: 'vue-color', @@ -1263,7 +1263,7 @@ const widgetTools = [ name: 'isShowSplitLineY', require: false, placeholder: '', - value: true, + value: false, }, { type: 'vue-color', label: '分割线颜色', @@ -1762,7 +1762,7 @@ const widgetTools = [ name: 'isShowSplitLineX', require: false, placeholder: '', - value: true, + value: false, }, { type: 'vue-color', @@ -1848,7 +1848,7 @@ const widgetTools = [ name: 'isShowSplitLineY', require: false, placeholder: '', - value: true, + value: false, }, { type: 'vue-color', label: '分割线颜色', @@ -2267,7 +2267,7 @@ const widgetTools = [ name: 'isShowSplitLineX', require: false, placeholder: '', - value: true, + value: false, }, { type: 'vue-color', @@ -2353,7 +2353,7 @@ const widgetTools = [ name: 'isShowSplitLineY', require: false, placeholder: '', - value: true, + value: false, }, { type: 'vue-color', label: '分割线颜色', @@ -2928,7 +2928,7 @@ const widgetTools = [ name: 'isShowSplitLineX', require: false, placeholder: '', - value: true, + value: false, }, { type: 'vue-color', @@ -3014,7 +3014,7 @@ const widgetTools = [ name: 'isShowSplitLineY', require: false, placeholder: '', - value: true, + value: false, }, { type: 'vue-color', label: '分割线颜色', From 15c09ee9d576968e637fac59441533ba4ea60239 Mon Sep 17 00:00:00 2001 From: yanzili <978387851@qq.com> Date: Tue, 29 Jun 2021 15:38:25 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=88=86=E5=89=B2=E7=BA=BF=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/report/bigscreen/designer/tools.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/report-ui/src/views/report/bigscreen/designer/tools.js b/report-ui/src/views/report/bigscreen/designer/tools.js index 6d67f96a..556991e6 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools.js +++ b/report-ui/src/views/report/bigscreen/designer/tools.js @@ -1178,7 +1178,7 @@ const widgetTools = [ name: 'isShowSplitLineX', require: false, placeholder: '', - value: true, + value: false, }, { type: 'vue-color', @@ -1263,7 +1263,7 @@ const widgetTools = [ name: 'isShowSplitLineY', require: false, placeholder: '', - value: true, + value: false, }, { type: 'vue-color', label: '分割线颜色', @@ -1762,7 +1762,7 @@ const widgetTools = [ name: 'isShowSplitLineX', require: false, placeholder: '', - value: true, + value: false, }, { type: 'vue-color', @@ -1848,7 +1848,7 @@ const widgetTools = [ name: 'isShowSplitLineY', require: false, placeholder: '', - value: true, + value: false, }, { type: 'vue-color', label: '分割线颜色', @@ -2267,7 +2267,7 @@ const widgetTools = [ name: 'isShowSplitLineX', require: false, placeholder: '', - value: true, + value: false, }, { type: 'vue-color', @@ -2353,7 +2353,7 @@ const widgetTools = [ name: 'isShowSplitLineY', require: false, placeholder: '', - value: true, + value: false, }, { type: 'vue-color', label: '分割线颜色', @@ -2928,7 +2928,7 @@ const widgetTools = [ name: 'isShowSplitLineX', require: false, placeholder: '', - value: true, + value: false, }, { type: 'vue-color', @@ -3014,7 +3014,7 @@ const widgetTools = [ name: 'isShowSplitLineY', require: false, placeholder: '', - value: true, + value: false, }, { type: 'vue-color', label: '分割线颜色', From 13615d89dc23fe4f5546491d277c222af7509028 Mon Sep 17 00:00:00 2001 From: yanzili <978387851@qq.com> Date: Tue, 29 Jun 2021 15:40:19 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=A0=87=E9=A2=98=E8=83=8C=E6=99=AF?= =?UTF-8?q?=E9=80=8F=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- report-ui/src/views/report/bigscreen/designer/tools.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/report-ui/src/views/report/bigscreen/designer/tools.js b/report-ui/src/views/report/bigscreen/designer/tools.js index 556991e6..5ac74271 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools.js +++ b/report-ui/src/views/report/bigscreen/designer/tools.js @@ -121,7 +121,7 @@ const widgetTools = [ name: 'background', required: false, placeholder: '', - value: 'rgba(115,170,229,.1)', + value: 'rgba(115,170,229,.0)', }, { type: 'el-select', 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 5/7] =?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 6/7] 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' }], }, ], }, From b81a7ed8d78f5074fc6e87681836b6cc9da64cbf Mon Sep 17 00:00:00 2001 From: yanzili <978387851@qq.com> Date: Tue, 29 Jun 2021 15:47:01 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E9=80=89=E4=B8=AD=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- report-ui/src/assets/styles/element-ui.scss | 9 ++++----- report-ui/src/views/report/bigscreen/designer/index.vue | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/report-ui/src/assets/styles/element-ui.scss b/report-ui/src/assets/styles/element-ui.scss index 7932c3ba..3d1aa712 100644 --- a/report-ui/src/assets/styles/element-ui.scss +++ b/report-ui/src/assets/styles/element-ui.scss @@ -24,14 +24,13 @@ margin: 0 auto; .el-dialog__header{ - background-color: #fff; - color: #333; - border-bottom: 1px solid #eee; + background-color: rgb(48, 77, 167); + color: #fff; .el-dialog__title{ - color: #333; + color: #fff; } .el-dialog__headerbtn i { - color: #333; + color: #fff; } } } diff --git a/report-ui/src/views/report/bigscreen/designer/index.vue b/report-ui/src/views/report/bigscreen/designer/index.vue index e14d3b5f..24e7a4ee 100644 --- a/report-ui/src/views/report/bigscreen/designer/index.vue +++ b/report-ui/src/views/report/bigscreen/designer/index.vue @@ -641,8 +641,8 @@ export default {