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/2] 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/2] =?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: '分割线颜色',