Bladeren bron

feat--折线设置调整优化统一

qianming 1 jaar geleden
bovenliggende
commit
f392c739b5

+ 18 - 2
report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-bar-line-stack.js

@@ -155,7 +155,7 @@ export const widgetBarLineStack = {
               name: 'pointSize',
               required: false,
               placeholder: '',
-              value: 3,
+              value: 5,
             },
             {
               type: 'el-select',
@@ -183,7 +183,23 @@ export const widgetBarLineStack = {
               name: 'lineWidth',
               required: false,
               placeholder: '',
-              value: 3,
+              value: 5,
+            },
+            {
+              type: 'el-switch',
+              label: '面积堆积',
+              name: 'area',
+              required: false,
+              placeholder: '',
+              value: true,
+            },
+            {
+              type: 'el-slider',
+              label: '面积厚度',
+              name: 'areaThickness',
+              required: false,
+              placeholder: '',
+              value: 15,
             },
           ],
         },

+ 10 - 10
report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-barlinechart.js

@@ -167,7 +167,15 @@ export const widgetBarlinechart = {
               name: 'smoothCurve',
               required: false,
               placeholder: '',
-              value: true,
+              value: false,
+            },
+            {
+              type: 'el-slider',
+              label: '线条宽度',
+              name: 'lineWidth',
+              required: false,
+              placeholder: '',
+              value: 5,
             },
             {
               type: 'el-switch',
@@ -183,15 +191,7 @@ export const widgetBarlinechart = {
               name: 'areaThickness',
               required: false,
               placeholder: '',
-              value: 5,
-            },
-            {
-              type: 'el-slider',
-              label: '线条宽度',
-              name: 'lineWidth',
-              required: false,
-              placeholder: '',
-              value: 3,
+              value: 15,
             },
           ],
         },

+ 10 - 10
report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-more-bar-line.js

@@ -159,7 +159,7 @@ export const widgetMoreBarLine = {
               name: 'pointSize',
               required: false,
               placeholder: '',
-              value: 3,
+              value: 5,
             },
             {
               type: 'el-select',
@@ -181,6 +181,14 @@ export const widgetMoreBarLine = {
               placeholder: '',
               value: false,
             },
+            {
+              type: 'el-slider',
+              label: '线条宽度',
+              name: 'lineWidth',
+              required: false,
+              placeholder: '',
+              value: 5,
+            },
             {
               type: 'el-switch',
               label: '面积堆积',
@@ -195,15 +203,7 @@ export const widgetMoreBarLine = {
               name: 'areaThickness',
               required: false,
               placeholder: '',
-              value: 5,
-            },
-            {
-              type: 'el-slider',
-              label: '线条宽度',
-              name: 'lineWidth',
-              required: false,
-              placeholder: '',
-              value: 3,
+              value: 15,
             },
           ],
         },

+ 9 - 9
report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-compare.js

@@ -71,6 +71,14 @@ export const widgetLineCompare = {
               placeholder: '',
               value: true,
             },
+            {
+              type: 'el-slider',
+              label: '线条宽度',
+              name: 'lineWidth',
+              required: false,
+              placeholder: '',
+              value: 5,
+            },
             {
               type: 'el-switch',
               label: '面积堆积',
@@ -85,15 +93,7 @@ export const widgetLineCompare = {
               name: 'areaThickness',
               required: false,
               placeholder: '',
-              value: 5,
-            },
-            {
-              type: 'el-slider',
-              label: '线条宽度',
-              name: 'lineWidth',
-              required: false,
-              placeholder: '',
-              value: 5,
+              value: 15,
             },
           ],
         },

+ 11 - 11
report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-stack.js

@@ -23,14 +23,14 @@ export const widgetLineStack = {
         placeholder: '',
         value: '折线堆叠图',
       },
-      {
+/*      {
         type: 'el-switch',
         label: '竖展示',
         name: 'verticalShow',
         required: false,
         placeholder: '',
         value: false,
-      },
+      },*/
       {
         type: 'vue-color',
         label: '背景颜色',
@@ -79,6 +79,14 @@ export const widgetLineStack = {
               placeholder: '',
               value: true,
             },
+            {
+              type: 'el-slider',
+              label: '线条宽度',
+              name: 'lineWidth',
+              required: false,
+              placeholder: '',
+              value: 5,
+            },
             {
               type: 'el-switch',
               label: '面积堆积',
@@ -93,15 +101,7 @@ export const widgetLineStack = {
               name: 'areaThickness',
               required: false,
               placeholder: '',
-              value: 5,
-            },
-            {
-              type: 'el-slider',
-              label: '线条宽度',
-              name: 'lineWidth',
-              required: false,
-              placeholder: '',
-              value: 4,
+              value: 15,
             },
           ],
         },

+ 10 - 10
report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-linechart.js

@@ -49,7 +49,7 @@ export const widgetLinechart = {
               name: 'pointSize',
               required: false,
               placeholder: '',
-              value: 10,
+              value: 5,
             },
             {
               type: 'el-select',
@@ -71,6 +71,14 @@ export const widgetLinechart = {
               placeholder: '',
               value: true,
             },
+            {
+              type: 'el-slider',
+              label: '线条宽度',
+              name: 'lineWidth',
+              required: false,
+              placeholder: '',
+              value: 5,
+            },
             {
               type: 'el-switch',
               label: '面积堆积',
@@ -85,15 +93,7 @@ export const widgetLinechart = {
               name: 'areaThickness',
               required: false,
               placeholder: '',
-              value: 5,
-            },
-            {
-              type: 'el-slider',
-              label: '线条宽度',
-              name: 'lineWidth',
-              required: false,
-              placeholder: '',
-              value: 4,
+              value: 15,
             },
           ],
         },

+ 6 - 0
report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarLineStackChart.vue

@@ -509,6 +509,9 @@ export default {
             color: arrColor[i],
             width: optionsSetup.lineWidth,
           },
+          areaStyle: {
+            opacity: optionsSetup.area ? optionsSetup.areaThickness / 100 : 0,
+          },
           label: {
             show: optionsSetup.isShowLine,
             position: optionsSetup.fontPositionLine,
@@ -652,6 +655,9 @@ export default {
             color: arrColor[i],
             width: optionsSetup.lineWidth,
           },
+          areaStyle: {
+            opacity: optionsSetup.area ? optionsSetup.areaThickness / 100 : 0,
+          },
           label: {
             show: optionsSetup.isShowLine,
             position: optionsSetup.fontPositionLine,