折线-点配置优化

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: '平滑曲线',

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',

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: '平滑曲线',

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: '平滑曲线',

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],

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

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],

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
           };