From a06ed3fc37cf877deab9b317627195391b083aef Mon Sep 17 00:00:00 2001 From: qianming Date: Mon, 14 Nov 2022 17:12:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=98=E7=BA=BF-=E7=82=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../barlineCharts/widget-bar-line-stack.js | 12 ++++++++++++ .../configure/lineCharts/widget-line-compare.js | 14 +++++++++++++- .../configure/lineCharts/widget-line-stack.js | 12 ++++++++++++ .../tools/configure/lineCharts/widget-linechart.js | 12 ++++++++++++ .../widget/barline/widgetBarLineStackChart.vue | 12 ++++++++++++ .../widget/line/widgetLineCompareChart.vue | 1 + .../designer/widget/line/widgetLineStackChart.vue | 4 ++-- .../designer/widget/line/widgetLinechart.vue | 2 +- 8 files changed, 65 insertions(+), 4 deletions(-) diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-bar-line-stack.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-bar-line-stack.js index 47c58a99..bea0082e 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-bar-line-stack.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-bar-line-stack.js @@ -68,6 +68,18 @@ export const widgetBarLineStack = { placeholder: '', value: 3, }, + { + type: 'el-select', + label: '点样式', + name: 'symbol', + required: false, + placeholder: '', + selectOptions: [ + {code: 'circle', name: '实心点'}, + {code: 'emptyCircle', name: '空心点'}, + ], + value: 'circle' + }, { type: 'el-switch', label: '平滑曲线', diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-compare.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-compare.js index 2d7a738c..ef093368 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-compare.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-compare.js @@ -49,7 +49,19 @@ export const widgetLineCompare = { name: 'pointSize', required: false, placeholder: '', - value: 5, + value: 10, + }, + { + type: 'el-select', + label: '点样式', + name: 'symbol', + required: false, + placeholder: '', + selectOptions: [ + {code: 'circle', name: '实心点'}, + {code: 'emptyCircle', name: '空心点'}, + ], + value: 'circle' }, { type: 'el-switch', diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-stack.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-stack.js index 834672e3..83272a78 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-stack.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-stack.js @@ -59,6 +59,18 @@ export const widgetLineStack = { placeholder: '', value: 5, }, + { + type: 'el-select', + label: '点样式', + name: 'symbol', + required: false, + placeholder: '', + selectOptions: [ + {code: 'circle', name: '实心点'}, + {code: 'emptyCircle', name: '空心点'}, + ], + value: 'circle' + }, { type: 'el-switch', label: '平滑曲线', diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-linechart.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-linechart.js index 50e788a6..24999b32 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-linechart.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-linechart.js @@ -51,6 +51,18 @@ export const widgetLinechart = { placeholder: '', value: 10, }, + { + type: 'el-select', + label: '点样式', + name: 'symbol', + required: false, + placeholder: '', + selectOptions: [ + {code: 'circle', name: '实心点'}, + {code: 'emptyCircle', name: '空心点'}, + ], + value: 'circle' + }, { type: 'el-switch', label: '平滑曲线', diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarLineStackChart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarLineStackChart.vue index a4a670d5..194800aa 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarLineStackChart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarLineStackChart.vue @@ -435,9 +435,15 @@ export default { type: 'line', data: line, yAxisIndex: 1, + symbol: optionsSetup.symbol, showSymbol: optionsSetup.markPoint, symbolSize: optionsSetup.pointSize, smooth: optionsSetup.smoothCurve, + itemStyle: { + normal: { + color: arrColor[i], + } + }, // 线条 lineStyle: { color: arrColor[i], @@ -528,9 +534,15 @@ export default { type: "line", data: line, yAxisIndex: 1, + symbol: optionsSetup.symbol, showSymbol: optionsSetup.markPoint, symbolSize: optionsSetup.pointSize, smooth: optionsSetup.smoothCurve, + itemStyle: { + normal: { + color: arrColor[i], + } + }, // 线条 lineStyle: { color: arrColor[i], diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineCompareChart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineCompareChart.vue index 8916e3d3..e0ccd747 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineCompareChart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineCompareChart.vue @@ -447,6 +447,7 @@ export default { const series = this.options.series // 折线 for (const key in series) { + series[key].symbol = optionsSetup.symbol series[key].showSymbol = optionsSetup.markPoint series[key].symbolSize = optionsSetup.pointSize series[key].smooth = optionsSetup.smoothCurve diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue index 8fad663b..b57c6c20 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue @@ -356,7 +356,7 @@ export default { type: "line", data: data, width: optionsSetup.lineWidth, - symbol: 'circle', + symbol: optionsSetup.symbol, showSymbol: optionsSetup.markPoint, symbolSize: optionsSetup.pointSize, smooth: optionsSetup.smoothCurve, @@ -443,7 +443,7 @@ export default { type: "line", data: val.series[i].data, width: optionsSetup.lineWidth, - symbol: 'circle', + symbol: optionsSetup.symbol, showSymbol: optionsSetup.markPoint, symbolSize: optionsSetup.pointSize, symbolColor: arrColor[i], diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLinechart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLinechart.vue index 9ae2ccb4..f650fce8 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLinechart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLinechart.vue @@ -224,6 +224,7 @@ export default { const series = this.options.series; for (const key in series) { if (series[key].type == "line") { + series[key].symbol = optionsSetup.symbol; series[key].showSymbol = optionsSetup.markPoint; series[key].symbolSize = optionsSetup.pointSize; series[key].smooth = optionsSetup.smoothCurve; @@ -236,7 +237,6 @@ export default { opacity: 0 }; } - series[key].lineStyle = { width: optionsSetup.lineWidth };