From 156ed9b0342752f812d526255d40ed236a9224f2 Mon Sep 17 00:00:00 2001 From: qianming Date: Thu, 26 Aug 2021 16:54:46 +0800 Subject: [PATCH 01/28] =?UTF-8?q?=E6=9F=B1=E7=8A=B6=E5=AF=B9=E6=AF=94?= =?UTF-8?q?=E5=9B=BE=E5=8A=9F=E8=83=BD=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/report/bigscreen/designer/tools.js | 21 +++---- .../widget/bar/widgetBarCompareChart.vue | 56 +++++++++++++++++-- 2 files changed, 59 insertions(+), 18 deletions(-) diff --git a/report-ui/src/views/report/bigscreen/designer/tools.js b/report-ui/src/views/report/bigscreen/designer/tools.js index 823e82ea..380da8b9 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools.js +++ b/report-ui/src/views/report/bigscreen/designer/tools.js @@ -7373,31 +7373,26 @@ const widgetTools = [ }, ], }, - /*{ + { name: '坐标轴边距设置', list: [ { type: 'el-slider', - label: '左边距(像素)', - name: 'marginLeft', + label: '左右边距(像素)', + name: 'marginLeftRight', required: false, placeholder: '', value: 10, - }, { + }, + { type: 'el-slider', label: '顶边距(像素)', name: 'marginTop', required: false, placeholder: '', - value: 50, - }, { - type: 'el-slider', - label: '右边距(像素)', - name: 'marginRight', - required: false, - placeholder: '', value: 40, - }, { + }, + { type: 'el-slider', label: '底边距(像素)', name: 'marginBottom', @@ -7406,7 +7401,7 @@ const widgetTools = [ value: 10, }, ], - },*/ + }, { name: '图例操作', list: [ diff --git a/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarCompareChart.vue b/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarCompareChart.vue index 6be98c15..b1b8ed6f 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarCompareChart.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarCompareChart.vue @@ -23,8 +23,9 @@ export default { color: '#ffffff', }, }, + //边距 grid: [ - { + {//左 show: false, left: '4%', top: 60, @@ -36,10 +37,10 @@ export default { show: false, left: '50.5%', top: 60, - bottom: 80, + bottom: 25, width: '0%' }, - { + {//右 show: false, right: '4%', top: 60, @@ -197,9 +198,9 @@ export default { color: '#36c5e7', barBorderRadius: [8, 0, 0, 8], }, - /*emphasis: { + emphasis: { show: false, - },*/ + }, }, data: [], }, @@ -275,6 +276,8 @@ export default { editorOptions() { this.setOptionsTitle(); this.setOptionsTop(); + this.setOptionsTooltip(); + this.setOptionsMargin(); this.setOptionsLegend(); this.setOptionsColor(); this.setOptionsData(); @@ -334,6 +337,49 @@ export default { } this.options.series = series; }, + // tooltip 提示语设置 + setOptionsTooltip() { + const optionsSetup = this.optionsSetup; + const tooltip = { + trigger: "item", + show: true, + textStyle: { + color: optionsSetup.lineColor, + fontSize: optionsSetup.fontSize + } + }; + this.options.tooltip = tooltip; + }, + // 边距设置 + setOptionsMargin() { + const optionsSetup = this.optionsSetup; + const grid = [ + {//左 + show: false, + left: optionsSetup.marginLeftRight, + top: optionsSetup.marginTop, + bottom: optionsSetup.marginBottom, + containLabel: true, + width: '40%' + }, + {//中间字体位置 + show: false, + left: "51%", + top: optionsSetup.marginTop, + bottom: optionsSetup.marginBottom + 15, + width: '0%' + }, + {//右 + show: false, + right: optionsSetup.marginLeftRight, + top: optionsSetup.marginTop, + bottom: optionsSetup.marginBottom, + containLabel: true, + width: '40%' + }, + ] + this.options.grid = grid; + }, // 图例操作 setOptionsLegend() { const optionsSetup = this.optionsSetup; From e269ddca855fa617354ac991f0bcc0def1c0ad76 Mon Sep 17 00:00:00 2001 From: qianming Date: Thu, 26 Aug 2021 17:54:25 +0800 Subject: [PATCH 02/28] =?UTF-8?q?=E6=9F=B1=E7=8A=B6=E5=AF=B9=E6=AF=94?= =?UTF-8?q?=E5=9B=BE=E5=8A=9F=E8=83=BD=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/report/bigscreen/designer/tools.js | 79 +++++++++++++++++-- .../widget/bar/widgetBarCompareChart.vue | 43 ++++++++-- 2 files changed, 112 insertions(+), 10 deletions(-) diff --git a/report-ui/src/views/report/bigscreen/designer/tools.js b/report-ui/src/views/report/bigscreen/designer/tools.js index 380da8b9..7cbded00 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools.js +++ b/report-ui/src/views/report/bigscreen/designer/tools.js @@ -7116,8 +7116,77 @@ const widgetTools = [ }, ], }, - /*{ - name: 'X轴设置', + { + name: '左X轴设置', + list: [ + { + type: 'el-switch', + label: '显示', + name: 'hideXLeft', + required: false, + placeholder: '', + value: true, + }, + { + type: 'el-input-number', + label: '数值间隔', + name: 'splitNumberLeft', + required: false, + placeholder: '', + value: '' + }, + { + type: 'vue-color', + label: '数值颜色', + name: 'XcolorLeft', + required: false, + placeholder: '', + value: '#fff', + }, + { + type: 'el-input-number', + label: '数值字号', + name: 'fontSizeXLeft', + required: false, + placeholder: '', + value: 14, + }, + { + type: 'vue-color', + label: '轴颜色', + name: 'lineColorXLeft', + required: false, + placeholder: '', + value: '#fff', + }, + { + type: 'el-switch', + label: 'X轴线', + name: 'downSplitLineXLeft', + require: false, + placeholder: '', + value: false, + }, + { + type: 'el-switch', + label: '竖分割线', + name: 'SplitLineXLeft', + require: false, + placeholder: '', + value: false, + }, + { + type: 'el-switch', + label: '边框线', + name: 'upSplitLineXLeft', + require: false, + placeholder: '', + value: false, + }, + ], + }, + { + name: '右X轴设置', list: [ { type: 'el-switch', @@ -7217,8 +7286,8 @@ const widgetTools = [ } ], - },*/ - /*{ + }, + { name: 'Y轴设置', list: [ { @@ -7309,7 +7378,7 @@ const widgetTools = [ } ], - },*/ + }, { name: '数值设定', list: [ diff --git a/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarCompareChart.vue b/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarCompareChart.vue index b1b8ed6f..4c398abc 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarCompareChart.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarCompareChart.vue @@ -26,7 +26,7 @@ export default { //边距 grid: [ {//左 - show: false, + show: false,//边框线 left: '4%', top: 60, bottom: 10, @@ -66,7 +66,7 @@ export default { splitNumber: 2, type: 'value', inverse: true, - axisLine: { + axisLine: {//底分割线 show: false, }, axisTick: { @@ -80,7 +80,7 @@ export default { fontSize: 12 } }, - splitLine: { // 分割线 + splitLine: { // 竖分割线 show: true, lineStyle: { color: '#57617f', @@ -275,9 +275,10 @@ export default { // 修改图标options属性 editorOptions() { this.setOptionsTitle(); + this.setOptionsXLeft(); this.setOptionsTop(); this.setOptionsTooltip(); - this.setOptionsMargin(); + this.setOptionsGrid(); this.setOptionsLegend(); this.setOptionsColor(); this.setOptionsData(); @@ -296,6 +297,38 @@ export default { }; this.options.title = title; }, + // 左X轴设置 + setOptionsXLeft() { + const optionsSetup = this.optionsSetup; + const xAxisLeft = { + splitNumber: optionsSetup.splitNumberLeft, + type: 'value', + inverse: true, + axisLine: {//X轴线 + show: false, + }, + axisTick: { + show: false, + }, + position: 'bottom', + axisLabel: { // x轴 + show: optionsSetup.hideXLeft, + textStyle: { + color : optionsSetup.lineColorXLeft, + fontSize: optionsSetup.fontSizeXLeft + } + }, + splitLine: { // 分割线 + show: false, + lineStyle: { + color: '#57617f', + width: 1, + type: 'solid' + } + } + } + this.options.xAxis[0] = xAxisLeft; + }, // 数值设定、柱体设置 setOptionsTop() { const optionsSetup = this.optionsSetup; @@ -351,7 +384,7 @@ export default { this.options.tooltip = tooltip; }, // 边距设置 - setOptionsMargin() { + setOptionsGrid() { const optionsSetup = this.optionsSetup; const grid = [ {//左 From 9363626bcb671486c784be1f7ccec9be69490766 Mon Sep 17 00:00:00 2001 From: qianming Date: Fri, 27 Aug 2021 10:32:15 +0800 Subject: [PATCH 03/28] =?UTF-8?q?=E6=9F=B1=E7=8A=B6=E5=AF=B9=E6=AF=94?= =?UTF-8?q?=E5=9B=BE=E5=8A=9F=E8=83=BD=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/report/bigscreen/designer/tools.js | 109 +++++++++--------- .../widget/bar/widgetBarCompareChart.vue | 53 +++++++-- 2 files changed, 100 insertions(+), 62 deletions(-) diff --git a/report-ui/src/views/report/bigscreen/designer/tools.js b/report-ui/src/views/report/bigscreen/designer/tools.js index 7cbded00..fa14dc0d 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools.js +++ b/report-ui/src/views/report/bigscreen/designer/tools.js @@ -7151,6 +7151,14 @@ const widgetTools = [ placeholder: '', value: 14, }, + { + type: 'el-switch', + label: 'X轴线', + name: 'xLineLeft', + require: false, + placeholder: '', + value: false, + }, { type: 'vue-color', label: '轴颜色', @@ -7161,24 +7169,32 @@ const widgetTools = [ }, { type: 'el-switch', - label: 'X轴线', - name: 'downSplitLineXLeft', + label: '竖分割线', + name: 'SplitLineLeft', require: false, placeholder: '', value: false, }, { - type: 'el-switch', - label: '竖分割线', - name: 'SplitLineXLeft', - require: false, + type: 'vue-color', + label: '分割线颜色', + name: 'SplitLineColorLeft', + required: false, placeholder: '', - value: false, + value: '#fff', + }, + { + type: 'el-input-number', + label: '分割线宽度', + name: 'SplitLinefontSizeLeft', + required: false, + placeholder: '', + value: 1, }, { type: 'el-switch', label: '边框线', - name: 'upSplitLineXLeft', + name: 'frameLineLeft', require: false, placeholder: '', value: false, @@ -7191,100 +7207,83 @@ const widgetTools = [ { type: 'el-switch', label: '显示', - name: 'hideX', + name: 'hideXRight', required: false, placeholder: '', value: true, }, { - type: 'el-input-text', - label: 'X轴别名', - name: 'xName', + type: 'el-input-number', + label: '数值间隔', + name: 'splitNumberRight', required: false, placeholder: '', value: '' }, { type: 'vue-color', - label: '别名颜色', - name: 'xNameColor', + label: '数值颜色', + name: 'XcolorRight', required: false, placeholder: '', - value: '#fff' + value: '#fff', }, { type: 'el-input-number', - label: '别名字号', - name: 'xNameFontSize', + label: '数值字号', + name: 'fontSizeXRight', required: false, placeholder: '', - value: 14 + value: 14, }, { type: 'el-switch', - label: '轴反转', - name: 'reversalX', - required: false, + label: 'X轴线', + name: 'xLineRight', + require: false, placeholder: '', - value: false + value: false, }, { - type: 'el-slider', - label: '文字角度', - name: 'textAngleX', + type: 'vue-color', + label: '轴颜色', + name: 'lineColorXRight', required: false, placeholder: '', - value: 0 + value: '#fff', }, { - type: 'el-input-number', - label: '文字间隔', - name: 'textInterval', - required: false, + type: 'el-switch', + label: '竖分割线', + name: 'SplitLineRight', + require: false, placeholder: '', - value: '' + value: false, }, { type: 'vue-color', - label: '文字颜色', - name: 'Xcolor', + label: '分割线颜色', + name: 'SplitLineColorRight', required: false, placeholder: '', value: '#fff', }, { type: 'el-input-number', - label: '文字字号', - name: 'fontSizeX', + label: '分割线宽度', + name: 'SplitLinefontSizeRight', required: false, placeholder: '', - value: 14, - }, - { - type: 'vue-color', - label: '轴颜色', - name: 'lineColorX', - required: false, - placeholder: '', - value: '#fff', + value: 1, }, { type: 'el-switch', - label: '分割线显示', - name: 'isShowSplitLineX', + label: '边框线', + name: 'frameLineRight', require: false, placeholder: '', value: false, }, - { - type: 'vue-color', - label: '分割线颜色', - name: 'splitLineColorX', - required: false, - placeholder: '', - value: '#fff', - - } ], }, { diff --git a/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarCompareChart.vue b/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarCompareChart.vue index 4c398abc..54b20f6b 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarCompareChart.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarCompareChart.vue @@ -276,6 +276,7 @@ export default { editorOptions() { this.setOptionsTitle(); this.setOptionsXLeft(); + this.setOptionsXRight(); this.setOptionsTop(); this.setOptionsTooltip(); this.setOptionsGrid(); @@ -305,7 +306,10 @@ export default { type: 'value', inverse: true, axisLine: {//X轴线 - show: false, + show: optionsSetup.xLineLeft, + lineStyle: { + color: optionsSetup.lineColorXLeft, + }, }, axisTick: { show: false, @@ -314,21 +318,56 @@ export default { axisLabel: { // x轴 show: optionsSetup.hideXLeft, textStyle: { - color : optionsSetup.lineColorXLeft, + color : optionsSetup.XcolorLeft, fontSize: optionsSetup.fontSizeXLeft } }, splitLine: { // 分割线 - show: false, + show: optionsSetup.SplitLineLeft, lineStyle: { - color: '#57617f', - width: 1, + color: optionsSetup.SplitLineColorLeft, + width: optionsSetup.SplitLinefontSizeLeft, type: 'solid' } } } this.options.xAxis[0] = xAxisLeft; }, + // 右X轴设置 + setOptionsXRight() { + const optionsSetup = this.optionsSetup; + const xAxisRight = { + gridIndex: 2, + splitNumber: optionsSetup.splitNumberRight, + type: 'value', + axisLine: {//X轴线 + show: optionsSetup.xLineRight, + lineStyle: { + color: optionsSetup.lineColorXRight, + }, + }, + axisTick: { + show: false, + }, + position: 'bottom', + axisLabel: { // x轴 + show: optionsSetup.hideXRight, + textStyle: { + color : optionsSetup.XcolorRight, + fontSize: optionsSetup.fontSizeXRight + } + }, + splitLine: { // 分割线 + show: optionsSetup.SplitLineRight, + lineStyle: { + color: optionsSetup.SplitLineColorRight, + width: optionsSetup.SplitLinefontSizeRight, + type: 'solid' + } + } + } + this.options.xAxis[2] = xAxisRight; + }, // 数值设定、柱体设置 setOptionsTop() { const optionsSetup = this.optionsSetup; @@ -388,7 +427,7 @@ export default { const optionsSetup = this.optionsSetup; const grid = [ {//左 - show: false, + show: optionsSetup.frameLineLeft, left: optionsSetup.marginLeftRight, top: optionsSetup.marginTop, bottom: optionsSetup.marginBottom, @@ -403,7 +442,7 @@ export default { width: '0%' }, {//右 - show: false, + show: optionsSetup.frameLineRight, right: optionsSetup.marginLeftRight, top: optionsSetup.marginTop, bottom: optionsSetup.marginBottom, From 2d69abb5a49ee42133bb4d4ace460ec080a8066b Mon Sep 17 00:00:00 2001 From: qianming Date: Fri, 27 Aug 2021 10:49:42 +0800 Subject: [PATCH 04/28] =?UTF-8?q?=E6=9F=B1=E7=8A=B6=E5=AF=B9=E6=AF=94?= =?UTF-8?q?=E5=9B=BE=E5=8A=9F=E8=83=BD=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/report/bigscreen/designer/tools.js | 26 +++++++++++++++---- .../widget/bar/widgetBarCompareChart.vue | 4 +-- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/report-ui/src/views/report/bigscreen/designer/tools.js b/report-ui/src/views/report/bigscreen/designer/tools.js index fa14dc0d..0705bdeb 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools.js +++ b/report-ui/src/views/report/bigscreen/designer/tools.js @@ -7151,6 +7151,14 @@ const widgetTools = [ placeholder: '', value: 14, }, + { + type: 'el-switch', + label: '刻度线', + name: 'tickLineLeft', + require: false, + placeholder: '', + value: false, + }, { type: 'el-switch', label: 'X轴线', @@ -7236,6 +7244,14 @@ const widgetTools = [ placeholder: '', value: 14, }, + { + type: 'el-switch', + label: '刻度线', + name: 'tickLineLeft', + require: false, + placeholder: '', + value: false, + }, { type: 'el-switch', label: 'X轴线', @@ -7362,7 +7378,7 @@ const widgetTools = [ value: '#fff', }, { type: 'el-switch', - label: '分割线显示', + label: 'y轴线显示', name: 'isShowSplitLineY', require: false, placeholder: '', @@ -7384,7 +7400,7 @@ const widgetTools = [ { type: 'el-switch', label: '显示', - name: 'isShow', + name: 'isShowY', required: false, placeholder: '', value: true @@ -7392,7 +7408,7 @@ const widgetTools = [ { type: 'el-input-number', label: '字体大小', - name: 'fontSize', + name: 'fontSizeY', required: false, placeholder: '', value: 14 @@ -7400,7 +7416,7 @@ const widgetTools = [ { type: 'vue-color', label: '字体颜色', - name: 'subTextColor', + name: 'subTextColorY', required: false, placeholder: '', value: '#fff' @@ -7408,7 +7424,7 @@ const widgetTools = [ { type: 'el-select', label: '字体粗细', - name: 'fontWeight', + name: 'fontWeightY', required: false, placeholder: '', selectOptions: [ diff --git a/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarCompareChart.vue b/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarCompareChart.vue index 54b20f6b..4e00cc0a 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarCompareChart.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarCompareChart.vue @@ -312,7 +312,7 @@ export default { }, }, axisTick: { - show: false, + show: optionsSetup.tickLineLeft, }, position: 'bottom', axisLabel: { // x轴 @@ -347,7 +347,7 @@ export default { }, }, axisTick: { - show: false, + show: optionsSetup.tickLineRight, }, position: 'bottom', axisLabel: { // x轴 From 1678f7e7335c4ac86701474f145a6d2c47c282ca Mon Sep 17 00:00:00 2001 From: qianming Date: Fri, 27 Aug 2021 14:40:59 +0800 Subject: [PATCH 05/28] =?UTF-8?q?=E6=9F=B1=E7=8A=B6=E5=AF=B9=E6=AF=94?= =?UTF-8?q?=E5=9B=BE=E5=8A=9F=E8=83=BD=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/report/bigscreen/designer/tools.js | 88 +++++--------- .../widget/bar/widgetBarCompareChart.vue | 114 +++++++----------- 2 files changed, 75 insertions(+), 127 deletions(-) diff --git a/report-ui/src/views/report/bigscreen/designer/tools.js b/report-ui/src/views/report/bigscreen/designer/tools.js index 0705bdeb..412ec14b 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools.js +++ b/report-ui/src/views/report/bigscreen/designer/tools.js @@ -7247,7 +7247,7 @@ const widgetTools = [ { type: 'el-switch', label: '刻度线', - name: 'tickLineLeft', + name: 'tickLineRight', require: false, placeholder: '', value: false, @@ -7308,66 +7308,55 @@ const widgetTools = [ { type: 'el-switch', label: '显示', - name: 'isShowY', - require: false, + name: 'hideY', + required: false, placeholder: '', value: true, }, - { - type: 'el-input-text', - label: 'Y轴别名', - name: 'textNameY', - require: false, - placeholder: '', - value: '' - }, { type: 'vue-color', - label: '别名颜色', - name: 'NameColorY', + label: '数值颜色', + name: 'colorY', required: false, placeholder: '', value: '#fff', }, { type: 'el-input-number', - label: '别名字号', - name: 'NameFontSizeY', + label: '数值字号', + name: 'fontSizeY', required: false, placeholder: '', value: 14, }, { - type: 'el-switch', - label: '轴反转', - name: 'reversalY', - required: false, - placeholder: '', - value: false - }, - { - type: 'el-slider', - label: '文字角度', - name: 'textAngleY', + type: 'el-select', + label: '数值对齐', + name: 'textAlign', required: false, placeholder: '', - value: 0 + selectOptions: [ + {code: 'center', name: '居中'}, + {code: 'left', name: '左对齐'}, + {code: 'right', name: '右对齐'}, + ], + value: 'center' }, { - type: 'vue-color', - label: '文字颜色', - name: 'colorY', - required: false, + type: 'el-switch', + label: '刻度线', + name: 'tickLineY', + require: false, placeholder: '', - value: '#fff', + value: false, }, { - type: 'el-input-number', - label: '文字字号', - name: 'fontSizeY', - required: false, + type: 'el-switch', + label: 'Y轴线', + name: 'lineY', + require: false, placeholder: '', - value: 14, + value: false, }, { type: 'vue-color', @@ -7376,22 +7365,7 @@ const widgetTools = [ required: false, placeholder: '', value: '#fff', - }, { - type: 'el-switch', - label: 'y轴线显示', - name: 'isShowSplitLineY', - require: false, - placeholder: '', - value: false, - }, { - type: 'vue-color', - label: '分割线颜色', - name: 'splitLineColorY', - required: false, - placeholder: '', - value: '#fff', - - } + }, ], }, { @@ -7400,7 +7374,7 @@ const widgetTools = [ { type: 'el-switch', label: '显示', - name: 'isShowY', + name: 'isShow', required: false, placeholder: '', value: true @@ -7408,7 +7382,7 @@ const widgetTools = [ { type: 'el-input-number', label: '字体大小', - name: 'fontSizeY', + name: 'fontSize', required: false, placeholder: '', value: 14 @@ -7416,7 +7390,7 @@ const widgetTools = [ { type: 'vue-color', label: '字体颜色', - name: 'subTextColorY', + name: 'subTextColor', required: false, placeholder: '', value: '#fff' @@ -7424,7 +7398,7 @@ const widgetTools = [ { type: 'el-select', label: '字体粗细', - name: 'fontWeightY', + name: 'fontWeight', required: false, placeholder: '', selectOptions: [ diff --git a/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarCompareChart.vue b/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarCompareChart.vue index 4e00cc0a..f5416345 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarCompareChart.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarCompareChart.vue @@ -51,9 +51,6 @@ export default { ], //图例 legend: { - data: ['success', 'fail'], - bottom: 10, - center: true, textStyle: { color: '#fff', textAlign: 'center' @@ -277,6 +274,7 @@ export default { this.setOptionsTitle(); this.setOptionsXLeft(); this.setOptionsXRight(); + this.setOptionsY(); this.setOptionsTop(); this.setOptionsTooltip(); this.setOptionsGrid(); @@ -318,7 +316,7 @@ export default { axisLabel: { // x轴 show: optionsSetup.hideXLeft, textStyle: { - color : optionsSetup.XcolorLeft, + color: optionsSetup.XcolorLeft, fontSize: optionsSetup.fontSizeXLeft } }, @@ -353,7 +351,7 @@ export default { axisLabel: { // x轴 show: optionsSetup.hideXRight, textStyle: { - color : optionsSetup.XcolorRight, + color: optionsSetup.XcolorRight, fontSize: optionsSetup.fontSizeXRight } }, @@ -368,6 +366,30 @@ export default { } this.options.xAxis[2] = xAxisRight; }, + // Y轴设置 + setOptionsY() { + const optionsSetup = this.optionsSetup; + const axisLine = { + show: optionsSetup.lineY, + lineStyle: { + color: optionsSetup.lineColorY + } + }; + const axisTick = { + show: optionsSetup.tickLineY + }; + const axisLabel = { + show: optionsSetup.hideY, + textStyle: { + align: optionsSetup.textAlign, + color: optionsSetup.colorY, + fontSize: optionsSetup.fontSizeY, + } + }; + this.options.yAxis[1]['axisLine'] = axisLine; + this.options.yAxis[1]['axisTick'] = axisTick; + this.options.yAxis[1]['axisLabel'] = axisLabel; + }, // 数值设定、柱体设置 setOptionsTop() { const optionsSetup = this.optionsSetup; @@ -377,7 +399,6 @@ export default { series[0].label = { normal: { show: optionsSetup.isShow, - //color: 'red', position: 'insideLeft', textStyle: { fontSize: optionsSetup.fontSize, @@ -423,6 +444,16 @@ export default { this.options.tooltip = tooltip; }, // 边距设置 + getOptionsBottom(){ + const optionsSetup = this.optionsSetup; + let bottom = optionsSetup.marginBottom; + if (optionsSetup.hideXLeft) { + bottom = optionsSetup.marginBottom + 15 + }else if (optionsSetup.hideXRight){ + bottom = optionsSetup.marginBottom + 15 + } + return bottom + }, setOptionsGrid() { const optionsSetup = this.optionsSetup; const grid = [ @@ -438,7 +469,7 @@ export default { show: false, left: "51%", top: optionsSetup.marginTop, - bottom: optionsSetup.marginBottom + 15, + bottom: this.getOptionsBottom(), width: '0%' }, {//右 @@ -516,13 +547,6 @@ export default { }, //静态数据 staticDataFn(val) { - const optionsSetup = this.optionsSetup; - //颜色 - const customColor = optionsSetup.customColor; - const arrColor = []; - for (let i = 0; i < customColor.length; i++) { - arrColor.push(customColor[i].color); - } //数据 let xAxisList = []; let yAxisList = []; @@ -554,17 +578,6 @@ export default { this.options.series[1]['name'] = arrayList[1].name this.options.series[1]['data'] = arrayList[1].data this.options.yAxis[1]['data'] = xAxisList - /*if (optionsSetup.verticalShow) { - this.options.xAxis.data = []; - this.options.yAxis.data = xAxisList; - this.options.xAxis.type = "value"; - this.options.yAxis.type = "category"; - } else { - this.options.xAxis.data = xAxisList; - this.options.yAxis.data = []; - this.options.xAxis.type = "category"; - this.options.yAxis.type = "value"; - }*/ }, // 动态数据 dynamicDataFn(val, refreshTime, optionsSetup) { @@ -585,52 +598,13 @@ export default { }); }, renderingFn(optionsSetup, val) { - //颜色 - const customColor = optionsSetup.customColor; - const arrColor = []; - for (let i = 0; i < customColor.length; i++) { - arrColor.push(customColor[i].color); - } - // x轴 - if (optionsSetup.verticalShow) { - this.options.xAxis.data = []; - this.options.yAxis.data = val.xAxis; - this.options.xAxis.type = "value"; - this.options.yAxis.type = "category"; - } else { - this.options.xAxis.data = val.xAxis; - this.options.yAxis.data = []; - this.options.xAxis.type = "category"; - this.options.yAxis.type = "value"; - } - const series = []; - for (const i in val.series) { - if (val.series[i].type == "bar") { - series.push({ - name: val.series[i].name, - type: "bar", - data: val.series[i].data, - barGap: "0%", - barWidth: optionsSetup.maxWidth, - label: { - show: optionsSetup.isShow, - position: "top", - distance: 10, - fontSize: optionsSetup.fontSize, - color: optionsSetup.subTextColor, - fontWeight: optionsSetup.fontWeight - }, - //颜色，圆角属性 - itemStyle: { - normal: { - color: arrColor[i], - barBorderRadius: optionsSetup.radius, - } - } - }) - } + this.options.yAxis[1]['data'] = val.xAxis + if (val.series[0].type == "bar"){ + this.options.series[0]['name'] = val.series[0].name + this.options.series[0]['data'] = val.series[0].data + this.options.series[1]['name'] = val.series[1].name + this.options.series[1]['data'] = val.series[1].data } - this.options.series = series } } }; From 5b6ffb7dfd6de95c31ce57593ad574d816dc6ce3 Mon Sep 17 00:00:00 2001 From: qianming Date: Fri, 27 Aug 2021 14:41:51 +0800 Subject: [PATCH 06/28] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E3=80=81=E5=AF=B9=E6=AF=94=E5=9B=BE=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/docs/.vuepress/config.js | 1 + doc/docs/guide/dashboard.md | 6 +++-- doc/docs/guide/importexport.md | 17 ++++++++++++++ doc/docs/picture/dashboard/img_18.png | Bin 0 -> 25369 bytes doc/docs/picture/imexport/img.png | Bin 0 -> 5235 bytes doc/docs/picture/imexport/img_1.png | Bin 0 -> 4476 bytes .../V1.0.10__create_report_share.sql | 2 +- .../V1.0.11_create_compare_table.sql | 21 ++++++++++++++++++ 8 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 doc/docs/guide/importexport.md create mode 100644 doc/docs/picture/dashboard/img_18.png create mode 100644 doc/docs/picture/imexport/img.png create mode 100644 doc/docs/picture/imexport/img_1.png create mode 100644 report-core/src/main/resources/db/migration/V1.0.11_create_compare_table.sql diff --git a/doc/docs/.vuepress/config.js b/doc/docs/.vuepress/config.js index 8e2fdcd0..211130b0 100644 --- a/doc/docs/.vuepress/config.js +++ b/doc/docs/.vuepress/config.js @@ -51,6 +51,7 @@ module.exports = { {title: '数据源', path: '/guide/datasource'}, {title: '数据集', path: '/guide/dataset'}, {title: '大屏设计', path: '/guide/dashboard'}, + {title: '导入导出', path: '/guide/importexport'}, ] }, { diff --git a/doc/docs/guide/dashboard.md b/doc/docs/guide/dashboard.md index 802cb0a0..fe54e683 100644 --- a/doc/docs/guide/dashboard.md +++ b/doc/docs/guide/dashboard.md @@ -88,7 +88,9 @@ **如有问题，请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** ### 散点图 -**开发中**
+**规划中**
### 对比图 -**开发中**
+柱状对比图数据集需要3个字段，其中一个作为对比的字段只能为2种值，只有2种值作为对比的字段要选择“y轴字段”字典。因为底层的解析用的是堆叠图的解析，这里的y轴字段并不是指的图表上面的y轴，还请注意，有强迫症可以自行修改源码的解析，剩下的2个字段对应字典看图
+![img18](../picture/dashboard/img_18.png) +**如有问题，请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** diff --git a/doc/docs/guide/importexport.md b/doc/docs/guide/importexport.md new file mode 100644 index 00000000..787dd62a --- /dev/null +++ b/doc/docs/guide/importexport.md @@ -0,0 +1,17 @@ +**注：导入导出目前是初始版本，报错没有细化，如果导入导出过程中页面无反应，请F12** +**注：“导入成功/失败”的提示不一定对应当前真实导入导出情况，请根据实际导入导出的结果进行判断** + +## 导出 +![img](../picture/imexport/img.png)
+导出会生成zip文件，包含图表、样式、图片等，不会带有该大屏的名称和code。
+ +### 导出数据集 +适用于同一系统内部使用 + +### 导出不含有数据集 +导出的图表会使用默认的静态数据集，适用于跨系统，请注意，如果你的大屏图表有部分图表是在对方系统不存在的，那么目前整个大屏是不会显示出来的，后续会进行兼容，不存在的图表留空。
+ +## 导入 +![img1](../picture/imexport/img_1.png)
+选择一个导出的zip文件导入即可。注意，导入会覆盖当前大屏，请新建一张空白的大屏进行导入。
+**注：如果你导入的大屏中含有你当前系统不存在的图表，整个大屏是不会显示的。**
diff --git a/doc/docs/picture/dashboard/img_18.png b/doc/docs/picture/dashboard/img_18.png new file mode 100644 index 0000000000000000000000000000000000000000..1e2090a96791cc32ae90d51aa8e7cca2d2aee428 GIT binary patch literal 25369 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 A-T(jq literal 0 HcmV?d00001 diff --git a/report-core/src/main/resources/db/migration/V1.0.10__create_report_share.sql b/report-core/src/main/resources/db/migration/V1.0.10__create_report_share.sql index f848dbda..240adc95 100644 --- a/report-core/src/main/resources/db/migration/V1.0.10__create_report_share.sql +++ b/report-core/src/main/resources/db/migration/V1.0.10__create_report_share.sql @@ -66,7 +66,7 @@ INSERT INTO `aj_report`.`gaea_report_data_set`(`set_code`, `set_name`, `set_desc use aj_report_init; -CREATE TABLE `aj_report_barstack` +CREATE TABLE if not exists `aj_report_barstack` ( `id` int(11) NOT NULL AUTO_INCREMENT, `time` date DEFAULT NULL, diff --git a/report-core/src/main/resources/db/migration/V1.0.11_create_compare_table.sql b/report-core/src/main/resources/db/migration/V1.0.11_create_compare_table.sql new file mode 100644 index 00000000..42393792 --- /dev/null +++ b/report-core/src/main/resources/db/migration/V1.0.11_create_compare_table.sql @@ -0,0 +1,21 @@ +use aj_report_init; +CREATE TABLE if not exists `aj_report_comparestack` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `time` date DEFAULT NULL, + `type` varchar(255) DEFAULT NULL, + `nums` bigint(11) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8; + +INSERT INTO `aj_report_init`.`aj_report_comparestack`(`id`, `time`, `type`, `nums`) VALUES (1, '2021-08-23', '成功', 12); +INSERT INTO `aj_report_init`.`aj_report_comparestack`(`id`, `time`, `type`, `nums`) VALUES (2, '2021-08-23', '失败', 1); +INSERT INTO `aj_report_init`.`aj_report_comparestack`(`id`, `time`, `type`, `nums`) VALUES (3, '2021-08-24', '成功', 24); +INSERT INTO `aj_report_init`.`aj_report_comparestack`(`id`, `time`, `type`, `nums`) VALUES (4, '2021-08-24', '失败', 5); +INSERT INTO `aj_report_init`.`aj_report_comparestack`(`id`, `time`, `type`, `nums`) VALUES (5, '2021-08-25', '成功', 13); +INSERT INTO `aj_report_init`.`aj_report_comparestack`(`id`, `time`, `type`, `nums`) VALUES (6, '2021-08-25', '失败', 8); +INSERT INTO `aj_report_init`.`aj_report_comparestack`(`id`, `time`, `type`, `nums`) VALUES (7, '2021-08-26', '成功', 19); +INSERT INTO `aj_report_init`.`aj_report_comparestack`(`id`, `time`, `type`, `nums`) VALUES (8, '2021-08-26', '失败', 3); +INSERT INTO `aj_report_init`.`aj_report_comparestack`(`id`, `time`, `type`, `nums`) VALUES (9, '2021-08-27', '成功', 9); +INSERT INTO `aj_report_init`.`aj_report_comparestack`(`id`, `time`, `type`, `nums`) VALUES (10, '2021-08-27', '失败', 15); + +INSERT INTO `aj_report`.`gaea_report_data_set`(`set_code`, `set_name`, `set_desc`, `source_code`, `dyn_sentence`, `case_result`, `enable_flag`, `delete_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `version`) VALUES ('compare_ajreport', '柱状对比图示例数据', '', 'mysql_ajreport', 'SELECT time,type,nums from aj_report_comparestack', '[{\"time\":\"2021-08-23\",\"type\":\"成功\",\"nums\":12},{\"time\":\"2021-08-23\",\"type\":\"失败\",\"nums\":1},{\"time\":\"2021-08-24\",\"type\":\"成功\",\"nums\":24},{\"time\":\"2021-08-24\",\"type\":\"失败\",\"nums\":5},{\"time\":\"2021-08-25\",\"type\":\"成功\",\"nums\":13},{\"time\":\"2021-08-25\",\"type\":\"失败\",\"nums\":8},{\"time\":\"2021-08-26\",\"type\":\"成功\",\"nums\":19},{\"time\":\"2021-08-26\",\"type\":\"失败\",\"nums\":3},{\"time\":\"2021-08-27\",\"type\":\"成功\",\"nums\":9},{\"time\":\"2021-08-27\",\"type\":\"失败\",\"nums\":15}]', 1, 0, 'admin', '2021-08-27 13:48:33', 'admin', '2021-08-27 13:48:33', 1); From b5dddb6047936d02d042fec7ee431623bab0760a Mon Sep 17 00:00:00 2001 From: qianming Date: Fri, 27 Aug 2021 15:27:04 +0800 Subject: [PATCH 07/28] update --- ...create_compare_table.sql => V1.0.11__create_compare_table.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename report-core/src/main/resources/db/migration/{V1.0.11_create_compare_table.sql => V1.0.11__create_compare_table.sql} (100%) diff --git a/report-core/src/main/resources/db/migration/V1.0.11_create_compare_table.sql b/report-core/src/main/resources/db/migration/V1.0.11__create_compare_table.sql similarity index 100% rename from report-core/src/main/resources/db/migration/V1.0.11_create_compare_table.sql rename to report-core/src/main/resources/db/migration/V1.0.11__create_compare_table.sql From eea42e41d072c218806a5f5494602cd40073f591 Mon Sep 17 00:00:00 2001 From: qianlishi <1432731663@qq.com> Date: Sun, 29 Aug 2021 07:44:56 +0800 Subject: [PATCH 08/28] update tool.js --- .../views/report/bigscreen/designer/index.vue | 95 +- .../views/report/bigscreen/designer/tools.js | 7665 ----------------- .../componentsJSON/widget-airbubble-map.js | 382 + .../componentsJSON/widget-bar-compare.js | 650 ++ .../tools/componentsJSON/widget-bar-stack.js | 652 ++ .../tools/componentsJSON/widget-barchart.js | 630 ++ .../componentsJSON/widget-barlinechart.js | 634 ++ .../tools/componentsJSON/widget-funnel.js | 383 + .../tools/componentsJSON/widget-gauge.js | 162 + .../widget-gradient-barchart.js | 567 ++ .../tools/componentsJSON/widget-href.js | 157 + .../tools/componentsJSON/widget-iframe.js | 72 + .../tools/componentsJSON/widget-image.js | 103 + .../tools/componentsJSON/widget-line-stack.js | 672 ++ .../tools/componentsJSON/widget-linechart.js | 651 ++ .../tools/componentsJSON/widget-map.js | 61 + .../tools/componentsJSON/widget-marquee.js | 176 + .../componentsJSON/widget-pie-nightingale.js | 403 + .../componentsJSON/widget-pie-percentage.js | 255 + .../tools/componentsJSON/widget-piechart.js | 403 + .../tools/componentsJSON/widget-slider.js | 87 + .../tools/componentsJSON/widget-table.js | 268 + .../tools/componentsJSON/widget-text.js | 182 + .../tools/componentsJSON/widget-time.js | 143 + .../tools/componentsJSON/widget-universal.js | 14 + .../tools/componentsJSON/widget-video.js | 72 + .../report/bigscreen/designer/tools/index.js | 125 + 27 files changed, 7956 insertions(+), 7708 deletions(-) delete mode 100644 report-ui/src/views/report/bigscreen/designer/tools.js create mode 100644 report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-airbubble-map.js create mode 100644 report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-bar-compare.js create mode 100644 report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-bar-stack.js create mode 100644 report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-barchart.js create mode 100644 report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-barlinechart.js create mode 100644 report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-funnel.js create mode 100644 report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-gauge.js create mode 100644 report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-gradient-barchart.js create mode 100644 report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-href.js create mode 100644 report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-iframe.js create mode 100644 report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-image.js create mode 100644 report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-line-stack.js create mode 100644 report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-linechart.js create mode 100644 report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-map.js create mode 100644 report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-marquee.js create mode 100644 report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-pie-nightingale.js create mode 100644 report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-pie-percentage.js create mode 100644 report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-piechart.js create mode 100644 report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-slider.js create mode 100644 report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-table.js create mode 100644 report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-text.js create mode 100644 report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-time.js create mode 100644 report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-universal.js create mode 100644 report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-video.js create mode 100644 report-ui/src/views/report/bigscreen/designer/tools/index.js diff --git a/report-ui/src/views/report/bigscreen/designer/index.vue b/report-ui/src/views/report/bigscreen/designer/index.vue index 600d473d..1ca306ae 100644 --- a/report-ui/src/views/report/bigscreen/designer/index.vue +++ b/report-ui/src/views/report/bigscreen/designer/index.vue @@ -59,7 +59,7 @@ :style="{ width: widthLeftForToolsHideButton + 'px' }" @click="toolIsShow = !toolIsShow" > - +
- - + - +
  • - +
    • -
      导出(包含数据集)
      +
      导出(包含数据集)
       -
    • -
      导出(不包含数据集)
      +
      导出(不包含数据集)
    @@ -277,14 +278,19 @@ + + 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 9396d3f3..f0b126d4 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/temp.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/temp.vue @@ -34,6 +34,7 @@ import widgetAirBubbleMap from "./map/widgetAirBubbleMap"; import widgetBarStackChart from "./bar/widgetBarStackChart"; import widgetLineStackChart from "./line/widgetLineStackChart"; import widgetBarCompareChart from "./bar/widgetBarCompareChart"; +import widgetLineCompareChart from "./line/widgetLineCompareChart"; export default { name: "WidgetTemp", @@ -60,7 +61,8 @@ export default { widgetAirBubbleMap, widgetBarStackChart, widgetLineStackChart, - widgetBarCompareChart + widgetBarCompareChart, + widgetLineCompareChart }, 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 7b603787..1f587d61 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/widget.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/widget.vue @@ -44,6 +44,7 @@ import widgetAirBubbleMap from "./map/widgetAirBubbleMap"; import widgetBarStackChart from "./bar/widgetBarStackChart"; import widgetLineStackChart from "./line/widgetLineStackChart"; import widgetBarCompareChart from "./bar/widgetBarCompareChart"; +import widgetLineCompareChart from "./line/widgetLineCompareChart"; export default { name: "Widget", @@ -70,7 +71,8 @@ export default { widgetAirBubbleMap, widgetBarStackChart, widgetLineStackChart, - widgetBarCompareChart + widgetBarCompareChart, + widgetLineCompareChart }, model: { prop: "value", From 893f623fbe2516cd217ee0d6f9252131ba32255e Mon Sep 17 00:00:00 2001 From: qianming Date: Tue, 31 Aug 2021 15:03:29 +0800 Subject: [PATCH 15/28] =?UTF-8?q?=E6=8A=98=E7=BA=BF=E5=AF=B9=E6=AF=94?= =?UTF-8?q?=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../widget/bar/widgetBarCompareChart.vue | 20 +- .../widget/line/widgetLineCompareChart.vue | 631 +++++++++--------- .../designer/widget/widgetLinechart.vue | 2 +- 3 files changed, 338 insertions(+), 315 deletions(-) diff --git a/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarCompareChart.vue b/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarCompareChart.vue index f5416345..18142593 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarCompareChart.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarCompareChart.vue @@ -61,6 +61,7 @@ export default { xAxis: [ {// 左 splitNumber: 2, + show: true, type: 'value', inverse: true, axisLine: {//底分割线 @@ -92,6 +93,7 @@ export default { }, {// 右 gridIndex: 2, + show: true, type: 'value', axisLine: { show: false, @@ -302,6 +304,7 @@ export default { const xAxisLeft = { splitNumber: optionsSetup.splitNumberLeft, type: 'value', + show : optionsSetup.hideXLeft, inverse: true, axisLine: {//X轴线 show: optionsSetup.xLineLeft, @@ -314,7 +317,7 @@ export default { }, position: 'bottom', axisLabel: { // x轴 - show: optionsSetup.hideXLeft, + show: true, textStyle: { color: optionsSetup.XcolorLeft, fontSize: optionsSetup.fontSizeXLeft @@ -337,6 +340,7 @@ export default { const xAxisRight = { gridIndex: 2, splitNumber: optionsSetup.splitNumberRight, + show : optionsSetup.hideXRight, type: 'value', axisLine: {//X轴线 show: optionsSetup.xLineRight, @@ -349,7 +353,7 @@ export default { }, position: 'bottom', axisLabel: { // x轴 - show: optionsSetup.hideXRight, + show: true, textStyle: { color: optionsSetup.XcolorRight, fontSize: optionsSetup.fontSizeXRight @@ -444,16 +448,6 @@ export default { this.options.tooltip = tooltip; }, // 边距设置 - getOptionsBottom(){ - const optionsSetup = this.optionsSetup; - let bottom = optionsSetup.marginBottom; - if (optionsSetup.hideXLeft) { - bottom = optionsSetup.marginBottom + 15 - }else if (optionsSetup.hideXRight){ - bottom = optionsSetup.marginBottom + 15 - } - return bottom - }, setOptionsGrid() { const optionsSetup = this.optionsSetup; const grid = [ @@ -469,7 +463,7 @@ export default { show: false, left: "51%", top: optionsSetup.marginTop, - bottom: this.getOptionsBottom(), + bottom: optionsSetup.marginBottom + 15, width: '0%' }, {//右 diff --git a/report-ui/src/views/report/bigscreen/designer/widget/line/widgetLineCompareChart.vue b/report-ui/src/views/report/bigscreen/designer/widget/line/widgetLineCompareChart.vue index 0f22eeef..d4142328 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/line/widgetLineCompareChart.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/line/widgetLineCompareChart.vue @@ -16,13 +16,27 @@ export default { data() { return { options: { + axisPointer: { + link: { + xAxisIndex: "all", + }, + }, title: { - //text: '柱状对比图', x: 'center', textStyle: { color: '#ffffff', }, }, + tooltip: { + show: true, + trigger: "axis", + axisPointer: { + type: "line", + lineStyle: { + type: "dashed", + }, + }, + }, //边距 grid: [ {// 上 @@ -52,60 +66,92 @@ export default { {// gridIndex: 0, type: 'category', - boundaryGap: false, - axisLine: { //分割线 - onZero: false, + boundaryGap: true, // 居中 + axisLine: { //x轴线 + show: true, + lineStyle: { + color: '#ffffff', + } }, - splitNumber: 2, - inverse: true, - axisTick: { - show: false, + axisTick: { // 刻度 + show: true, }, - //position: 'bottom', - axisLabel: { // x轴 + axisLabel: { // X轴数据 show: true, textStyle: { color: '#ffffff', - fontSize: 12 + fontSize: 14 } }, - data: [] + data: [], }, {// gridIndex: 1, type: 'category', position: 'top', - boundaryGap: false, - axisLine: { - show: false, + boundaryGap: true, // 居中 + axisLine: { // x轴线 + show: true, + lineStyle: { + color: '#ffffff', + } }, - axisTick: { - show: false, + axisTick: { // 刻度 + show: true, }, - //position: 'bottom', axisLabel: { - show: true, - textStyle: { - color: '#ffffff', - fontSize: 12, - }, + show: false, }, + data: [], }, ], yAxis: [ { gridIndex: 0, - scale: true, + show: true, + scale: true, // 是否不从0开始,false从0开始 + axisLabel: { + show: true, + textStyle: { + color: '#ffffff', + fontSize: 14, + }, + }, + axisLine: { // 轴线 + show: true, + lineStyle: { + color: '#ffffff', + }, + }, splitLine: { show: false, + lineStyle: { + color: '#ffffff', + }, }, }, { gridIndex: 1, - scale: true, - inverse: true, + scale: false, // 是否从0开始 + inverse: true, // 翻转 + axisLabel: { + show: true, + textStyle: { + color: '#ffffff', + fontSize: 14, + }, + }, + axisLine: { // 轴线 + show: true, + lineStyle: { + color: '#ffffff', + }, + }, splitLine: { show: false, + lineStyle: { + color: '#ffffff', + }, }, }, ], @@ -115,32 +161,21 @@ export default { type: 'line', xAxisIndex: 0, yAxisIndex: 0, - smooth: true, - barGap: 20, - barWidth: 15, - /*label: { - normal: { - show: true, - color: 'red', - position: 'insideLeft', - textStyle: { - color: '#ffffff', - } - - }, - emphasis: { - show: false, - }, - }, + smooth: true, // 曲线，折线 itemStyle: { - normal: { - color: '#36c5e7', - barBorderRadius: [8, 0, 0, 8], - }, - emphasis: { - show: false, - }, - },*/ + color: '#36c5e7', + }, + lineStyle: { + color: '#36c5e7', + width: 2, + }, + label: { + position: 'top', + distance: 10, + show: true, + color: '#36c5e7', + fontSize: 14, + }, data: [], }, { @@ -148,28 +183,21 @@ export default { type: 'line', xAxisIndex: 1, yAxisIndex: 1, - smooth: true, - barGap: 20, - barWidth: 15, - /*label: { - normal: { - show: true, - color: 'red', - position: 'insideRight', - textStyle: { - color: '#ffffff', - } - }, - }, + smooth: true, // 曲线，折线 itemStyle: { - normal: { - color: '#e68b55', - barBorderRadius: [0, 8, 8, 0], - }, - emphasis: { - show: false, - }, - },*/ + color: '#e68b55', + }, + lineStyle: { + color: '#e68b55', + width: 2, + }, + label: { + position: 'bottom', + distance: 10, + show: true, + color: '#e68b55', + fontSize: 16, + }, data: [], }, ] @@ -225,249 +253,249 @@ export default { this.setOptionsColor();*/ this.setOptionsData(); }, -/* // 标题修改 - setOptionsTitle() { - const optionsCollapse = this.optionsSetup; - const title = {}; - title.text = optionsCollapse.titleText; - title.show = optionsCollapse.isNoTitle; - title.left = optionsCollapse.textAlign; - title.textStyle = { - color: optionsCollapse.textColor, - fontSize: optionsCollapse.textFontSize, - fontWeight: optionsCollapse.textFontWeight - }; - this.options.title = title; - }, - // 左X轴设置 - setOptionsXLeft() { - const optionsSetup = this.optionsSetup; - const xAxisLeft = { - splitNumber: optionsSetup.splitNumberLeft, - type: 'value', - inverse: true, - axisLine: {//X轴线 - show: optionsSetup.xLineLeft, - lineStyle: { - color: optionsSetup.lineColorXLeft, - }, - }, - axisTick: { - show: optionsSetup.tickLineLeft, + /* // 标题修改 + setOptionsTitle() { + const optionsCollapse = this.optionsSetup; + const title = {}; + title.text = optionsCollapse.titleText; + title.show = optionsCollapse.isNoTitle; + title.left = optionsCollapse.textAlign; + title.textStyle = { + color: optionsCollapse.textColor, + fontSize: optionsCollapse.textFontSize, + fontWeight: optionsCollapse.textFontWeight + }; + this.options.title = title; }, - position: 'bottom', - axisLabel: { // x轴 - show: optionsSetup.hideXLeft, - textStyle: { - color: optionsSetup.XcolorLeft, - fontSize: optionsSetup.fontSizeXLeft + // 左X轴设置 + setOptionsXLeft() { + const optionsSetup = this.optionsSetup; + const xAxisLeft = { + splitNumber: optionsSetup.splitNumberLeft, + type: 'value', + inverse: true, + axisLine: {//X轴线 + show: optionsSetup.xLineLeft, + lineStyle: { + color: optionsSetup.lineColorXLeft, + }, + }, + axisTick: { + show: optionsSetup.tickLineLeft, + }, + position: 'bottom', + axisLabel: { // x轴 + show: optionsSetup.hideXLeft, + textStyle: { + color: optionsSetup.XcolorLeft, + fontSize: optionsSetup.fontSizeXLeft + } + }, + splitLine: { // 分割线 + show: optionsSetup.SplitLineLeft, + lineStyle: { + color: optionsSetup.SplitLineColorLeft, + width: optionsSetup.SplitLinefontSizeLeft, + type: 'solid' + } + } } + this.options.xAxis[0] = xAxisLeft; }, - splitLine: { // 分割线 - show: optionsSetup.SplitLineLeft, - lineStyle: { - color: optionsSetup.SplitLineColorLeft, - width: optionsSetup.SplitLinefontSizeLeft, - type: 'solid' + // 右X轴设置 + setOptionsXRight() { + const optionsSetup = this.optionsSetup; + const xAxisRight = { + gridIndex: 2, + splitNumber: optionsSetup.splitNumberRight, + type: 'value', + axisLine: {//X轴线 + show: optionsSetup.xLineRight, + lineStyle: { + color: optionsSetup.lineColorXRight, + }, + }, + axisTick: { + show: optionsSetup.tickLineRight, + }, + position: 'bottom', + axisLabel: { // x轴 + show: optionsSetup.hideXRight, + textStyle: { + color: optionsSetup.XcolorRight, + fontSize: optionsSetup.fontSizeXRight + } + }, + splitLine: { // 分割线 + show: optionsSetup.SplitLineRight, + lineStyle: { + color: optionsSetup.SplitLineColorRight, + width: optionsSetup.SplitLinefontSizeRight, + type: 'solid' + } + } } - } - } - this.options.xAxis[0] = xAxisLeft; - }, - // 右X轴设置 - setOptionsXRight() { - const optionsSetup = this.optionsSetup; - const xAxisRight = { - gridIndex: 2, - splitNumber: optionsSetup.splitNumberRight, - type: 'value', - axisLine: {//X轴线 - show: optionsSetup.xLineRight, - lineStyle: { - color: optionsSetup.lineColorXRight, - }, + this.options.xAxis[2] = xAxisRight; }, - axisTick: { - show: optionsSetup.tickLineRight, + // Y轴设置 + setOptionsY() { + const optionsSetup = this.optionsSetup; + const axisLine = { + show: optionsSetup.lineY, + lineStyle: { + color: optionsSetup.lineColorY + } + }; + const axisTick = { + show: optionsSetup.tickLineY + }; + const axisLabel = { + show: optionsSetup.hideY, + textStyle: { + align: optionsSetup.textAlign, + color: optionsSetup.colorY, + fontSize: optionsSetup.fontSizeY, + } + }; + this.options.yAxis[1]['axisLine'] = axisLine; + this.options.yAxis[1]['axisTick'] = axisTick; + this.options.yAxis[1]['axisLabel'] = axisLabel; }, - position: 'bottom', - axisLabel: { // x轴 - show: optionsSetup.hideXRight, - textStyle: { - color: optionsSetup.XcolorRight, - fontSize: optionsSetup.fontSizeXRight + // 数值设定、柱体设置 + setOptionsTop() { + const optionsSetup = this.optionsSetup; + const series = this.options.series; + for (const key in series) { + if (series[key].type == "bar") { + series[0].label = { + normal: { + show: optionsSetup.isShow, + position: 'insideLeft', + textStyle: { + fontSize: optionsSetup.fontSize, + color: optionsSetup.subTextColor, + fontWeight: optionsSetup.fontWeight + } + }, + emphasis: { + show: false, + }, + }, + series[1].label = { + normal: { + show: optionsSetup.isShow, + color: 'red', + position: 'insideRight', + textStyle: { + fontSize: optionsSetup.fontSize, + color: optionsSetup.subTextColor, + fontWeight: optionsSetup.fontWeight + } + }, + emphasis: { + show: false, + }, + }, + series[key].barWidth = optionsSetup.maxWidth; + } } + this.options.series = series; + }, + // tooltip 提示语设置 + setOptionsTooltip() { + const optionsSetup = this.optionsSetup; + const tooltip = { + trigger: "item", + show: true, + textStyle: { + color: optionsSetup.lineColor, + fontSize: optionsSetup.fontSize + } + }; + this.options.tooltip = tooltip; }, - splitLine: { // 分割线 - show: optionsSetup.SplitLineRight, - lineStyle: { - color: optionsSetup.SplitLineColorRight, - width: optionsSetup.SplitLinefontSizeRight, - type: 'solid' + // 边距设置 + getOptionsBottom(){ + const optionsSetup = this.optionsSetup; + let bottom = optionsSetup.marginBottom; + if (optionsSetup.hideXLeft) { + bottom = optionsSetup.marginBottom + 15 + }else if (optionsSetup.hideXRight){ + bottom = optionsSetup.marginBottom + 15 } - } - } - this.options.xAxis[2] = xAxisRight; - }, - // Y轴设置 - setOptionsY() { - const optionsSetup = this.optionsSetup; - const axisLine = { - show: optionsSetup.lineY, - lineStyle: { - color: optionsSetup.lineColorY - } - }; - const axisTick = { - show: optionsSetup.tickLineY - }; - const axisLabel = { - show: optionsSetup.hideY, - textStyle: { - align: optionsSetup.textAlign, - color: optionsSetup.colorY, - fontSize: optionsSetup.fontSizeY, - } - }; - this.options.yAxis[1]['axisLine'] = axisLine; - this.options.yAxis[1]['axisTick'] = axisTick; - this.options.yAxis[1]['axisLabel'] = axisLabel; - }, - // 数值设定、柱体设置 - setOptionsTop() { - const optionsSetup = this.optionsSetup; - const series = this.options.series; - for (const key in series) { - if (series[key].type == "bar") { - series[0].label = { - normal: { - show: optionsSetup.isShow, - position: 'insideLeft', - textStyle: { - fontSize: optionsSetup.fontSize, - color: optionsSetup.subTextColor, - fontWeight: optionsSetup.fontWeight - } + return bottom + }, + setOptionsGrid() { + const optionsSetup = this.optionsSetup; + const grid = [ + {//左 + show: optionsSetup.frameLineLeft, + left: optionsSetup.marginLeftRight, + top: optionsSetup.marginTop, + bottom: optionsSetup.marginBottom, + containLabel: true, + width: '40%' }, - emphasis: { + {//中间字体位置 show: false, + left: "51%", + top: optionsSetup.marginTop, + bottom: this.getOptionsBottom(), + width: '0%' }, - }, - series[1].label = { - normal: { - show: optionsSetup.isShow, - color: 'red', - position: 'insideRight', - textStyle: { - fontSize: optionsSetup.fontSize, - color: optionsSetup.subTextColor, - fontWeight: optionsSetup.fontWeight - } - }, - emphasis: { - show: false, - }, + {//右 + show: optionsSetup.frameLineRight, + right: optionsSetup.marginLeftRight, + top: optionsSetup.marginTop, + bottom: optionsSetup.marginBottom, + containLabel: true, + width: '40%' }, - series[key].barWidth = optionsSetup.maxWidth; - } - } - this.options.series = series; - }, - // tooltip 提示语设置 - setOptionsTooltip() { - const optionsSetup = this.optionsSetup; - const tooltip = { - trigger: "item", - show: true, - textStyle: { - color: optionsSetup.lineColor, - fontSize: optionsSetup.fontSize - } - }; - this.options.tooltip = tooltip; - }, - // 边距设置 - getOptionsBottom(){ - const optionsSetup = this.optionsSetup; - let bottom = optionsSetup.marginBottom; - if (optionsSetup.hideXLeft) { - bottom = optionsSetup.marginBottom + 15 - }else if (optionsSetup.hideXRight){ - bottom = optionsSetup.marginBottom + 15 - } - return bottom - }, - setOptionsGrid() { - const optionsSetup = this.optionsSetup; - const grid = [ - {//左 - show: optionsSetup.frameLineLeft, - left: optionsSetup.marginLeftRight, - top: optionsSetup.marginTop, - bottom: optionsSetup.marginBottom, - containLabel: true, - width: '40%' - }, - {//中间字体位置 - show: false, - left: "51%", - top: optionsSetup.marginTop, - bottom: this.getOptionsBottom(), - width: '0%' - }, - {//右 - show: optionsSetup.frameLineRight, - right: optionsSetup.marginLeftRight, - top: optionsSetup.marginTop, - bottom: optionsSetup.marginBottom, - containLabel: true, - width: '40%' - }, - ] - this.options.grid = grid; - }, - // 图例操作 - setOptionsLegend() { - const optionsSetup = this.optionsSetup; - const legend = this.options.legend; - legend.show = optionsSetup.isShowLegend; - legend.left = optionsSetup.lateralPosition; - legend.top = optionsSetup.longitudinalPosition == "top" ? 0 : "auto"; - legend.bottom = - optionsSetup.longitudinalPosition == "bottom" ? 0 : "auto"; - legend.orient = optionsSetup.layoutFront; - legend.textStyle = { - color: optionsSetup.lengedColor, - fontSize: optionsSetup.lengedFontSize - }; - legend.itemWidth = optionsSetup.lengedWidth; - }, - // 颜色修改、圆角修改 - setOptionsColor() { - const optionsSetup = this.optionsSetup; - const customColor = optionsSetup.customColor; - if (!customColor) return; - const itemStyleLeft = { - normal: { - color: customColor[0].color, - barBorderRadius: [optionsSetup.radius, 0, 0, optionsSetup.radius] - }, - emphasis: { - show: false, + ] + this.options.grid = grid; }, - } - const itemStyleRight = { - normal: { - color: customColor[1].color, - barBorderRadius: [0, optionsSetup.radius, optionsSetup.radius, 0] - }, - emphasis: { - show: false, + // 图例操作 + setOptionsLegend() { + const optionsSetup = this.optionsSetup; + const legend = this.options.legend; + legend.show = optionsSetup.isShowLegend; + legend.left = optionsSetup.lateralPosition; + legend.top = optionsSetup.longitudinalPosition == "top" ? 0 : "auto"; + legend.bottom = + optionsSetup.longitudinalPosition == "bottom" ? 0 : "auto"; + legend.orient = optionsSetup.layoutFront; + legend.textStyle = { + color: optionsSetup.lengedColor, + fontSize: optionsSetup.lengedFontSize + }; + legend.itemWidth = optionsSetup.lengedWidth; }, - } - this.options.series[0].itemStyle = itemStyleLeft; - this.options.series[1].itemStyle = itemStyleRight; - },*/ + // 颜色修改、圆角修改 + setOptionsColor() { + const optionsSetup = this.optionsSetup; + const customColor = optionsSetup.customColor; + if (!customColor) return; + const itemStyleLeft = { + normal: { + color: customColor[0].color, + barBorderRadius: [optionsSetup.radius, 0, 0, optionsSetup.radius] + }, + emphasis: { + show: false, + }, + } + const itemStyleRight = { + normal: { + color: customColor[1].color, + barBorderRadius: [0, optionsSetup.radius, optionsSetup.radius, 0] + }, + emphasis: { + show: false, + }, + } + this.options.series[0].itemStyle = itemStyleLeft; + this.options.series[1].itemStyle = itemStyleRight; + },*/ // 数据解析 setOptionsData() { const optionsSetup = this.optionsSetup; @@ -522,6 +550,7 @@ export default { this.options.series[1]['name'] = arrayList[1].name this.options.series[1]['data'] = arrayList[1].data this.options.xAxis[0]['data'] = xAxisList + this.options.xAxis[1]['data'] = xAxisList }, // 动态数据 dynamicDataFn(val, refreshTime, optionsSetup) { @@ -543,7 +572,7 @@ export default { }, renderingFn(optionsSetup, val) { this.options.yAxis[1]['data'] = val.xAxis - if (val.series[0].type == "bar"){ + if (val.series[0].type == "bar") { this.options.series[0]['name'] = val.series[0].name this.options.series[0]['data'] = val.series[0].data this.options.series[1]['name'] = val.series[1].name 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 a554e8f2..955fa859 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/widgetLinechart.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/widgetLinechart.vue @@ -180,7 +180,7 @@ export default { axisLabel: { show: true, textStyle: { - color: optionsCollapse.colorY, // x轴 坐标文字颜色 + color: optionsCollapse.colorY, // y轴 坐标文字颜色 fontSize: optionsCollapse.fontSizeY } }, From 22f31ae9ca306b2b3480844ca2e7f645d180c5f2 Mon Sep 17 00:00:00 2001 From: qianming Date: Tue, 31 Aug 2021 16:56:35 +0800 Subject: [PATCH 16/28] =?UTF-8?q?=E6=8A=98=E7=BA=BF=E5=AF=B9=E6=AF=94?= =?UTF-8?q?=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../componentsJSON/widget-line-compare.js | 118 ++-- .../widget/line/widgetLineCompareChart.vue | 514 ++++++++++-------- 2 files changed, 337 insertions(+), 295 deletions(-) diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-line-compare.js b/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-line-compare.js index a24b36a1..d42af828 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-line-compare.js +++ b/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-line-compare.js @@ -31,27 +31,59 @@ export const widgetLineCompare = { value: '' }, [ - /*{ - name: '柱体设置', + { + name: '折线设置', list: [ + { + type: 'el-switch', + label: '标记点', + name: 'markPoint', + required: false, + placeholder: '', + value: true, + }, { type: 'el-slider', - label: '最大宽度', - name: 'maxWidth', + label: '点大小', + name: 'pointSize', required: false, placeholder: '', - value: 15, + value: 10, + }, + { + type: 'el-switch', + label: '平滑曲线', + name: 'smoothCurve', + required: false, + placeholder: '', + value: true, + }, + { + type: 'el-switch', + label: '面积堆积', + name: 'area', + required: false, + placeholder: '', + value: true, }, { type: 'el-slider', - label: '圆角', - name: 'radius', - require: false, + label: '面积厚度', + name: 'areaThickness', + required: false, placeholder: '', value: 5, }, + { + type: 'el-slider', + label: '线条宽度', + name: 'lineWidth', + required: false, + placeholder: '', + value: 4, + }, ], - },*/ + }, { name: '标题设置', list: [ @@ -117,12 +149,12 @@ export const widgetLineCompare = { ], }, { - name: '左X轴设置', + name: 'X轴设置', list: [ { type: 'el-switch', label: '显示', - name: 'hideXLeft', + name: 'isShowX', required: false, placeholder: '', value: true, @@ -130,15 +162,23 @@ export const widgetLineCompare = { { type: 'el-input-number', label: '数值间隔', - name: 'splitNumberLeft', + name: 'splitNumberX', required: false, placeholder: '', value: '' }, + { + type: 'el-switch', + label: '数值居中', + name: 'boundaryX', + required: false, + placeholder: '', + value: true, + }, { type: 'vue-color', label: '数值颜色', - name: 'XcolorLeft', + name: 'colorX', required: false, placeholder: '', value: '#fff', @@ -146,7 +186,7 @@ export const widgetLineCompare = { { type: 'el-input-number', label: '数值字号', - name: 'fontSizeXLeft', + name: 'fontSizeX', required: false, placeholder: '', value: 14, @@ -154,68 +194,36 @@ export const widgetLineCompare = { { type: 'el-switch', label: '刻度线', - name: 'tickLineLeft', + name: 'tickLineX', require: false, placeholder: '', - value: false, + value: true, }, { type: 'el-switch', label: 'X轴线', - name: 'xLineLeft', + name: 'lineX', require: false, placeholder: '', - value: false, + value: true, }, { type: 'vue-color', label: '轴颜色', - name: 'lineColorXLeft', + name: 'lineColorX', required: false, placeholder: '', value: '#fff', }, - { - type: 'el-switch', - label: '竖分割线', - name: 'SplitLineLeft', - require: false, - placeholder: '', - value: false, - }, - { - type: 'vue-color', - label: '分割线颜色', - name: 'SplitLineColorLeft', - required: false, - placeholder: '', - value: '#fff', - }, - { - type: 'el-input-number', - label: '分割线宽度', - name: 'SplitLinefontSizeLeft', - required: false, - placeholder: '', - value: 1, - }, - { - type: 'el-switch', - label: '边框线', - name: 'frameLineLeft', - require: false, - placeholder: '', - value: false, - }, ], }, { - name: '右X轴设置', + name: '上y轴设置', list: [ { type: 'el-switch', label: '显示', - name: 'hideXRight', + name: 'isShowYTop', required: false, placeholder: '', value: true, @@ -223,7 +231,7 @@ export const widgetLineCompare = { { type: 'el-input-number', label: '数值间隔', - name: 'splitNumberRight', + name: 'splitNumberYTop', required: false, placeholder: '', value: '' @@ -303,7 +311,7 @@ export const widgetLineCompare = { ], }, { - name: 'Y轴设置', + name: '下Y轴设置', list: [ { type: 'el-switch', diff --git a/report-ui/src/views/report/bigscreen/designer/widget/line/widgetLineCompareChart.vue b/report-ui/src/views/report/bigscreen/designer/widget/line/widgetLineCompareChart.vue index d4142328..00912883 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/line/widgetLineCompareChart.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/line/widgetLineCompareChart.vue @@ -29,13 +29,24 @@ export default { }, tooltip: { show: true, - trigger: "axis", + trigger: 'axis', axisPointer: { - type: "line", + type: 'line', lineStyle: { - type: "dashed", + color: 'ffffff', + type: 'dashed', }, }, + /*axisPointer: { + type: 'cross', + lineStyle: { + color: 'ffffff', + type: 'dashed', + }, + crossStyle: { + color: 'ffffff', + } + },*/ }, //边距 grid: [ @@ -65,6 +76,7 @@ export default { xAxis: [ {// gridIndex: 0, + show: true, type: 'category', boundaryGap: true, // 居中 axisLine: { //x轴线 @@ -79,6 +91,7 @@ export default { axisLabel: { // X轴数据 show: true, textStyle: { + interval: 0, color: '#ffffff', fontSize: 14 } @@ -87,6 +100,7 @@ export default { }, {// gridIndex: 1, + show: true, type: 'category', position: 'top', boundaryGap: true, // 居中 @@ -101,6 +115,7 @@ export default { }, axisLabel: { show: false, + interval: 0, }, data: [], }, @@ -129,6 +144,9 @@ export default { color: '#ffffff', }, }, + axisPointer: { + snap: true + }, }, { gridIndex: 1, @@ -153,6 +171,9 @@ export default { color: '#ffffff', }, }, + axisPointer: { + snap: true + }, }, ], series: [ @@ -242,260 +263,274 @@ export default { methods: { // 修改图标options属性 editorOptions() { - /*this.setOptionsTitle(); - this.setOptionsXLeft(); - this.setOptionsXRight(); - this.setOptionsY(); - this.setOptionsTop(); - this.setOptionsTooltip(); - this.setOptionsGrid(); - this.setOptionsLegend(); - this.setOptionsColor();*/ + this.setOptionsTitle(); + this.setOptionsX(); + // this.setOptionsXRight(); + // this.setOptionsY(); + // this.setOptionsTop(); + // this.setOptionsTooltip(); + // this.setOptionsGrid(); + // this.setOptionsLegend(); + // this.setOptionsColor(); this.setOptionsData(); }, - /* // 标题修改 - setOptionsTitle() { - const optionsCollapse = this.optionsSetup; - const title = {}; - title.text = optionsCollapse.titleText; - title.show = optionsCollapse.isNoTitle; - title.left = optionsCollapse.textAlign; - title.textStyle = { - color: optionsCollapse.textColor, - fontSize: optionsCollapse.textFontSize, - fontWeight: optionsCollapse.textFontWeight - }; - this.options.title = title; - }, - // 左X轴设置 - setOptionsXLeft() { - const optionsSetup = this.optionsSetup; - const xAxisLeft = { - splitNumber: optionsSetup.splitNumberLeft, - type: 'value', - inverse: true, - axisLine: {//X轴线 - show: optionsSetup.xLineLeft, - lineStyle: { - color: optionsSetup.lineColorXLeft, - }, - }, - axisTick: { - show: optionsSetup.tickLineLeft, - }, - position: 'bottom', - axisLabel: { // x轴 - show: optionsSetup.hideXLeft, - textStyle: { - color: optionsSetup.XcolorLeft, - fontSize: optionsSetup.fontSizeXLeft - } - }, - splitLine: { // 分割线 - show: optionsSetup.SplitLineLeft, - lineStyle: { - color: optionsSetup.SplitLineColorLeft, - width: optionsSetup.SplitLinefontSizeLeft, - type: 'solid' - } - } + // 标题修改 + setOptionsTitle() { + const optionsCollapse = this.optionsSetup; + const title = {}; + title.text = optionsCollapse.titleText; + title.show = optionsCollapse.isNoTitle; + title.left = optionsCollapse.textAlign; + title.textStyle = { + color: optionsCollapse.textColor, + fontSize: optionsCollapse.textFontSize, + fontWeight: optionsCollapse.textFontWeight + }; + this.options.title = title; + }, + // X轴设置 + setOptionsX() { + const optionsSetup = this.optionsSetup; + const xAxis0 = { + gridIndex: 0, + show: optionsSetup.isShowX, + type: 'category', + boundaryGap: optionsSetup.boundaryX, // 值居中 + axisLine: { //x轴线 + show: optionsSetup.lineX, + lineStyle: { + color: optionsSetup.lineColorX, } - this.options.xAxis[0] = xAxisLeft; }, - // 右X轴设置 - setOptionsXRight() { - const optionsSetup = this.optionsSetup; - const xAxisRight = { - gridIndex: 2, - splitNumber: optionsSetup.splitNumberRight, - type: 'value', - axisLine: {//X轴线 - show: optionsSetup.xLineRight, - lineStyle: { - color: optionsSetup.lineColorXRight, - }, - }, - axisTick: { - show: optionsSetup.tickLineRight, - }, - position: 'bottom', - axisLabel: { // x轴 - show: optionsSetup.hideXRight, - textStyle: { - color: optionsSetup.XcolorRight, - fontSize: optionsSetup.fontSizeXRight - } - }, - splitLine: { // 分割线 - show: optionsSetup.SplitLineRight, - lineStyle: { - color: optionsSetup.SplitLineColorRight, - width: optionsSetup.SplitLinefontSizeRight, - type: 'solid' - } - } - } - this.options.xAxis[2] = xAxisRight; + axisTick: { // 刻度 + show: optionsSetup.tickLineX, }, - // Y轴设置 - setOptionsY() { - const optionsSetup = this.optionsSetup; - const axisLine = { - show: optionsSetup.lineY, - lineStyle: { - color: optionsSetup.lineColorY - } - }; - const axisTick = { - show: optionsSetup.tickLineY - }; - const axisLabel = { - show: optionsSetup.hideY, - textStyle: { - align: optionsSetup.textAlign, - color: optionsSetup.colorY, - fontSize: optionsSetup.fontSizeY, - } - }; - this.options.yAxis[1]['axisLine'] = axisLine; - this.options.yAxis[1]['axisTick'] = axisTick; - this.options.yAxis[1]['axisLabel'] = axisLabel; + axisLabel: { // X轴数据 + show: true, + interval: optionsSetup.splitNumberX, + textStyle: { + color: optionsSetup.colorX, + fontSize: optionsSetup.fontSizeX + } }, - // 数值设定、柱体设置 - setOptionsTop() { - const optionsSetup = this.optionsSetup; - const series = this.options.series; - for (const key in series) { - if (series[key].type == "bar") { - series[0].label = { - normal: { - show: optionsSetup.isShow, - position: 'insideLeft', - textStyle: { - fontSize: optionsSetup.fontSize, - color: optionsSetup.subTextColor, - fontWeight: optionsSetup.fontWeight - } - }, - emphasis: { - show: false, - }, - }, - series[1].label = { - normal: { - show: optionsSetup.isShow, - color: 'red', - position: 'insideRight', - textStyle: { - fontSize: optionsSetup.fontSize, - color: optionsSetup.subTextColor, - fontWeight: optionsSetup.fontWeight - } - }, - emphasis: { - show: false, - }, - }, - series[key].barWidth = optionsSetup.maxWidth; - } + } + const xAxis1 = { + gridIndex: 1, + show: optionsSetup.isShowX, + type: 'category', + position: 'top', + boundaryGap: optionsSetup.boundaryX, // 值居中 + axisLine: { // x轴线 + show: optionsSetup.lineX, + lineStyle: { + color: optionsSetup.lineColorX, } - this.options.series = series; }, - // tooltip 提示语设置 - setOptionsTooltip() { - const optionsSetup = this.optionsSetup; - const tooltip = { - trigger: "item", - show: true, - textStyle: { - color: optionsSetup.lineColor, - fontSize: optionsSetup.fontSize - } - }; - this.options.tooltip = tooltip; + axisTick: { // 刻度 + show: optionsSetup.tickLineX, }, - // 边距设置 - getOptionsBottom(){ - const optionsSetup = this.optionsSetup; - let bottom = optionsSetup.marginBottom; - if (optionsSetup.hideXLeft) { - bottom = optionsSetup.marginBottom + 15 - }else if (optionsSetup.hideXRight){ - bottom = optionsSetup.marginBottom + 15 - } - return bottom + axisLabel: { + show: false, + interval: optionsSetup.splitNumberX, }, - setOptionsGrid() { - const optionsSetup = this.optionsSetup; - const grid = [ - {//左 - show: optionsSetup.frameLineLeft, - left: optionsSetup.marginLeftRight, - top: optionsSetup.marginTop, - bottom: optionsSetup.marginBottom, - containLabel: true, - width: '40%' - }, - {//中间字体位置 - show: false, - left: "51%", - top: optionsSetup.marginTop, - bottom: this.getOptionsBottom(), - width: '0%' - }, - {//右 - show: optionsSetup.frameLineRight, - right: optionsSetup.marginLeftRight, - top: optionsSetup.marginTop, - bottom: optionsSetup.marginBottom, - containLabel: true, - width: '40%' - }, - ] - this.options.grid = grid; + } + this.options.xAxis[0] = xAxis0; + this.options.xAxis[1] = xAxis1; + }, + // 右X轴设置 + setOptionsXRight() { + const optionsSetup = this.optionsSetup; + const xAxisRight = { + gridIndex: 2, + splitNumber: optionsSetup.splitNumberRight, + type: 'value', + axisLine: {//X轴线 + show: optionsSetup.xLineRight, + lineStyle: { + color: optionsSetup.lineColorXRight, + }, }, - // 图例操作 - setOptionsLegend() { - const optionsSetup = this.optionsSetup; - const legend = this.options.legend; - legend.show = optionsSetup.isShowLegend; - legend.left = optionsSetup.lateralPosition; - legend.top = optionsSetup.longitudinalPosition == "top" ? 0 : "auto"; - legend.bottom = - optionsSetup.longitudinalPosition == "bottom" ? 0 : "auto"; - legend.orient = optionsSetup.layoutFront; - legend.textStyle = { - color: optionsSetup.lengedColor, - fontSize: optionsSetup.lengedFontSize - }; - legend.itemWidth = optionsSetup.lengedWidth; + axisTick: { + show: optionsSetup.tickLineRight, }, - // 颜色修改、圆角修改 - setOptionsColor() { - const optionsSetup = this.optionsSetup; - const customColor = optionsSetup.customColor; - if (!customColor) return; - const itemStyleLeft = { - normal: { - color: customColor[0].color, - barBorderRadius: [optionsSetup.radius, 0, 0, optionsSetup.radius] - }, - emphasis: { - show: false, - }, + position: 'bottom', + axisLabel: { // x轴 + show: optionsSetup.hideXRight, + textStyle: { + color: optionsSetup.XcolorRight, + fontSize: optionsSetup.fontSizeXRight } - const itemStyleRight = { + }, + splitLine: { // 分割线 + show: optionsSetup.SplitLineRight, + lineStyle: { + color: optionsSetup.SplitLineColorRight, + width: optionsSetup.SplitLinefontSizeRight, + type: 'solid' + } + } + } + this.options.xAxis[2] = xAxisRight; + }, + // Y轴设置 + setOptionsY() { + const optionsSetup = this.optionsSetup; + const axisLine = { + show: optionsSetup.lineY, + lineStyle: { + color: optionsSetup.lineColorY + } + }; + const axisTick = { + show: optionsSetup.tickLineY + }; + const axisLabel = { + show: optionsSetup.hideY, + textStyle: { + align: optionsSetup.textAlign, + color: optionsSetup.colorY, + fontSize: optionsSetup.fontSizeY, + } + }; + this.options.yAxis[1]['axisLine'] = axisLine; + this.options.yAxis[1]['axisTick'] = axisTick; + this.options.yAxis[1]['axisLabel'] = axisLabel; + }, + // 数值设定、柱体设置 + setOptionsTop() { + const optionsSetup = this.optionsSetup; + const series = this.options.series; + for (const key in series) { + if (series[key].type == "bar") { + series[0].label = { normal: { - color: customColor[1].color, - barBorderRadius: [0, optionsSetup.radius, optionsSetup.radius, 0] + show: optionsSetup.isShow, + position: 'insideLeft', + textStyle: { + fontSize: optionsSetup.fontSize, + color: optionsSetup.subTextColor, + fontWeight: optionsSetup.fontWeight + } }, emphasis: { show: false, }, - } - this.options.series[0].itemStyle = itemStyleLeft; - this.options.series[1].itemStyle = itemStyleRight; - },*/ + }, + series[1].label = { + normal: { + show: optionsSetup.isShow, + color: 'red', + position: 'insideRight', + textStyle: { + fontSize: optionsSetup.fontSize, + color: optionsSetup.subTextColor, + fontWeight: optionsSetup.fontWeight + } + }, + emphasis: { + show: false, + }, + }, + series[key].barWidth = optionsSetup.maxWidth; + } + } + this.options.series = series; + }, + // tooltip 提示语设置 + setOptionsTooltip() { + const optionsSetup = this.optionsSetup; + const tooltip = { + trigger: "item", + show: true, + textStyle: { + color: optionsSetup.lineColor, + fontSize: optionsSetup.fontSize + } + }; + this.options.tooltip = tooltip; + }, + // 边距设置 + getOptionsBottom() { + const optionsSetup = this.optionsSetup; + let bottom = optionsSetup.marginBottom; + if (optionsSetup.hideXLeft) { + bottom = optionsSetup.marginBottom + 15 + } else if (optionsSetup.hideXRight) { + bottom = optionsSetup.marginBottom + 15 + } + return bottom + }, + setOptionsGrid() { + const optionsSetup = this.optionsSetup; + const grid = [ + {//左 + show: optionsSetup.frameLineLeft, + left: optionsSetup.marginLeftRight, + top: optionsSetup.marginTop, + bottom: optionsSetup.marginBottom, + containLabel: true, + width: '40%' + }, + {//中间字体位置 + show: false, + left: "51%", + top: optionsSetup.marginTop, + bottom: this.getOptionsBottom(), + width: '0%' + }, + {//右 + show: optionsSetup.frameLineRight, + right: optionsSetup.marginLeftRight, + top: optionsSetup.marginTop, + bottom: optionsSetup.marginBottom, + containLabel: true, + width: '40%' + }, + ] + this.options.grid = grid; + }, + // 图例操作 + setOptionsLegend() { + const optionsSetup = this.optionsSetup; + const legend = this.options.legend; + legend.show = optionsSetup.isShowLegend; + legend.left = optionsSetup.lateralPosition; + legend.top = optionsSetup.longitudinalPosition == "top" ? 0 : "auto"; + legend.bottom = + optionsSetup.longitudinalPosition == "bottom" ? 0 : "auto"; + legend.orient = optionsSetup.layoutFront; + legend.textStyle = { + color: optionsSetup.lengedColor, + fontSize: optionsSetup.lengedFontSize + }; + legend.itemWidth = optionsSetup.lengedWidth; + }, + // 颜色修改、圆角修改 + setOptionsColor() { + const optionsSetup = this.optionsSetup; + const customColor = optionsSetup.customColor; + if (!customColor) return; + const itemStyleLeft = { + normal: { + color: customColor[0].color, + barBorderRadius: [optionsSetup.radius, 0, 0, optionsSetup.radius] + }, + emphasis: { + show: false, + }, + } + const itemStyleRight = { + normal: { + color: customColor[1].color, + barBorderRadius: [0, optionsSetup.radius, optionsSetup.radius, 0] + }, + emphasis: { + show: false, + }, + } + this.options.series[0].itemStyle = itemStyleLeft; + this.options.series[1].itemStyle = itemStyleRight; + }, // 数据解析 setOptionsData() { const optionsSetup = this.optionsSetup; @@ -544,7 +579,6 @@ export default { data: data }) } - console.log(arrayList) this.options.series[0]['name'] = arrayList[0].name this.options.series[0]['data'] = arrayList[0].data this.options.series[1]['name'] = arrayList[1].name From 3d7c1067ec66856ab4faeacd5c66407d264e6267 Mon Sep 17 00:00:00 2001 From: qianming Date: Wed, 1 Sep 2021 10:35:45 +0800 Subject: [PATCH 17/28] =?UTF-8?q?=E6=B8=90=E5=8F=98=E8=89=B2=E6=9F=B1?= =?UTF-8?q?=E5=BD=A2=E5=9B=BEy=E8=BD=B4=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../componentsJSON/widget-gradient-barchart.js | 16 ++++++++++++---- .../widget/bar/widgetGradientColorBarchart.vue | 3 ++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-gradient-barchart.js b/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-gradient-barchart.js index c823e321..b32528a4 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-gradient-barchart.js +++ b/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-gradient-barchart.js @@ -1,6 +1,6 @@ /* * @Descripttion: 柱状图渐变色 json - * @version: + * @version: * @Author: qianlishi * @Date: 2021-08-29 07:23:41 * @LastEditors: qianlishi @@ -298,10 +298,18 @@ export const widgetGradientBarchart = { placeholder: '', value: 0 }, + { + type: 'el-switch', + label: '缩放', + name: 'scale', + require: false, + placeholder: '', + value: false, + }, { type: 'el-input-number', - label: '文字间隔', - name: 'ytextInterval', + label: '均分', + name: 'splitNumber', required: false, placeholder: '', value: '' @@ -564,4 +572,4 @@ export const widgetGradientBarchart = { }, ], } - } \ No newline at end of file + } 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 d1f38a2f..b3880e7b 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 @@ -241,12 +241,13 @@ export default { const optionsCollapse = this.optionsSetup; const yAxis = { type: "value", + scale : optionsCollapse.scale, + splitNumber: optionsCollapse.splitNumber,// 均分 show: optionsCollapse.isShowY, // 坐标轴是否显示 name: optionsCollapse.textNameY, // 坐标轴名称 inverse: optionsCollapse.reversalY, // 轴反转 axisLabel: { show: true, - interval: optionsCollapse.ytextInterval, // 文字间隔 rotate: optionsCollapse.ytextAngle, // 文字角度 textStyle: { color: optionsCollapse.colorY, // y轴 坐标文字颜色 From ff1a5b9d2cf6bb1bbbc7e30632532dfe280f45cf Mon Sep 17 00:00:00 2001 From: qianming Date: Wed, 1 Sep 2021 11:07:32 +0800 Subject: [PATCH 18/28] update --- .../tools/componentsJSON/widget-barchart.js | 130 +++++++++++------- .../widget-gradient-barchart.js | 74 +++++++--- .../bar/widgetGradientColorBarchart.vue | 8 ++ .../designer/widget/widgetBarchart.vue | 7 +- 4 files changed, 142 insertions(+), 77 deletions(-) diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-barchart.js b/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-barchart.js index 5ab96c14..da853d14 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-barchart.js +++ b/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-barchart.js @@ -1,6 +1,6 @@ /* * @Descripttion: 柱状图json - * @version: + * @version: * @Author: qianlishi * @Date: 2021-08-29 07:21:45 * @LastEditors: qianlishi @@ -173,14 +173,6 @@ export const widgetBarchart = { { name: 'X轴设置', list: [ - { - type: 'el-input-text', - label: '名称', - name: 'xName', - required: false, - placeholder: '', - value: '' - }, { type: 'el-switch', label: '显示', @@ -189,25 +181,49 @@ export const widgetBarchart = { placeholder: '', value: true, }, + { + type: 'el-input-text', + label: '坐标名', + name: 'xName', + required: false, + placeholder: '', + value: '' + }, { type: 'vue-color', label: '坐标名颜色', - name: 'xNameColor', + name: 'nameColorX', required: false, placeholder: '', value: '#fff' }, { type: 'el-input-number', - label: '字体大小', - name: 'xNameFontSize', + label: '坐标字号', + name: 'nameFontSizeX', required: false, placeholder: '', value: 12 }, + { + type: 'vue-color', + label: '数值颜色', + name: 'Xcolor', + required: false, + placeholder: '', + value: '#fff', + }, + { + type: 'el-input-number', + label: '数值字号', + name: 'fontSizeX', + required: false, + placeholder: '', + value: 12, + }, { type: 'el-slider', - label: '文字角度', + label: '数值角度', name: 'textAngle', required: false, placeholder: '', @@ -215,7 +231,7 @@ export const widgetBarchart = { }, { type: 'el-input-number', - label: '文字间隔', + label: '数值间隔', name: 'textInterval', required: false, placeholder: '', @@ -229,22 +245,6 @@ export const widgetBarchart = { placeholder: '', value: false }, - { - type: 'vue-color', - label: '颜色', - name: 'Xcolor', - required: false, - placeholder: '', - value: '#fff', - }, - { - type: 'el-input-number', - label: '字号', - name: 'fontSizeX', - required: false, - placeholder: '', - value: 12, - }, { type: 'vue-color', label: '轴颜色', @@ -275,14 +275,6 @@ export const widgetBarchart = { { name: 'Y轴设置', list: [ - { - type: 'el-input-text', - label: '名称', - name: 'textNameY', - require: false, - placeholder: '', - value: '' - }, { type: 'el-switch', label: '显示', @@ -291,33 +283,33 @@ export const widgetBarchart = { placeholder: '', value: true, }, + { + type: 'el-input-text', + label: '坐标名', + name: 'textNameY', + require: false, + placeholder: '', + value: '' + }, { type: 'vue-color', label: '坐标名颜色', - name: 'NameColorY', + name: 'nameColorY', required: false, placeholder: '', value: '#fff', }, { type: 'el-input-number', - label: '字体大小', - name: 'NameFontSizeY', - required: false, - placeholder: '', - value: 12, - }, - { - type: 'el-switch', - label: '轴反转', - name: 'reversalY', + label: '坐标字号', + name: 'nameFontSizeY', required: false, placeholder: '', - value: false + value: 14, }, { type: 'vue-color', - label: '颜色', + label: '数值颜色', name: 'colorY', required: false, placeholder: '', @@ -325,11 +317,43 @@ export const widgetBarchart = { }, { type: 'el-input-number', - label: '字号', + label: '数值字号', name: 'fontSizeY', required: false, placeholder: '', - value: 12, + value: 14, + }, + { + type: 'el-slider', + label: '数值角度', + name: 'ytextAngle', + required: false, + placeholder: '', + value: 0 + }, + { + type: 'el-switch', + label: '缩放', + name: 'scale', + require: false, + placeholder: '', + value: false, + }, + { + type: 'el-input-number', + label: '均分', + name: 'splitNumber', + required: false, + placeholder: '', + value: '' + }, + { + type: 'el-switch', + label: '轴反转', + name: 'reversalY', + required: false, + placeholder: '', + value: false }, { type: 'vue-color', diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-gradient-barchart.js b/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-gradient-barchart.js index b32528a4..91e588c4 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-gradient-barchart.js +++ b/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-gradient-barchart.js @@ -173,41 +173,57 @@ export const widgetGradientBarchart = { { name: 'X轴设置', list: [ + { + type: 'el-switch', + label: '显示', + name: 'hideX', + required: false, + placeholder: '', + value: true, + }, { type: 'el-input-text', - label: '名称', + label: '坐标名', name: 'xName', required: false, placeholder: '', value: '' }, { - type: 'el-switch', - label: '显示', - name: 'hideX', + type: 'vue-color', + label: '坐标名颜色', + name: 'nameColorX', required: false, placeholder: '', - value: true, + value: '#fff', }, { type: 'el-input-number', - label: '字号', - name: 'fontSizeX', + label: '坐标字号', + name: 'nameFontSizeX', required: false, placeholder: '', - value: 12, + value: 14, }, { type: 'vue-color', - label: '颜色', + label: '数值颜色', name: 'Xcolor', required: false, placeholder: '', value: '#fff', }, + { + type: 'el-input-number', + label: '数值字号', + name: 'fontSizeX', + required: false, + placeholder: '', + value: 14, + }, { type: 'el-slider', - label: '文字角度', + label: '数值角度', name: 'textAngle', required: false, placeholder: '', @@ -215,7 +231,7 @@ export const widgetGradientBarchart = { }, { type: 'el-input-number', - label: '文字间隔', + label: '数值间隔', name: 'textInterval', required: false, placeholder: '', @@ -258,25 +274,40 @@ export const widgetGradientBarchart = { { name: 'Y轴设置', list: [ + { + type: 'el-switch', + label: '显示', + name: 'isShowY', + require: false, + placeholder: '', + value: true, + }, { type: 'el-input-text', - label: '名称', + label: '坐标名', name: 'textNameY', require: false, placeholder: '', value: '' + },{ + type: 'vue-color', + label: '坐标名颜色', + name: 'nameColorY', + required: false, + placeholder: '', + value: '#fff', }, { - type: 'el-switch', - label: '显示', - name: 'isShowY', - require: false, + type: 'el-input-number', + label: '坐标字号', + name: 'namefontSizeY', + required: false, placeholder: '', - value: true, + value: 14, }, { type: 'vue-color', - label: '颜色', + label: '数值颜色', name: 'colorY', required: false, placeholder: '', @@ -284,15 +315,15 @@ export const widgetGradientBarchart = { }, { type: 'el-input-number', - label: '字号', + label: '数值字号', name: 'fontSizeY', required: false, placeholder: '', - value: 12, + value: 14, }, { type: 'el-slider', - label: '文字角度', + label: '数值角度', name: 'ytextAngle', required: false, placeholder: '', @@ -344,7 +375,6 @@ export const widgetGradientBarchart = { 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 b3880e7b..48cfd4ca 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 @@ -210,6 +210,10 @@ export default { type: "category", show: optionsCollapse.hideX, // 坐标轴是否显示 name: optionsCollapse.xName, // 坐标轴名称 + nameTextStyle: { + color: optionsCollapse.nameColorX, + fontSize: optionsCollapse.nameFontSizeX + }, nameRotate: optionsCollapse.textAngle, // 文字角度 inverse: optionsCollapse.reversalX, // 轴反转 axisLabel: { @@ -245,6 +249,10 @@ export default { splitNumber: optionsCollapse.splitNumber,// 均分 show: optionsCollapse.isShowY, // 坐标轴是否显示 name: optionsCollapse.textNameY, // 坐标轴名称 + nameTextStyle: { // 别名 + color: optionsCollapse.nameColorY, + fontSize: optionsCollapse.namefontSizeY + }, inverse: optionsCollapse.reversalY, // 轴反转 axisLabel: { show: true, 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 d364bb0f..e25cadcd 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/widgetBarchart.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/widgetBarchart.vue @@ -165,15 +165,18 @@ export default { const optionsCollapse = this.optionsSetup; const yAxis = { type: "value", + scale : optionsCollapse.scale, + splitNumber: optionsCollapse.splitNumber,// 均分 show: optionsCollapse.isShowY, // 坐标轴是否显示 name: optionsCollapse.textNameY, // 坐标轴名称 nameTextStyle: { - color: optionsCollapse.NameColorY, - fontSize: optionsCollapse.NameFontSizeY + color: optionsCollapse.nameColorY, + fontSize: optionsCollapse.nameFontSizeY }, inverse: optionsCollapse.reversalY, // 轴反转 axisLabel: { show: true, + rotate: optionsCollapse.ytextAngle, // 文字角度 textStyle: { color: optionsCollapse.colorY, // x轴 坐标文字颜色 fontSize: optionsCollapse.fontSizeY From bfd85adbec61f227319025cd716c476dfc87baed Mon Sep 17 00:00:00 2001 From: qianming Date: Wed, 1 Sep 2021 13:04:11 +0800 Subject: [PATCH 19/28] =?UTF-8?q?=E6=97=B6=E9=97=B4=EF=BC=8C=E6=98=9F?= =?UTF-8?q?=E6=9C=9F=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/report/bigscreen/designer/widget/widgetTime.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/report-ui/src/views/report/bigscreen/designer/widget/widgetTime.vue b/report-ui/src/views/report/bigscreen/designer/widget/widgetTime.vue index 2bea618f..465fab36 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/widgetTime.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/widgetTime.vue @@ -103,7 +103,7 @@ export default { const dayCycleArray = ["日", "一", "二", "三", "四", "五", "六"]; for (let i = 0; i < 7; i++) { if (dayCycle == i) { - dayCycle = "星期" + dayCycleArray[i]; + dayCycle = " 星期" + dayCycleArray[i]; } } if (fmt == "year-week") { From a43f966c69f3f60b2cf5455e098871627691a266 Mon Sep 17 00:00:00 2001 From: qianming Date: Wed, 1 Sep 2021 13:45:53 +0800 Subject: [PATCH 20/28] update --- .../componentsJSON/widget-barlinechart.js | 165 +++++++++++------- .../widget-gradient-barchart.js | 3 +- .../tools/componentsJSON/widget-linechart.js | 147 +++++++++------- .../designer/widget/widgetBarlinechart.vue | 43 ++--- .../designer/widget/widgetLinechart.vue | 16 +- 5 files changed, 213 insertions(+), 161 deletions(-) diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-barlinechart.js b/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-barlinechart.js index a6275ed1..afaa2aaa 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-barlinechart.js +++ b/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-barlinechart.js @@ -1,6 +1,6 @@ /* * @Descripttion: 主线图 - * @version: + * @version: * @Author: qianlishi * @Date: 2021-08-29 07:26:48 * @LastEditors: qianlishi @@ -218,14 +218,6 @@ export const widgetBarlinechart = { { name: 'X轴设置', list: [ - { - type: 'el-input-text', - label: '名称', - name: 'xName', - required: false, - placeholder: '', - value: '' - }, { type: 'el-switch', label: '显示', @@ -234,61 +226,69 @@ export const widgetBarlinechart = { placeholder: '', value: true, }, + { + type: 'el-input-text', + label: '坐标名', + name: 'xName', + required: false, + placeholder: '', + value: '' + }, { type: 'vue-color', label: '坐标名颜色', - name: 'xNameColor', + name: 'nameColorX', required: false, placeholder: '', - value: '#fff' + value: '#fff', }, { type: 'el-input-number', - label: '字体大小', - name: 'xNameFontSize', + label: '坐标字号', + name: 'nameFontSizeX', required: false, placeholder: '', - value: 12 + value: 14, }, { - type: 'el-slider', - label: '文字角度', - name: 'textAngle', + type: 'vue-color', + label: '数值颜色', + name: 'Xcolor', required: false, placeholder: '', - value: 0 + value: '#fff', }, { type: 'el-input-number', - label: '文字间隔', - name: 'textInterval', + label: '数值字号', + name: 'fontSizeX', required: false, placeholder: '', - value: 0 + value: 14, }, { - type: 'el-switch', - label: '轴反转', - name: 'reversalX', + type: 'el-slider', + label: '数值角度', + name: 'textAngle', required: false, placeholder: '', value: 0 }, { - type: 'vue-color', - label: '颜色', - name: 'Xcolor', + type: 'el-input-number', + label: '数值间隔', + name: 'textInterval', required: false, placeholder: '', - value: '#fff', + value: '' }, { - type: 'el-input-number', - label: '字号', - name: 'fontSizeX', + type: 'el-switch', + label: '轴反转', + name: 'reversalX', required: false, placeholder: '', - value: 16, + value: false }, { type: 'vue-color', @@ -313,56 +313,95 @@ export const widgetBarlinechart = { required: false, placeholder: '', value: '#fff', - } ], }, { name: 'Y轴设置', list: [ + { + type: 'el-switch', + label: '左显示', + name: 'isShowYLeft', + require: false, + placeholder: '', + value: true, + }, { type: 'el-input-text', - label: '名称', - name: 'textNameY', + label: '左坐标名', + name: 'textNameYLeft', require: false, placeholder: '', value: '' }, + { + type: 'vue-color', + label: '左坐标名颜色', + name: 'nameColorYLeft', + required: false, + placeholder: '', + value: '#fff', + }, + { + type: 'el-input-number', + label: '左坐标字号', + name: 'namefontSizeYLeft', + required: false, + placeholder: '', + value: 14, + }, + { + type: 'el-input-number', + label: '左均分', + name: 'splitNumberLeft', + required: false, + placeholder: '', + value: '' + }, { type: 'el-switch', - label: '显示', - name: 'isShowY', + label: '右显示', + name: 'isShowYRight', require: false, placeholder: '', value: true, }, + { + type: 'el-input-text', + label: '右坐标名', + name: 'textNameYRight', + require: false, + placeholder: '', + value: '' + }, { type: 'vue-color', - label: '坐标名颜色', - name: 'NameColorY', + label: '右坐标名颜色', + name: 'nameColorYRight', required: false, placeholder: '', - value: '#fff' + value: '#fff', }, { type: 'el-input-number', - label: '字体大小', - name: 'NameFontSizeY', + label: '右坐标字号', + name: 'namefontSizeYRight', required: false, placeholder: '', - value: 12 + value: 14, }, { - type: 'el-switch', - label: '轴反转', - name: 'reversalY', + type: 'el-input-number', + label: '右均分', + name: 'splitNumberRight', required: false, placeholder: '', - value: 0 + value: '' }, { type: 'vue-color', - label: '颜色', + label: '数值颜色', name: 'colorY', required: false, placeholder: '', @@ -370,36 +409,28 @@ export const widgetBarlinechart = { }, { type: 'el-input-number', - label: '字号', + label: '数值字号', name: 'fontSizeY', required: false, placeholder: '', - value: 12, + value: 14, }, { - type: 'vue-color', - label: '轴颜色', - name: 'lineColorY', + type: 'el-switch', + label: '轴反转', + name: 'reversalY', required: false, placeholder: '', - value: '#fff', + value: false }, { - type: 'el-switch', - label: '分割线显示', - name: 'isShowSplitLineY', - require: false, - placeholder: '', - value: false, - }, { type: 'vue-color', - label: '分割线颜色', - name: 'splitLineColorY', + label: '轴颜色', + name: 'lineColorY', required: false, placeholder: '', value: '#fff', - - } + }, ], }, { @@ -538,7 +569,7 @@ export const widgetBarlinechart = { label: '', name: 'customColor', required: false, - value: [{color: '#00F4FFFF'}, {color: '#42fffd'}], + value: [{color: '#00F4FFFF'}, {color: '#e68b55'}], }, ], }, @@ -631,4 +662,4 @@ export const widgetBarlinechart = { }, ], } - } \ No newline at end of file + } diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-gradient-barchart.js b/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-gradient-barchart.js index 91e588c4..fb8855e6 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-gradient-barchart.js +++ b/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-gradient-barchart.js @@ -368,7 +368,8 @@ export const widgetGradientBarchart = { require: false, placeholder: '', value: false, - }, { + }, + { type: 'vue-color', label: '分割线颜色', name: 'splitLineColorY', diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-linechart.js b/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-linechart.js index f0832bb8..c7e1dde2 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-linechart.js +++ b/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-linechart.js @@ -1,6 +1,6 @@ /* * @Descripttion: 折线图json - * @version: + * @version: * @Author: qianlishi * @Date: 2021-08-29 07:24:48 * @LastEditors: qianlishi @@ -109,7 +109,7 @@ export const widgetLinechart = { name: 'textColor', required: false, placeholder: '', - value: '##FFD700' + value: '#fff' }, { type: 'el-select', @@ -127,7 +127,7 @@ export const widgetLinechart = { }, { type: 'el-input-number', - label: '字体大小', + label: '字体字号', name: 'textFontSize', required: false, placeholder: '', @@ -178,7 +178,7 @@ export const widgetLinechart = { }, { type: 'el-input-number', - label: '字体大小', + label: '字体字号', name: 'subTextFontSize', required: false, placeholder: '', @@ -189,41 +189,57 @@ export const widgetLinechart = { { name: 'X轴设置', list: [ + { + type: 'el-switch', + label: '显示', + name: 'hideX', + required: false, + placeholder: '', + value: true, + }, { type: 'el-input-text', - label: '名称', + label: '坐标名', name: 'xName', required: false, placeholder: '', value: '' }, { - type: 'el-switch', - label: '显示', - name: 'hideX', + type: 'vue-color', + label: '坐标名颜色', + name: 'nameColorX', required: false, placeholder: '', - value: true, + value: '#fff', + }, + { + type: 'el-input-number', + label: '坐标字号', + name: 'nameFontSizeX', + required: false, + placeholder: '', + value: 14, }, { type: 'vue-color', - label: '坐标名颜色', - name: 'xNameColor', + label: '数值颜色', + name: 'Xcolor', required: false, placeholder: '', - value: '#fff' + value: '#fff', }, { type: 'el-input-number', - label: '字体大小', - name: 'xNameFontSize', + label: '数值字号', + name: 'fontSizeX', required: false, placeholder: '', - value: 12 + value: 14, }, { type: 'el-slider', - label: '文字角度', + label: '数值角度', name: 'textAngle', required: false, placeholder: '', @@ -231,11 +247,11 @@ export const widgetLinechart = { }, { type: 'el-input-number', - label: '文字间隔', + label: '数值间隔', name: 'textInterval', required: false, placeholder: '', - value: 0 + value: '' }, { type: 'el-switch', @@ -245,22 +261,6 @@ export const widgetLinechart = { placeholder: '', value: false }, - { - type: 'vue-color', - label: '颜色', - name: 'Xcolor', - required: false, - placeholder: '', - value: '#fff', - }, - { - type: 'el-input-text', - label: '字号', - name: 'fontSizeX', - required: false, - placeholder: '', - value: 12, - }, { type: 'vue-color', label: '轴颜色', @@ -284,21 +284,12 @@ export const widgetLinechart = { required: false, placeholder: '', value: '#fff', - } ], }, { name: 'Y轴设置', list: [ - { - type: 'el-input-text', - label: '名称', - name: 'textNameY', - require: false, - placeholder: '', - value: '' - }, { type: 'el-switch', label: '显示', @@ -308,44 +299,76 @@ export const widgetLinechart = { value: true, }, { - type: 'vue-color', - label: '坐标名颜色', - name: 'NameColorY', - required: false, + type: 'el-input-text', + label: '坐标名', + name: 'textNameY', + require: false, placeholder: '', - value: '#fff' + value: '' }, { - type: 'el-input-text', - label: '字体大小', - name: 'NameFontSizeY', + type: 'vue-color', + label: '坐标名颜色', + name: 'nameColorY', required: false, placeholder: '', - value: 12 + value: '#fff', }, { - type: 'el-switch', - label: '轴反转', - name: 'reversalY', + type: 'el-input-number', + label: '坐标字号', + name: 'namefontSizeY', required: false, placeholder: '', - value: false + value: 14, }, { type: 'vue-color', - label: '颜色', + label: '数值颜色', name: 'colorY', required: false, placeholder: '', value: '#fff', }, { - type: 'el-input-text', - label: '字号', + type: 'el-input-number', + label: '数值字号', name: 'fontSizeY', required: false, placeholder: '', - value: 12, + value: 14, + }, + { + type: 'el-slider', + label: '数值角度', + name: 'ytextAngle', + required: false, + placeholder: '', + value: 0 + }, + { + type: 'el-switch', + label: '缩放', + name: 'scale', + require: false, + placeholder: '', + value: false, + }, + { + type: 'el-input-number', + label: '均分', + name: 'splitNumber', + required: false, + placeholder: '', + value: '' + }, + { + type: 'el-switch', + label: '轴反转', + name: 'reversalY', + required: false, + placeholder: '', + value: false }, { type: 'vue-color', @@ -362,14 +385,14 @@ export const widgetLinechart = { require: false, placeholder: '', value: false, - }, { + }, + { type: 'vue-color', label: '分割线颜色', name: 'splitLineColorY', required: false, placeholder: '', value: '#fff', - } ], }, 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 7c05f35d..38ea4f25 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/widgetBarlinechart.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/widgetBarlinechart.vue @@ -171,14 +171,14 @@ export default { show: optionsCollapse.hideX, // 坐标轴是否显示 name: optionsCollapse.xName, // 坐标轴名称 nameTextStyle: { - color: optionsCollapse.xNameColor, - fontSize: optionsCollapse.xNameFontSize + color: optionsCollapse.nameColorX, + fontSize: optionsCollapse.nameFontSizeX }, nameRotate: optionsCollapse.textAngle, // 文字角度 inverse: optionsCollapse.reversalX, // 轴反转 axisLabel: { show: true, - interval: optionsCollapse.textInterval, // 文字角度 + interval: optionsCollapse.textInterval, // 文字间隔 rotate: optionsCollapse.textAngle, // 文字角度 textStyle: { color: optionsCollapse.Xcolor, // x轴 坐标文字颜色 @@ -206,46 +206,45 @@ export default { const yAxis = [ { type: "value", - show: optionsCollapse.isShowY, // 坐标轴是否显示 - name: optionsCollapse.textNameY, // 坐标轴名称 - nameTextStyle: { - color: optionsCollapse.NameColorY, - fontSize: optionsCollapse.NameFontSizeY + splitNumber: optionsCollapse.splitNumberLeft,// 均分 + show: optionsCollapse.isShowYLeft, // 坐标轴是否显示 + name: optionsCollapse.textNameYLeft, // 坐标轴名称 + nameTextStyle: { // 别名 + color: optionsCollapse.nameColorYLeft, + fontSize: optionsCollapse.namefontSizeYLeft }, inverse: optionsCollapse.reversalY, // 轴反转 axisLabel: { show: true, textStyle: { - color: optionsCollapse.colorY, // x轴 坐标文字颜色 + color: optionsCollapse.colorY, // y轴 坐标文字颜色 fontSize: optionsCollapse.fontSizeY } }, axisLine: { show: true, lineStyle: { - color: "#fff" + color: optionsCollapse.lineColorY } }, splitLine: { - show: optionsCollapse.isShowSplitLineY, - lineStyle: { - color: optionsCollapse.splitLineColorY - } + show: false, } }, { type: "value", - show: optionsCollapse.isShowY, // 坐标轴是否显示 - name: optionsCollapse.textNameY, // 坐标轴名称 - nameTextStyle: { - color: optionsCollapse.NameColorY, - fontSize: optionsCollapse.NameFontSizeY + splitNumber: optionsCollapse.splitNumberRight,// 均分 + show: optionsCollapse.isShowYRight, // 坐标轴是否显示 + name: optionsCollapse.textNameYRight, // 坐标轴名称 + nameTextStyle: { // 别名 + color: optionsCollapse.nameColorYRight, + fontSize: optionsCollapse.namefontSizeYRight }, inverse: optionsCollapse.reversalY, // 轴反转 axisLabel: { show: true, textStyle: { - color: optionsCollapse.colorY, // x轴 坐标文字颜色 + color: optionsCollapse.colorY, // y轴 坐标文字颜色 fontSize: optionsCollapse.fontSizeY } }, @@ -257,13 +256,9 @@ export default { }, splitLine: { show: false, - lineStyle: { - color: optionsCollapse.splitLineColorY - } } } ]; - this.options.yAxis = yAxis; }, // 折线设置 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 955fa859..9b87050b 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/widgetLinechart.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/widgetLinechart.vue @@ -136,14 +136,14 @@ export default { show: optionsCollapse.hideX, // 坐标轴是否显示 name: optionsCollapse.xName, // 坐标轴名称 nameTextStyle: { - color: optionsCollapse.xNameColor, - fontSize: optionsCollapse.xNameFontSize + color: optionsCollapse.nameColorX, + fontSize: optionsCollapse.nameFontSizeX }, nameRotate: optionsCollapse.textAngle, // 文字角度 inverse: optionsCollapse.reversalX, // 轴反转 axisLabel: { show: true, - interval: optionsCollapse.textInterval, // 文字角度 + interval: optionsCollapse.textInterval, // 文字间隔 rotate: optionsCollapse.textAngle, // 文字角度 textStyle: { color: optionsCollapse.Xcolor, // x轴 坐标文字颜色 @@ -170,15 +170,18 @@ export default { const optionsCollapse = this.optionsSetup; const yAxis = { type: "value", + scale : optionsCollapse.scale, + splitNumber: optionsCollapse.splitNumber,// 均分 show: optionsCollapse.isShowY, // 坐标轴是否显示 name: optionsCollapse.textNameY, // 坐标轴名称 - nameTextStyle: { - color: optionsCollapse.NameColorY, - fontSize: optionsCollapse.NameFontSizeY + nameTextStyle: { // 别名 + color: optionsCollapse.nameColorY, + fontSize: optionsCollapse.namefontSizeY }, inverse: optionsCollapse.reversalY, // 轴反转 axisLabel: { show: true, + rotate: optionsCollapse.ytextAngle, // 文字角度 textStyle: { color: optionsCollapse.colorY, // y轴 坐标文字颜色 fontSize: optionsCollapse.fontSizeY @@ -197,7 +200,6 @@ export default { } } }; - this.options.yAxis = yAxis; }, // 折线设置 From e8a86fe6496241d36356d346f772a949c9a69812 Mon Sep 17 00:00:00 2001 From: qianming Date: Wed, 1 Sep 2021 14:55:12 +0800 Subject: [PATCH 21/28] =?UTF-8?q?=E5=AF=B9=E6=AF=94=E5=9B=BE=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/componentsJSON/widget-bar-stack.js | 6 +- .../componentsJSON/widget-line-compare.js | 203 +++++++++++++----- .../widget/line/widgetLineCompareChart.vue | 172 ++++++++------- 3 files changed, 249 insertions(+), 132 deletions(-) diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-bar-stack.js b/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-bar-stack.js index 2e2cd339..0f123c57 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-bar-stack.js +++ b/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-bar-stack.js @@ -1,6 +1,6 @@ /* * @Descripttion: 柱状堆叠图 - * @version: + * @version: * @Author: qianlishi * @Date: 2021-08-29 07:37:09 * @LastEditors: qianlishi @@ -350,7 +350,8 @@ export const widgetBarStack = { required: false, placeholder: '', value: '#fff', - }, { + }, + { type: 'el-switch', label: '分割线显示', name: 'isShowSplitLineY', @@ -364,7 +365,6 @@ export const widgetBarStack = { required: false, placeholder: '', value: '#fff', - } ], }, diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-line-compare.js b/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-line-compare.js index d42af828..7c68b7da 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-line-compare.js +++ b/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-line-compare.js @@ -160,13 +160,29 @@ export const widgetLineCompare = { value: true, }, { - type: 'el-input-number', - label: '数值间隔', - name: 'splitNumberX', + type: 'el-input-text', + label: '坐标名', + name: 'xName', required: false, placeholder: '', value: '' }, + { + type: 'vue-color', + label: '坐标名颜色', + name: 'nameColorX', + required: false, + placeholder: '', + value: '#fff', + }, + { + type: 'el-input-number', + label: '坐标字号', + name: 'nameFontSizeX', + required: false, + placeholder: '', + value: 14, + }, { type: 'el-switch', label: '数值居中', @@ -191,6 +207,14 @@ export const widgetLineCompare = { placeholder: '', value: 14, }, + { + type: 'el-input-number', + label: '数值间隔', + name: 'splitNumberX', + required: false, + placeholder: '', + value: '' + }, { type: 'el-switch', label: '刻度线', @@ -228,9 +252,40 @@ export const widgetLineCompare = { placeholder: '', value: true, }, + { + type: 'el-input-text', + label: '坐标名', + name: 'textNameYTop', + require: false, + placeholder: '', + value: '' + },{ + type: 'vue-color', + label: '坐标名颜色', + name: 'nameColorYTop', + required: false, + placeholder: '', + value: '#fff', + }, { type: 'el-input-number', - label: '数值间隔', + label: '坐标字号', + name: 'namefontSizeYTop', + required: false, + placeholder: '', + value: 14, + }, + { + type: 'el-switch', + label: '缩放', + name: 'scaleYTop', + required: false, + placeholder: '', + value: true, + }, + { + type: 'el-input-number', + label: '数值切分', name: 'splitNumberYTop', required: false, placeholder: '', @@ -239,7 +294,7 @@ export const widgetLineCompare = { { type: 'vue-color', label: '数值颜色', - name: 'XcolorRight', + name: 'colorYTop', required: false, placeholder: '', value: '#fff', @@ -247,7 +302,7 @@ export const widgetLineCompare = { { type: 'el-input-number', label: '数值字号', - name: 'fontSizeXRight', + name: 'fontSizeYTop', required: false, placeholder: '', value: 14, @@ -255,31 +310,31 @@ export const widgetLineCompare = { { type: 'el-switch', label: '刻度线', - name: 'tickLineRight', + name: 'tickLineYTop', require: false, placeholder: '', - value: false, + value: true, }, { type: 'el-switch', - label: 'X轴线', - name: 'xLineRight', + label: 'y轴线', + name: 'lineYTop', require: false, placeholder: '', - value: false, + value: true, }, { type: 'vue-color', label: '轴颜色', - name: 'lineColorXRight', + name: 'lineColorYTop', required: false, placeholder: '', value: '#fff', }, { type: 'el-switch', - label: '竖分割线', - name: 'SplitLineRight', + label: '分割线', + name: 'splitLineYTop', require: false, placeholder: '', value: false, @@ -287,7 +342,7 @@ export const widgetLineCompare = { { type: 'vue-color', label: '分割线颜色', - name: 'SplitLineColorRight', + name: 'splitLineColorYTop', required: false, placeholder: '', value: '#fff', @@ -295,85 +350,127 @@ export const widgetLineCompare = { { type: 'el-input-number', label: '分割线宽度', - name: 'SplitLinefontSizeRight', + name: 'splitLinefontSizeYTop', required: false, placeholder: '', value: 1, }, - { - type: 'el-switch', - label: '边框线', - name: 'frameLineRight', - require: false, - placeholder: '', - value: false, - }, ], }, { - name: '下Y轴设置', + name: '下y轴设置', list: [ { type: 'el-switch', label: '显示', - name: 'hideY', + name: 'isShowYBottom', required: false, placeholder: '', value: true, }, { + type: 'el-input-text', + label: '坐标名', + name: 'textNameYBottom', + require: false, + placeholder: '', + value: '' + },{ type: 'vue-color', - label: '数值颜色', - name: 'colorY', + label: '坐标名颜色', + name: 'nameColorYBottom', required: false, placeholder: '', value: '#fff', }, { type: 'el-input-number', - label: '数值字号', - name: 'fontSizeY', + label: '坐标字号', + name: 'namefontSizeYBottom', required: false, placeholder: '', value: 14, }, { - type: 'el-select', - label: '数值对齐', - name: 'textAlign', + type: 'el-switch', + label: '缩放', + name: 'scaleYBottom', required: false, placeholder: '', - selectOptions: [ - {code: 'center', name: '居中'}, - {code: 'left', name: '左对齐'}, - {code: 'right', name: '右对齐'}, - ], - value: 'center' + value: true, + }, + { + type: 'el-input-number', + label: '数值切分', + name: 'splitNumberYBottom', + required: false, + placeholder: '', + value: '' + }, + { + type: 'vue-color', + label: '数值颜色', + name: 'colorYBottom', + required: false, + placeholder: '', + value: '#fff', + }, + { + type: 'el-input-number', + label: '数值字号', + name: 'fontSizeYBottom', + required: false, + placeholder: '', + value: 14, }, { type: 'el-switch', label: '刻度线', - name: 'tickLineY', + name: 'tickLineYBottom', require: false, placeholder: '', - value: false, + value: true, }, { type: 'el-switch', - label: 'Y轴线', - name: 'lineY', + label: 'y轴线', + name: 'lineYBottom', require: false, placeholder: '', - value: false, + value: true, }, { type: 'vue-color', label: '轴颜色', - name: 'lineColorY', + name: 'lineColorYBottom', + required: false, + placeholder: '', + value: '#fff', + }, + { + type: 'el-switch', + label: '分割线', + name: 'splitLineYBottom', + require: false, + placeholder: '', + value: false, + }, + { + type: 'vue-color', + label: '分割线颜色', + name: 'splitLineColorYBottom', required: false, placeholder: '', value: '#fff', }, + { + type: 'el-input-number', + label: '分割线宽度', + name: 'splitLinefontSizeYBottom', + required: false, + placeholder: '', + value: 1, + }, ], }, { @@ -444,11 +541,19 @@ export const widgetLineCompare = { list: [ { type: 'el-slider', - label: '左右边距(像素)', - name: 'marginLeftRight', + label: '左边距(像素)', + name: 'marginLeft', required: false, placeholder: '', - value: 10, + value: 20, + }, + { + type: 'el-slider', + label: '右边距(像素)', + name: 'marginRight', + required: false, + placeholder: '', + value: 50, }, { type: 'el-slider', @@ -464,7 +569,7 @@ export const widgetLineCompare = { name: 'marginBottom', required: false, placeholder: '', - value: 10, + value: 40, }, ], }, diff --git a/report-ui/src/views/report/bigscreen/designer/widget/line/widgetLineCompareChart.vue b/report-ui/src/views/report/bigscreen/designer/widget/line/widgetLineCompareChart.vue index 00912883..8dece481 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/line/widgetLineCompareChart.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/line/widgetLineCompareChart.vue @@ -265,11 +265,11 @@ export default { editorOptions() { this.setOptionsTitle(); this.setOptionsX(); - // this.setOptionsXRight(); - // this.setOptionsY(); + this.setOptionsYTop(); + this.setOptionsYBottom(); // this.setOptionsTop(); // this.setOptionsTooltip(); - // this.setOptionsGrid(); + this.setOptionsGrid(); // this.setOptionsLegend(); // this.setOptionsColor(); this.setOptionsData(); @@ -294,6 +294,11 @@ export default { const xAxis0 = { gridIndex: 0, show: optionsSetup.isShowX, + name: optionsSetup.xName, // 坐标轴名称 + nameTextStyle: { + color: optionsSetup.nameColorX, + fontSize: optionsSetup.nameFontSizeX + }, type: 'category', boundaryGap: optionsSetup.boundaryX, // 值居中 axisLine: { //x轴线 @@ -337,64 +342,90 @@ export default { this.options.xAxis[0] = xAxis0; this.options.xAxis[1] = xAxis1; }, - // 右X轴设置 - setOptionsXRight() { + // 上y轴设置 + setOptionsYTop() { const optionsSetup = this.optionsSetup; - const xAxisRight = { - gridIndex: 2, - splitNumber: optionsSetup.splitNumberRight, - type: 'value', - axisLine: {//X轴线 - show: optionsSetup.xLineRight, - lineStyle: { - color: optionsSetup.lineColorXRight, + const yAxis = { + gridIndex: 0, + splitNumber: optionsSetup.splitNumberYTop, + show: optionsSetup.isShowYTop, + scale: optionsSetup.scaleYTop, // 缩放 + name: optionsSetup.textNameYTop, // 坐标轴名称 + nameTextStyle: { + color: optionsSetup.nameColorYTop, + fontSize: optionsSetup.namefontSizeYTop + }, + axisLabel: { + show: true, + textStyle: { + color: optionsSetup.colorYTop, + fontSize: optionsSetup.fontSizeYTop, }, }, - axisTick: { - show: optionsSetup.tickLineRight, + axisTick: { // 刻度 + show: optionsSetup.tickLineYTop, }, - position: 'bottom', - axisLabel: { // x轴 - show: optionsSetup.hideXRight, - textStyle: { - color: optionsSetup.XcolorRight, - fontSize: optionsSetup.fontSizeXRight - } + axisLine: { // 轴线 + show: optionsSetup.lineYTop, + lineStyle: { + color: optionsSetup.lineColorYTop, + }, }, - splitLine: { // 分割线 - show: optionsSetup.SplitLineRight, + splitLine: { + show: optionsSetup.splitLineYTop, lineStyle: { - color: optionsSetup.SplitLineColorRight, - width: optionsSetup.SplitLinefontSizeRight, - type: 'solid' - } - } + width: optionsSetup.splitLinefontSizeYTop, + color: optionsSetup.splitLineColorYTop, + }, + }, + axisPointer: { + snap: true + }, } - this.options.xAxis[2] = xAxisRight; + this.options.yAxis[0] = yAxis }, - // Y轴设置 - setOptionsY() { + // 下Y轴设置 + setOptionsYBottom() { const optionsSetup = this.optionsSetup; - const axisLine = { - show: optionsSetup.lineY, - lineStyle: { - color: optionsSetup.lineColorY - } - }; - const axisTick = { - show: optionsSetup.tickLineY - }; - const axisLabel = { - show: optionsSetup.hideY, - textStyle: { - align: optionsSetup.textAlign, - color: optionsSetup.colorY, - fontSize: optionsSetup.fontSizeY, - } - }; - this.options.yAxis[1]['axisLine'] = axisLine; - this.options.yAxis[1]['axisTick'] = axisTick; - this.options.yAxis[1]['axisLabel'] = axisLabel; + const yAxis = { + gridIndex: 1, + splitNumber: optionsSetup.splitNumberYBottom, + show: optionsSetup.isShowYBottom, + scale: optionsSetup.scaleYBottom, // 缩放 + name: optionsSetup.textNameYBottom, // 坐标轴名称 + nameTextStyle: { + color: optionsSetup.nameColorYBottom, + fontSize: optionsSetup.namefontSizeYBottom + }, + inverse: true, // 翻转 + axisLabel: { + show: true, + textStyle: { + color: optionsSetup.colorYBottom, + fontSize: optionsSetup.fontSizeYBottom, + }, + }, + axisTick: { // 刻度 + show: optionsSetup.tickLineYBottom, + }, + axisLine: { // 轴线 + show: optionsSetup.lineYBottom, + lineStyle: { + color: optionsSetup.lineColorYBottom, + }, + }, + splitLine: { + show: optionsSetup.splitLineYBottom, + lineStyle: { + width: optionsSetup.splitLinefontSizeYBottom, + color: optionsSetup.splitLineColorYBottom, + }, + }, + axisPointer: { + snap: true + }, + } + this.options.yAxis[1] = yAxis }, // 数值设定、柱体设置 setOptionsTop() { @@ -450,41 +481,22 @@ export default { this.options.tooltip = tooltip; }, // 边距设置 - getOptionsBottom() { - const optionsSetup = this.optionsSetup; - let bottom = optionsSetup.marginBottom; - if (optionsSetup.hideXLeft) { - bottom = optionsSetup.marginBottom + 15 - } else if (optionsSetup.hideXRight) { - bottom = optionsSetup.marginBottom + 15 - } - return bottom - }, setOptionsGrid() { const optionsSetup = this.optionsSetup; const grid = [ - {//左 - show: optionsSetup.frameLineLeft, - left: optionsSetup.marginLeftRight, + {// 上 + left: optionsSetup.marginLeft, + right: optionsSetup.marginRight, top: optionsSetup.marginTop, - bottom: optionsSetup.marginBottom, containLabel: true, - width: '40%' + bottom: '50%', }, - {//中间字体位置 - show: false, - left: "51%", - top: optionsSetup.marginTop, - bottom: this.getOptionsBottom(), - width: '0%' - }, - {//右 - show: optionsSetup.frameLineRight, - right: optionsSetup.marginLeftRight, - top: optionsSetup.marginTop, - bottom: optionsSetup.marginBottom, + { // 下 + left: optionsSetup.marginLeft, + right: optionsSetup.marginRight, containLabel: true, - width: '40%' + top: '51%', + bottom: optionsSetup.marginBottom, }, ] this.options.grid = grid; From dd07f598c6c03e3adddc119e2f5fc04898393fa5 Mon Sep 17 00:00:00 2001 From: qianming Date: Wed, 1 Sep 2021 17:01:59 +0800 Subject: [PATCH 22/28] update --- .../componentsJSON/widget-line-compare.js | 34 ++-- .../tools/componentsJSON/widget-line-stack.js | 6 +- .../widget/line/widgetLineCompareChart.vue | 162 ++++++++++-------- .../widget/line/widgetLineStackChart.vue | 1 - .../designer/widget/widgetLinechart.vue | 1 - 5 files changed, 118 insertions(+), 86 deletions(-) diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-line-compare.js b/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-line-compare.js index 7c68b7da..32fe15c4 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-line-compare.js +++ b/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-line-compare.js @@ -48,7 +48,7 @@ export const widgetLineCompare = { name: 'pointSize', required: false, placeholder: '', - value: 10, + value: 5, }, { type: 'el-switch', @@ -80,7 +80,7 @@ export const widgetLineCompare = { name: 'lineWidth', required: false, placeholder: '', - value: 4, + value: 2, }, ], }, @@ -281,7 +281,7 @@ export const widgetLineCompare = { name: 'scaleYTop', required: false, placeholder: '', - value: true, + value: false, }, { type: 'el-input-number', @@ -397,7 +397,7 @@ export const widgetLineCompare = { name: 'scaleYBottom', required: false, placeholder: '', - value: true, + value: false, }, { type: 'el-input-number', @@ -520,19 +520,31 @@ export const widgetLineCompare = { name: '提示语设置', list: [ { - type: 'el-input-number', - label: '字体大小', - name: 'tipsFontSize', + type: 'el-switch', + label: '显示', + name: 'tipShow', required: false, placeholder: '', - value: 16 + value: true, }, { - type: 'vue-color', - label: '字体颜色', - name: 'lineColor', + type: 'el-select', + label: '类型', + name: 'tipType', required: false, placeholder: '', + selectOptions: [ + {code: 'line', name: '线形'}, + {code: 'cross', name: '十字形'}, + ], + value: 'line' + }, + { + type: 'vue-color', + label: '颜色', + name: 'tipColor', + required: false, + placeholder: '#e68b55', }, ], }, diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-line-stack.js b/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-line-stack.js index af05a399..d6b01a7c 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-line-stack.js +++ b/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-line-stack.js @@ -1,6 +1,6 @@ /* * @Descripttion: 折线堆叠图 json - * @version: + * @version: * @Author: qianlishi * @Date: 2021-08-29 07:38:17 * @LastEditors: qianlishi @@ -56,7 +56,7 @@ export const widgetLineStack = { name: 'pointSize', required: false, placeholder: '', - value: 10, + value: 5, }, { type: 'el-switch', @@ -669,4 +669,4 @@ export const widgetLineStack = { }, ], } - } \ No newline at end of file + } diff --git a/report-ui/src/views/report/bigscreen/designer/widget/line/widgetLineCompareChart.vue b/report-ui/src/views/report/bigscreen/designer/widget/line/widgetLineCompareChart.vue index 8dece481..f6cf808e 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/line/widgetLineCompareChart.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/line/widgetLineCompareChart.vue @@ -33,18 +33,18 @@ export default { axisPointer: { type: 'line', lineStyle: { - color: 'ffffff', + color: '#ffffff', type: 'dashed', }, }, /*axisPointer: { type: 'cross', lineStyle: { - color: 'ffffff', + color: '#ffffff', type: 'dashed', }, crossStyle: { - color: 'ffffff', + color: '#ffffff', } },*/ }, @@ -182,6 +182,9 @@ export default { type: 'line', xAxisIndex: 0, yAxisIndex: 0, + showSymbol: true,// 标记点 + symbol: 'circle', + symbolSize: 5, smooth: true, // 曲线，折线 itemStyle: { color: '#36c5e7', @@ -190,7 +193,7 @@ export default { color: '#36c5e7', width: 2, }, - label: { + label: { // 数值 position: 'top', distance: 10, show: true, @@ -204,6 +207,9 @@ export default { type: 'line', xAxisIndex: 1, yAxisIndex: 1, + showSymbol: true,// 标记点 + symbol: 'circle', + symbolSize: 5, smooth: true, // 曲线，折线 itemStyle: { color: '#e68b55', @@ -212,7 +218,7 @@ export default { color: '#e68b55', width: 2, }, - label: { + label: {// 数值 position: 'bottom', distance: 10, show: true, @@ -267,11 +273,11 @@ export default { this.setOptionsX(); this.setOptionsYTop(); this.setOptionsYBottom(); - // this.setOptionsTop(); - // this.setOptionsTooltip(); + this.setOptionsTop(); + this.setOptionsTooltip(); this.setOptionsGrid(); - // this.setOptionsLegend(); - // this.setOptionsColor(); + this.setOptionsLegend(); + this.setOptionsColor(); this.setOptionsData(); }, // 标题修改 @@ -427,57 +433,77 @@ export default { } this.options.yAxis[1] = yAxis }, - // 数值设定、柱体设置 + // 数值设定 折线设置 setOptionsTop() { const optionsSetup = this.optionsSetup; - const series = this.options.series; + const series = this.options.series + // 折线 for (const key in series) { - if (series[key].type == "bar") { - series[0].label = { - normal: { - show: optionsSetup.isShow, - position: 'insideLeft', - textStyle: { - fontSize: optionsSetup.fontSize, - color: optionsSetup.subTextColor, - fontWeight: optionsSetup.fontWeight - } - }, - emphasis: { - show: false, - }, - }, - series[1].label = { - normal: { - show: optionsSetup.isShow, - color: 'red', - position: 'insideRight', - textStyle: { - fontSize: optionsSetup.fontSize, - color: optionsSetup.subTextColor, - fontWeight: optionsSetup.fontWeight - } - }, - emphasis: { - show: false, - }, - }, - series[key].barWidth = optionsSetup.maxWidth; + series[key].showSymbol = optionsSetup.markPoint + series[key].symbolSize = optionsSetup.pointSize + series[key].smooth = optionsSetup.smoothCurve + if (optionsSetup.area) { + series[key].areaStyle = { + opacity: optionsSetup.areaThickness / 100 + } + } else { + series[key].areaStyle = { + opacity: 0 + } + } + } + // 数值 + if (series[0].type == 'line') { + series[0].label = { + position: 'top', + distance: 10, + show: optionsSetup.isShow, + color: optionsSetup.subTextColor, + fontSize: optionsSetup.fontSize, + fontWeight: optionsSetup.fontWeight + } + series[1].label = { + position: 'bottom', + distance: 10, + show: optionsSetup.isShow, + color: optionsSetup.subTextColor, + fontSize: optionsSetup.fontSize, + fontWeight: optionsSetup.fontWeight } } - this.options.series = series; }, // tooltip 提示语设置 setOptionsTooltip() { const optionsSetup = this.optionsSetup; - const tooltip = { - trigger: "item", - show: true, - textStyle: { - color: optionsSetup.lineColor, - fontSize: optionsSetup.fontSize + let tooltip = {} + if (optionsSetup.tipType == "line") { + tooltip = { + show: optionsSetup.tipShow, + trigger: 'axis', + axisPointer: { + type: optionsSetup.tipType, + lineStyle: { + color: optionsSetup.tipColor, + type: 'dashed', + }, + }, } - }; + } else { + tooltip = { + show: optionsSetup.tipShow, + trigger: 'axis', + axisPointer: { + type: optionsSetup.tipType, + lineStyle: { + color: optionsSetup.tipColor, + type: 'dashed', + }, + crossStyle: { + color: optionsSetup.tipColor, + } + }, + } + } this.options.tooltip = tooltip; }, // 边距设置 @@ -517,31 +543,27 @@ export default { }; legend.itemWidth = optionsSetup.lengedWidth; }, - // 颜色修改、圆角修改 + // 颜色修改、宽度修改 setOptionsColor() { const optionsSetup = this.optionsSetup; const customColor = optionsSetup.customColor; - if (!customColor) return; - const itemStyleLeft = { - normal: { - color: customColor[0].color, - barBorderRadius: [optionsSetup.radius, 0, 0, optionsSetup.radius] - }, - emphasis: { - show: false, - }, + const series = this.options.series + const arrColor = []; + for (let i = 0; i < customColor.length; i++) { + arrColor.push(customColor[i].color); } - const itemStyleRight = { - normal: { - color: customColor[1].color, - barBorderRadius: [0, optionsSetup.radius, optionsSetup.radius, 0] - }, - emphasis: { - show: false, - }, + if (!customColor) return; + for (const key in series) { + const itemStyle = { + color: arrColor[key], + } + const lineStyle = { + color: arrColor[key], + width: optionsSetup.lineWidth, + } + this.options.series[key].itemStyle = itemStyle + this.options.series[key].lineStyle = lineStyle } - this.options.series[0].itemStyle = itemStyleLeft; - this.options.series[1].itemStyle = itemStyleRight; }, // 数据解析 setOptionsData() { diff --git a/report-ui/src/views/report/bigscreen/designer/widget/line/widgetLineStackChart.vue b/report-ui/src/views/report/bigscreen/designer/widget/line/widgetLineStackChart.vue index aa8f15fb..6bd25b74 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/line/widgetLineStackChart.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/line/widgetLineStackChart.vue @@ -319,7 +319,6 @@ export default { symbol: 'circle', showSymbol: optionsSetup.markPoint, symbolSize: optionsSetup.pointSize, - symbolColor: arrColor[i], smooth: optionsSetup.smoothCurve, // 线条 lineStyle: { 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 9b87050b..615d97c3 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/widgetLinechart.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/widgetLinechart.vue @@ -277,7 +277,6 @@ export default { fontSize: optionsCollapse.fontSize }; legend.itemWidth = optionsCollapse.lengedWidth; - console.log(legend); }, // 图例颜色修改 setOptionsColor() { From cb301a60fbb5d21df1f069bb7b3418a290749458 Mon Sep 17 00:00:00 2001 From: qianming Date: Wed, 1 Sep 2021 17:12:10 +0800 Subject: [PATCH 23/28] =?UTF-8?q?=E5=AF=B9=E6=AF=94=E5=9B=BE=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/componentsJSON/widget-line-compare.js | 16 ++++++++-------- .../widget/line/widgetLineCompareChart.vue | 5 +++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-line-compare.js b/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-line-compare.js index 32fe15c4..5526b1b1 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-line-compare.js +++ b/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-line-compare.js @@ -197,7 +197,7 @@ export const widgetLineCompare = { name: 'colorX', required: false, placeholder: '', - value: '#fff', + value: '#36c5e7', }, { type: 'el-input-number', @@ -237,7 +237,7 @@ export const widgetLineCompare = { name: 'lineColorX', required: false, placeholder: '', - value: '#fff', + value: '#36c5e7', }, ], }, @@ -265,7 +265,7 @@ export const widgetLineCompare = { name: 'nameColorYTop', required: false, placeholder: '', - value: '#fff', + value: '#36c5e7', }, { type: 'el-input-number', @@ -297,7 +297,7 @@ export const widgetLineCompare = { name: 'colorYTop', required: false, placeholder: '', - value: '#fff', + value: '#36c5e7', }, { type: 'el-input-number', @@ -329,7 +329,7 @@ export const widgetLineCompare = { name: 'lineColorYTop', required: false, placeholder: '', - value: '#fff', + value: '#36c5e7', }, { type: 'el-switch', @@ -381,7 +381,7 @@ export const widgetLineCompare = { name: 'nameColorYBottom', required: false, placeholder: '', - value: '#fff', + value: '#e68b55', }, { type: 'el-input-number', @@ -413,7 +413,7 @@ export const widgetLineCompare = { name: 'colorYBottom', required: false, placeholder: '', - value: '#fff', + value: '#e68b55', }, { type: 'el-input-number', @@ -445,7 +445,7 @@ export const widgetLineCompare = { name: 'lineColorYBottom', required: false, placeholder: '', - value: '#fff', + value: '#e68b55', }, { type: 'el-switch', diff --git a/report-ui/src/views/report/bigscreen/designer/widget/line/widgetLineCompareChart.vue b/report-ui/src/views/report/bigscreen/designer/widget/line/widgetLineCompareChart.vue index f6cf808e..3d157b6a 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/line/widgetLineCompareChart.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/line/widgetLineCompareChart.vue @@ -639,8 +639,9 @@ export default { }); }, renderingFn(optionsSetup, val) { - this.options.yAxis[1]['data'] = val.xAxis - if (val.series[0].type == "bar") { + this.options.xAxis[0]['data'] = val.xAxis + this.options.xAxis[1]['data'] = val.xAxis + if (val.series[0].type == "line") { this.options.series[0]['name'] = val.series[0].name this.options.series[0]['data'] = val.series[0].data this.options.series[1]['name'] = val.series[1].name From dd8aed6bc0c29de18c71861901d411b2a2f72d64 Mon Sep 17 00:00:00 2001 From: qianming Date: Wed, 1 Sep 2021 17:33:02 +0800 Subject: [PATCH 24/28] update --- doc/docs/guide/dashboard.md | 16 ++++++++++------ doc/docs/picture/dashboard/img_19.png | Bin 0 -> 34575 bytes doc/docs/picture/dashboard/img_20.png | Bin 0 -> 8927 bytes .../tools/componentsJSON/widget-line-compare.js | 16 ++++++++-------- 4 files changed, 18 insertions(+), 14 deletions(-) create mode 100644 doc/docs/picture/dashboard/img_19.png create mode 100644 doc/docs/picture/dashboard/img_20.png diff --git a/doc/docs/guide/dashboard.md b/doc/docs/guide/dashboard.md index fe54e683..8ecaed72 100644 --- a/doc/docs/guide/dashboard.md +++ b/doc/docs/guide/dashboard.md @@ -81,16 +81,20 @@ 气泡地图动态数据集，和饼图一样，对应字典值需要选择一个“Name”、“Value”，且name的字段值要和echarts图表里面的值能对应上，可参考静态数据
    ![img15](../picture/dashboard/img_15.png)
    - ### 百分百图 数据集只能有一个字段，且字典选择“文本数字”
    ![img16](../picture/dashboard/img_16.png)
    **如有问题，请提交 [Issue](https://gitee.com/anji-plus/report/issues)
    ** -### 散点图 -**规划中**
    - ### 对比图 -柱状对比图数据集需要3个字段，其中一个作为对比的字段只能为2种值，只有2种值作为对比的字段要选择“y轴字段”字典。因为底层的解析用的是堆叠图的解析，这里的y轴字段并不是指的图表上面的y轴，还请注意，有强迫症可以自行修改源码的解析，剩下的2个字段对应字典看图
    -![img18](../picture/dashboard/img_18.png) +柱状对比图：
    +数据集需要3个字段，其中一个作为对比的字段只能为2种值，只有2种值作为对比的字段要选择“y轴字段”字典。因为底层的解析用的是堆叠图的解析，这里的y轴字段并不是指的图表上面的y轴，还请注意，有强迫症可以自行修改源码的解析，剩下的2个字段对应字典看图
    +![img18](../picture/dashboard/img_18.png)
    +**如有问题，请提交 [Issue](https://gitee.com/anji-plus/report/issues)
    ** + +折线对比图:
    +数据集需要3个字段，其中一个作为对比的字段只能为2种值，只有2种值作为对比的字段要选择“y轴字段”字典，剩下的字典对应看图
    +![img19](../picture/dashboard/img_19.png)
    +**注**：如果提示语设置选择“十字形”，请注意需要选择 “X轴颜色、上Y轴颜色、下Y轴颜色”，不然预览图表鼠标选择是全白色，还请注意。
    +![img20](../picture/dashboard/img_20.png) **如有问题，请提交 [Issue](https://gitee.com/anji-plus/report/issues)
    ** diff --git a/doc/docs/picture/dashboard/img_19.png b/doc/docs/picture/dashboard/img_19.png new file mode 100644 index 0000000000000000000000000000000000000000..e3881010a4504b00681b4712b86030151d74ad93 GIT binary patch literal 34575 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 literal 0 HcmV?d00001 diff --git a/doc/docs/picture/dashboard/img_20.png b/doc/docs/picture/dashboard/img_20.png new file mode 100644 index 0000000000000000000000000000000000000000..698e5f6f9bec4b9a3a81e9d05d25ac3bf7d345a3 GIT binary patch literal 8927 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 literal 0 HcmV?d00001 diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-line-compare.js b/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-line-compare.js index 5526b1b1..32fe15c4 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-line-compare.js +++ b/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-line-compare.js @@ -197,7 +197,7 @@ export const widgetLineCompare = { name: 'colorX', required: false, placeholder: '', - value: '#36c5e7', + value: '#fff', }, { type: 'el-input-number', @@ -237,7 +237,7 @@ export const widgetLineCompare = { name: 'lineColorX', required: false, placeholder: '', - value: '#36c5e7', + value: '#fff', }, ], }, @@ -265,7 +265,7 @@ export const widgetLineCompare = { name: 'nameColorYTop', required: false, placeholder: '', - value: '#36c5e7', + value: '#fff', }, { type: 'el-input-number', @@ -297,7 +297,7 @@ export const widgetLineCompare = { name: 'colorYTop', required: false, placeholder: '', - value: '#36c5e7', + value: '#fff', }, { type: 'el-input-number', @@ -329,7 +329,7 @@ export const widgetLineCompare = { name: 'lineColorYTop', required: false, placeholder: '', - value: '#36c5e7', + value: '#fff', }, { type: 'el-switch', @@ -381,7 +381,7 @@ export const widgetLineCompare = { name: 'nameColorYBottom', required: false, placeholder: '', - value: '#e68b55', + value: '#fff', }, { type: 'el-input-number', @@ -413,7 +413,7 @@ export const widgetLineCompare = { name: 'colorYBottom', required: false, placeholder: '', - value: '#e68b55', + value: '#fff', }, { type: 'el-input-number', @@ -445,7 +445,7 @@ export const widgetLineCompare = { name: 'lineColorYBottom', required: false, placeholder: '', - value: '#e68b55', + value: '#fff', }, { type: 'el-switch', From 885acbebe2fe0c65f5e5433a41738ae11c9c26b6 Mon Sep 17 00:00:00 2001 From: Raod <1130305001@qq.com> Date: Thu, 2 Sep 2021 11:00:42 +0800 Subject: [PATCH 25/28] =?UTF-8?q?fix:=20=E5=AF=BC=E5=87=BA=E8=83=8C?= =?UTF-8?q?=E6=99=AF=E5=9B=BE=E4=B8=BA=E7=A9=BA=E5=AD=98=E5=9C=A8=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dashboard/service/impl/ReportDashboardServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/ReportDashboardServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/ReportDashboardServiceImpl.java index 4f207d94..e4ba8dd8 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/ReportDashboardServiceImpl.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/ReportDashboardServiceImpl.java @@ -348,6 +348,9 @@ public class ReportDashboardServiceImpl implements ReportDashboardService, Initi private String replaceUrl(String imageAddress, Map fileMap) { + if (StringUtils.isBlank(imageAddress)) { + return ""; + } String fileId = imageAddress.substring(imageAddress.trim().length() - 36); String orDefault = fileMap.getOrDefault(fileId, null); if (StringUtils.isBlank(orDefault)) { From a34b2d9d5d3f35e9beba0ad73de8e6be1158e096 Mon Sep 17 00:00:00 2001 From: qianming Date: Thu, 2 Sep 2021 15:56:47 +0800 Subject: [PATCH 26/28] =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E7=9B=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/componentsJSON/widget-gauge.js | 480 +++++++++++++----- .../bigscreen/designer/widget/widgetGauge.vue | 134 +++-- 2 files changed, 452 insertions(+), 162 deletions(-) diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-gauge.js b/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-gauge.js index 578676fd..ac56cf19 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-gauge.js +++ b/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-gauge.js @@ -1,162 +1,378 @@ /* * @Descripttion: 仪表盘 json - * @version: + * @version: * @Author: qianlishi * @Date: 2021-08-29 07:30:25 * @LastEditors: qianlishi * @LastEditTime: 2021-08-29 07:30:25 */ export const widgetGauge = { - code: 'widget-gauge', - type: 'chart', - label: '仪表盘', - icon: 'iconyibiaopan', - options: { - // 配置 - setup: [ + code: 'widget-gauge', + type: 'chart', + label: '仪表盘', + icon: 'iconyibiaopan', + options: { + // 配置 + setup: [ + { + type: 'el-input-text', + label: '图层名称', + name: 'layerName', + required: false, + placeholder: '', + value: '仪表盘', + }, + { + type: 'vue-color', + label: '背景颜色', + name: 'background', + required: false, + placeholder: '', + value: '' + }, + [ { - type: 'el-input-text', - label: '图层名称', - name: 'layerName', - required: false, - placeholder: '', - value: '仪表盘', - }, - { - type: 'el-input-number', - label: '刻度线粗度', - name: 'tickMarkWeight', - require: false, - placeholder: '', - value: 10, - }, - { - type: 'el-switch', - label: '显示刻度值', - name: 'showScaleValue', - require: false, - placeholder: '', - value: true, - }, - { - type: 'el-switch', - label: '显示刻度线', - name: 'showTickMarks', - require: false, - placeholder: '', - value: true, - }, - { - type: 'el-input-number', - label: '刻度字号', - name: 'scaleFontSize', - require: false, - placeholder: '', - value: 16, - }, - { - type: 'el-input-number', - label: '指标字号', - name: 'targetFontSize', - require: false, - placeholder: '', - value: 20, - }, - { - type: 'vue-color', - label: '背景颜色', - name: 'background', - required: false, - placeholder: '', - value: '' - }, - ], - // 数据 - data: [ - { - type: 'el-radio-group', - label: '数据类型', - name: 'dataType', - require: false, - placeholder: '', - selectValue: true, - selectOptions: [ + name: "圆环设置", + list: [ { - code: 'staticData', - name: '静态数据', + type: 'el-switch', + label: '显示', + name: 'ringShow', + required: false, + placeholder: '', + value: true, }, { - code: 'dynamicData', - name: '动态数据', + type: 'el-input-number', + label: '圆环宽度', + name: 'pieWeight', + require: false, + placeholder: '', + value: 10, }, - ], - value: 'staticData', + ] }, { - type: 'el-input-number', - label: '刷新时间(毫秒)', - name: 'refreshTime', - relactiveDom: 'dataType', - relactiveDomValue: 'dynamicData', - value: 5000 + name: '0%~30%渐变色', + list: [ + { + type: 'vue-color', + label: '0处颜色', + name: 'color30p0', + required: false, + placeholder: '', + value: 'rgba(0, 237, 3,0.1)' + }, + { + type: 'vue-color', + label: '0.5处颜色', + name: 'color30p5', + required: false, + placeholder: '', + value: 'rgba(0, 237, 3,0.6)' + }, + { + type: 'vue-color', + label: '1处颜色', + name: 'color30p10', + required: false, + placeholder: '', + value: 'rgba(0, 237, 3,1)' + }, + ] }, { - type: 'el-button', - label: '静态数据', - name: 'staticData', - required: false, - placeholder: 'px', - relactiveDom: 'dataType', - relactiveDomValue: 'staticData', - value: {value: 50, name: "名称", unit: "%"}, + name: '30%~70%渐变色', + list: [ + { + type: 'vue-color', + label: '0处颜色', + name: 'color70p0', + required: false, + placeholder: '', + value: 'rgba(255, 184, 0,0.1)' + }, + { + type: 'vue-color', + label: '0.5处颜色', + name: 'color70p5', + required: false, + placeholder: '', + value: 'rgba(255, 184, 0,0.6)' + }, + { + type: 'vue-color', + label: '1处颜色', + name: 'color70p10', + required: false, + placeholder: '', + value: 'rgba(255, 184, 0,1)' + }, + ] }, { - type: 'dycustComponents', - label: '', - name: 'dynamicData', - required: false, - placeholder: 'px', - relactiveDom: 'dataType', - chartType: 'widget-gauge', - dictKey: 'TEXT_PROPERTIES', - relactiveDomValue: 'dynamicData', - value: '', + name: '70%~100%渐变色', + list: [ + { + type: 'vue-color', + label: '0处颜色', + name: 'color100p0', + required: false, + placeholder: '', + value: 'rgba(175, 36, 74,0.1)' + }, + { + type: 'vue-color', + label: '0.5处颜色', + name: 'color100p5', + required: false, + placeholder: '', + value: 'rgba(255, 36, 74,0.6)' + }, + { + type: 'vue-color', + label: '1处颜色', + name: 'color100p10', + required: false, + placeholder: '', + value: 'rgba(255, 36, 74,1)' + }, + ] }, - ], - // 坐标 - position: [ { - type: 'el-input-number', - label: '左边距', - name: 'left', - required: false, - placeholder: 'px', - value: 0, + name: "刻度线", + list: [ + { + type: 'el-switch', + label: '显示', + name: 'tickShow', + required: false, + placeholder: '', + value: true, + }, + { + type: 'el-input-number', + label: '距离', + name: 'tickDistance', + require: false, + placeholder: '', + value: 0, + }, + { + type: 'el-input-number', + label: '长度', + name: 'tickLength', + require: false, + placeholder: '', + value: 10, + }, + { + type: 'el-input-number', + label: '宽度', + name: 'tickWidth', + require: false, + placeholder: '', + value: 2, + }, + ] }, { - type: 'el-input-number', - label: '上边距', - name: 'top', - required: false, - placeholder: 'px', - value: 0, + name: "指标线", + list: [ + { + type: 'el-switch', + label: '显示', + name: 'splitShow', + required: false, + placeholder: '', + value: true, + }, + { + type: 'el-input-number', + label: '距离', + name: 'splitDistance', + require: false, + placeholder: '', + value: 0, + }, + { + type: 'el-input-number', + label: '长度', + name: 'splitLength', + require: false, + placeholder: '', + value: 20, + }, + { + type: 'el-input-number', + label: '宽度', + name: 'splitWidth', + require: false, + placeholder: '', + value: 4, + }, + ] }, { - type: 'el-input-number', - label: '宽度', - name: 'width', - required: false, - placeholder: '该容器在1920px大屏中的宽度', - value: 400, + name: "指标", + list: [ + { + type: 'el-switch', + label: '显示', + name: 'labelShow', + required: false, + placeholder: '', + value: true, + }, + { + type: 'el-input-number', + label: '距离', + name: 'labelDistance', + require: false, + placeholder: '', + value: 0, + }, + { + type: 'el-input-number', + label: '字号', + name: 'labelFontSize', + require: false, + placeholder: '', + value: 10, + }, + { + type: 'vue-color', + label: '颜色', + name: 'labelColor', + required: false, + placeholder: '', + value: '#fff', + }, + ] }, { - type: 'el-input-number', - label: '高度', - name: 'height', - required: false, - placeholder: '该容器在1080px大屏中的高度', - value: 200, + name: "数值", + list: [ + { + type: 'vue-color', + label: '颜色', + name: 'labelColor', + required: false, + placeholder: '', + value: '#fff', + }, + { + type: 'el-input-number', + label: '字号', + name: 'labelFontSize', + require: false, + placeholder: '', + value: 10, + }, + { + type: 'el-select', + label: '字体粗细', + name: 'labelFontWeight', + required: false, + placeholder: '', + selectOptions: [ + {code: 'normal', name: '正常'}, + {code: 'bold', name: '粗体'}, + {code: 'bolder', name: '特粗体'}, + {code: 'lighter', name: '细体'} + ], + value: 'normal' + }, + ] }, ], - } + ], + // 数据 + data: [ + { + type: 'el-radio-group', + label: '数据类型', + name: 'dataType', + require: false, + placeholder: '', + selectValue: true, + selectOptions: [ + { + code: 'staticData', + name: '静态数据', + }, + { + code: 'dynamicData', + name: '动态数据', + }, + ], + value: 'staticData', + }, + { + type: 'el-input-number', + label: '刷新时间(毫秒)', + name: 'refreshTime', + relactiveDom: 'dataType', + relactiveDomValue: 'dynamicData', + value: 5000 + }, + { + type: 'el-button', + label: '静态数据', + name: 'staticData', + required: false, + placeholder: 'px', + relactiveDom: 'dataType', + relactiveDomValue: 'staticData', + value: 50, + }, + { + type: 'dycustComponents', + label: '', + name: 'dynamicData', + required: false, + placeholder: 'px', + relactiveDom: 'dataType', + chartType: 'widget-piechart', + dictKey: 'TEXT_PROPERTIES', + relactiveDomValue: 'dynamicData', + value: '', + }, + ], + // 坐标 + position: [ + { + type: 'el-input-number', + label: '左边距', + name: 'left', + required: false, + placeholder: 'px', + value: 0, + }, + { + type: 'el-input-number', + label: '上边距', + name: 'top', + required: false, + placeholder: 'px', + value: 0, + }, + { + type: 'el-input-number', + label: '宽度', + name: 'width', + required: false, + placeholder: '该容器在1920px大屏中的宽度', + value: 400, + }, + { + type: 'el-input-number', + label: '高度', + name: 'height', + required: false, + placeholder: '该容器在1080px大屏中的高度', + value: 200, + }, + ], } +} diff --git a/report-ui/src/views/report/bigscreen/designer/widget/widgetGauge.vue b/report-ui/src/views/report/bigscreen/designer/widget/widgetGauge.vue index 3893412f..6bfa284b 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/widgetGauge.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/widgetGauge.vue @@ -1,10 +1,12 @@