From 166003f1a431f4d3a1126d932cf4f0d401ea0db3 Mon Sep 17 00:00:00 2001 From: yanzili <978387851@qq.com> Date: Tue, 29 Jun 2021 14:14:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86?= 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/assets/styles/index.scss | 1 + .../views/report/bigscreen/designer/tools.js | 133 +++++++++++++++++- .../bar/widgetGradientColorBarchart.vue | 12 ++ .../pie/widgetPieNightingaleRoseArea.vue | 16 ++- .../designer/widget/widgetBarchart.vue | 16 ++- .../designer/widget/widgetBarlinechart.vue | 18 +++ .../designer/widget/widgetLinechart.vue | 12 ++ .../src/views/report/resultset/index.vue | 49 ++++++- 9 files changed, 252 insertions(+), 14 deletions(-) diff --git a/report-ui/src/assets/styles/element-ui.scss b/report-ui/src/assets/styles/element-ui.scss index 3d1aa712..7932c3ba 100644 --- a/report-ui/src/assets/styles/element-ui.scss +++ b/report-ui/src/assets/styles/element-ui.scss @@ -24,13 +24,14 @@ margin: 0 auto; .el-dialog__header{ - background-color: rgb(48, 77, 167); - color: #fff; + background-color: #fff; + color: #333; + border-bottom: 1px solid #eee; .el-dialog__title{ - color: #fff; + color: #333; } .el-dialog__headerbtn i { - color: #fff; + color: #333; } } } diff --git a/report-ui/src/assets/styles/index.scss b/report-ui/src/assets/styles/index.scss index b6a31c36..4611a1f5 100644 --- a/report-ui/src/assets/styles/index.scss +++ b/report-ui/src/assets/styles/index.scss @@ -270,6 +270,7 @@ a:hover { color:#a8e3ff } .el-input-number.is-controls-right .el-input-number__increase{ + height: 15px; border-bottom: 1px solid #3f5673; } .el-input-number.is-controls-right .el-input-number__decrease{ diff --git a/report-ui/src/views/report/bigscreen/designer/tools.js b/report-ui/src/views/report/bigscreen/designer/tools.js index 292d5034..5e9b2202 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,.5)', + value: 'rgba(115,170,229,.1)', }, { type: 'el-select', @@ -1171,6 +1171,23 @@ const widgetTools = [ required: false, placeholder: '', value: '#fff', + }, + { + type: 'el-switch', + label: '分割线显示', + name: 'isShowSplitLineX', + require: false, + placeholder: '', + value: true, + }, + { + type: 'vue-color', + label: '分割线颜色', + name: 'splitLineColorX', + required: false, + placeholder: '', + value: '#fff', + } ], }, @@ -1240,6 +1257,21 @@ const widgetTools = [ required: false, placeholder: '', value: '#fff', + }, { + type: 'el-switch', + label: '分割线显示', + name: 'isShowSplitLineY', + require: false, + placeholder: '', + value: true, + }, { + type: 'vue-color', + label: '分割线颜色', + name: 'splitLineColorY', + required: false, + placeholder: '', + value: '#fff', + } ], }, @@ -1723,6 +1755,23 @@ const widgetTools = [ required: false, placeholder: '', value: '#fff', + }, + { + type: 'el-switch', + label: '分割线显示', + name: 'isShowSplitLineX', + require: false, + placeholder: '', + value: true, + }, + { + type: 'vue-color', + label: '分割线颜色', + name: 'splitLineColorX', + required: false, + placeholder: '', + value: '#fff', + } ], }, @@ -1792,6 +1841,22 @@ const widgetTools = [ required: false, placeholder: '', value: '#fff', + }, + { + type: 'el-switch', + label: '分割线显示', + name: 'isShowSplitLineY', + require: false, + placeholder: '', + value: true, + }, { + type: 'vue-color', + label: '分割线颜色', + name: 'splitLineColorY', + required: false, + placeholder: '', + value: '#fff', + } ], }, @@ -2195,6 +2260,23 @@ const widgetTools = [ required: false, placeholder: '', value: '#fff', + }, + { + type: 'el-switch', + label: '分割线显示', + name: 'isShowSplitLineX', + require: false, + placeholder: '', + value: true, + }, + { + type: 'vue-color', + label: '分割线颜色', + name: 'splitLineColorX', + required: false, + placeholder: '', + value: '#fff', + } ], }, @@ -2264,6 +2346,22 @@ const widgetTools = [ required: false, placeholder: '', value: '#fff', + }, + { + type: 'el-switch', + label: '分割线显示', + name: 'isShowSplitLineY', + require: false, + placeholder: '', + value: true, + }, { + type: 'vue-color', + label: '分割线颜色', + name: 'splitLineColorY', + required: false, + placeholder: '', + value: '#fff', + } ], }, @@ -2823,6 +2921,23 @@ const widgetTools = [ required: false, placeholder: '', value: '#fff', + }, + { + type: 'el-switch', + label: '分割线显示', + name: 'isShowSplitLineX', + require: false, + placeholder: '', + value: true, + }, + { + type: 'vue-color', + label: '分割线颜色', + name: 'splitLineColorX', + required: false, + placeholder: '', + value: '#fff', + } ], }, @@ -2892,6 +3007,22 @@ const widgetTools = [ required: false, placeholder: '', value: '#fff', + }, + { + type: 'el-switch', + label: '分割线显示', + name: 'isShowSplitLineY', + require: false, + placeholder: '', + value: true, + }, { + type: 'vue-color', + label: '分割线颜色', + name: 'splitLineColorY', + required: false, + placeholder: '', + value: '#fff', + } ], }, diff --git a/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetGradientColorBarchart.vue b/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetGradientColorBarchart.vue index 3a1c9f4e..1fb9c19f 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetGradientColorBarchart.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetGradientColorBarchart.vue @@ -235,6 +235,12 @@ export default { color: optionsCollapse.lineColorX, }, }, + splitLine: { + show: optionsCollapse.isShowSplitLineX, + lineStyle: { + color: optionsCollapse.splitLineColorX + }, + }, } this.options.xAxis = xAxis }, @@ -266,6 +272,12 @@ export default { color: optionsCollapse.lineColorY, }, }, + splitLine: { + show: optionsCollapse.isShowSplitLineY, + lineStyle: { + color: optionsCollapse.splitLineColorY + }, + }, } this.options.yAxis = yAxis diff --git a/report-ui/src/views/report/bigscreen/designer/widget/pie/widgetPieNightingaleRoseArea.vue b/report-ui/src/views/report/bigscreen/designer/widget/pie/widgetPieNightingaleRoseArea.vue index 73f24ee5..635d5134 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/pie/widgetPieNightingaleRoseArea.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/pie/widgetPieNightingaleRoseArea.vue @@ -147,7 +147,13 @@ export default { lineStyle: { color: optionsCollapse.lineColorX } - } + }, + splitLine: { + show: optionsCollapse.isShowSplitLineX, + lineStyle: { + color: optionsCollapse.splitLineColorX + }, + }, }; this.options.xAxis = xAxis; }, @@ -178,7 +184,13 @@ export default { lineStyle: { color: optionsCollapse.lineColorY } - } + }, + splitLine: { + show: optionsCollapse.isShowSplitLineY, + lineStyle: { + color: optionsCollapse.splitLineColorY + }, + }, }; this.options.yAxis = yAxis; diff --git a/report-ui/src/views/report/bigscreen/designer/widget/widgetBarchart.vue b/report-ui/src/views/report/bigscreen/designer/widget/widgetBarchart.vue index af25039c..73726121 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/widgetBarchart.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/widgetBarchart.vue @@ -151,7 +151,13 @@ export default { lineStyle: { color: optionsCollapse.lineColorX } - } + }, + splitLine: { + show: optionsCollapse.isShowSplitLineX, + lineStyle: { + color: optionsCollapse.splitLineColorX + }, + }, }; this.options.xAxis = xAxis; }, @@ -182,7 +188,13 @@ export default { lineStyle: { color: optionsCollapse.lineColorY } - } + }, + splitLine: { + show: optionsCollapse.isShowSplitLineY, + lineStyle: { + color: optionsCollapse.splitLineColorY + }, + }, }; this.options.yAxis = yAxis; diff --git a/report-ui/src/views/report/bigscreen/designer/widget/widgetBarlinechart.vue b/report-ui/src/views/report/bigscreen/designer/widget/widgetBarlinechart.vue index 7e5cd55a..95db873c 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/widgetBarlinechart.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/widgetBarlinechart.vue @@ -192,6 +192,12 @@ export default { color: optionsCollapse.lineColorX, }, }, + splitLine: { + show: optionsCollapse.isShowSplitLineX, + lineStyle: { + color: optionsCollapse.splitLineColorX + }, + }, } this.options.xAxis = xAxis }, @@ -224,6 +230,12 @@ export default { color: '#fff', }, }, + splitLine: { + show: optionsCollapse.isShowSplitLineY, + lineStyle: { + color: optionsCollapse.splitLineColorY + }, + }, }, { type: 'value', @@ -250,6 +262,12 @@ export default { color: optionsCollapse.lineColorY, }, }, + splitLine: { + show: true, + lineStyle: { + color: optionsCollapse.splitLineColorY + }, + }, }, ] diff --git a/report-ui/src/views/report/bigscreen/designer/widget/widgetLinechart.vue b/report-ui/src/views/report/bigscreen/designer/widget/widgetLinechart.vue index 65cfeb01..2f9bf8e2 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/widgetLinechart.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/widgetLinechart.vue @@ -158,6 +158,12 @@ export default { color: optionsCollapse.lineColorX, }, }, + splitLine: { + show: optionsCollapse.isShowSplitLineX, + lineStyle: { + color: optionsCollapse.splitLineColorX + }, + }, } this.options.xAxis = xAxis }, @@ -189,6 +195,12 @@ export default { color: optionsCollapse.lineColorY, }, }, + splitLine: { + show: optionsCollapse.isShowSplitLineY, + lineStyle: { + color: optionsCollapse.splitLineColorY + }, + }, } this.options.yAxis = yAxis diff --git a/report-ui/src/views/report/resultset/index.vue b/report-ui/src/views/report/resultset/index.vue index 37ee4ca7..21ca36a6 100644 --- a/report-ui/src/views/report/resultset/index.vue +++ b/report-ui/src/views/report/resultset/index.vue @@ -121,13 +121,12 @@ size="small" label-width="100px"> - - + + + + + + + + + + + + + + + + +
@@ -884,6 +917,12 @@ export default { }