统一配置--提示语配置统一

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-bar-compare.js

@@ -498,7 +498,7 @@ export const widgetBarCompare = {
             list: [
               {
                 type: 'el-input-number',
-                label: '字体大小',
+                label: '字体字号',
                 name: 'tipsFontSize',
                 required: false,
                 placeholder: '',
@@ -507,9 +507,10 @@ export const widgetBarCompare = {
               {
                 type: 'vue-color',
                 label: '字体颜色',
-                name: 'lineColor',
+                name: 'tipsColor',
                 required: false,
                 placeholder: '',
+                value: '#00FEFF'
               },
             ],
           },

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

@@ -644,10 +644,10 @@ export const widgetBarLineStack = {
             {
               type: 'vue-color',
               label: '字体颜色',
-              name: 'lineColor',
+              name: 'tipsColor',
               required: false,
               placeholder: '',
-              value: 'rgba(0, 206, 209, 1)'
+              value: '#00FEFF'
             },
           ],
         },

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-bar-stack.js

@@ -498,7 +498,7 @@ export const widgetBarStack =  {
             list: [
               {
                 type: 'el-input-number',
-                label: '字体大小',
+                label: '字体字号',
                 name: 'tipsFontSize',
                 required: false,
                 placeholder: '',
@@ -507,9 +507,10 @@ export const widgetBarStack =  {
               {
                 type: 'vue-color',
                 label: '字体颜色',
-                name: 'lineColor',
+                name: 'tipsColor',
                 required: false,
                 placeholder: '',
+                value: '#00FEFF'
               },
             ],
           },

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-barchart.js

@@ -445,9 +445,10 @@ export const widgetBarchart = {
             {
               type: 'vue-color',
               label: '字体颜色',
-              name: 'lineColor',
+              name: 'tipsColor',
               required: false,
               placeholder: '',
+              value: '#00FEFF'
             },
           ],
         },

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

@@ -622,19 +622,19 @@ export const widgetBarlinechart = {
           list: [
             {
               type: 'el-input-number',
-              label: '字体大小',
-              name: 'tipFontSize',
+              label: '字体字号',
+              name: 'tipsFontSize',
               required: false,
               placeholder: '',
-              value: 12
+              value: 16
             },
             {
               type: 'vue-color',
               label: '字体颜色',
-              name: 'lineColor',
+              name: 'tipsColor',
               required: false,
               placeholder: '',
-              value: '#e68b55'
+              value: '#00FEFF'
             },
           ],
         },

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-funnel.js

@@ -264,18 +264,18 @@ export const widgetFunnel = {
             {
               type: 'el-input-number',
               label: '字体字号',
-              name: 'tipFontSize',
+              name: 'tipsFontSize',
               required: false,
               placeholder: '',
-              value: 14
+              value: 16
             },
             {
               type: 'vue-color',
               label: '字体颜色',
-              name: 'lineColor',
+              name: 'tipsColor',
               required: false,
               placeholder: '',
-              value: ''
+              value: '#00FEFF'
             },
           ],
         },

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-gradient-barchart.js

@@ -427,7 +427,7 @@ export const widgetGradientBarchart = {
           list: [
             {
               type: 'el-input-number',
-              label: '字体大小',
+              label: '字体字号',
               name: 'tipsFontSize',
               required: false,
               placeholder: '',
@@ -436,9 +436,10 @@ export const widgetGradientBarchart = {
             {
               type: 'vue-color',
               label: '字体颜色',
-              name: 'lineColor',
+              name: 'tipsColor',
               required: false,
-              placeholder: '#ff7f50',
+              placeholder: '',
+              value: '#00FEFF'
             },
           ],
         },

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-heatmap.js

@@ -352,9 +352,10 @@ export const widgetHeatmap = {
             {
               type: 'vue-color',
               label: '字体颜色',
-              name: 'tipsLineColor',
+              name: 'tipsColor',
               required: false,
               placeholder: '',
+              value: '#00FEFF'
             },
           ],
         },

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

@@ -604,7 +604,7 @@ export const widgetLineCompare = {
             {
               type: 'el-switch',
               label: '显示',
-              name: 'tipShow',
+              name: 'tipsShow',
               required: false,
               placeholder: '',
               value: true,
@@ -612,7 +612,7 @@ export const widgetLineCompare = {
             {
               type: 'el-select',
               label: '类型',
-              name: 'tipType',
+              name: 'tipsType',
               required: false,
               placeholder: '',
               selectOptions: [
@@ -624,9 +624,10 @@ export const widgetLineCompare = {
             {
               type: 'vue-color',
               label: '颜色',
-              name: 'tipColor',
+              name: 'tipsColor',
               required: false,
-              placeholder: '#e68b55',
+              placeholder: '',
+              value: '#00FEFF'
             },
           ],
         },
@@ -768,7 +769,7 @@ export const widgetLineCompare = {
         name: 'width',
         required: false,
         placeholder: '该容器在1920px大屏中的宽度',
-        value: 400,
+        value: 500,
       },
       {
         type: 'el-input-number',
@@ -776,7 +777,7 @@ export const widgetLineCompare = {
         name: 'height',
         required: false,
         placeholder: '该容器在1080px大屏中的高度',
-        value: 200,
+        value: 250,
       },
     ],
   }

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

@@ -518,7 +518,7 @@ export const widgetLineStack =   {
             list: [
               {
                 type: 'el-input-number',
-                label: '字体大小',
+                label: '字体字号',
                 name: 'tipsFontSize',
                 required: false,
                 placeholder: '',
@@ -527,9 +527,10 @@ export const widgetLineStack =   {
               {
                 type: 'vue-color',
                 label: '字体颜色',
-                name: 'lineColor',
+                name: 'tipsColor',
                 required: false,
                 placeholder: '',
+                value: '#00FEFF'
               },
             ],
           },

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

@@ -444,7 +444,7 @@ export const widgetLinechart = {
           list: [
             {
               type: 'el-input-number',
-              label: '字体大小',
+              label: '字体字号',
               name: 'tipsFontSize',
               required: false,
               placeholder: '',
@@ -453,10 +453,10 @@ export const widgetLinechart = {
             {
               type: 'vue-color',
               label: '字体颜色',
-              name: 'lineColor',
+              name: 'tipsColor',
               required: false,
               placeholder: '',
-              value: ''
+              value: '#00FEFF'
             },
           ],
         },

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

@@ -590,19 +590,19 @@ export const widgetMoreBarLine = {
           list: [
             {
               type: 'el-input-number',
-              label: '字体大小',
-              name: 'tipFontSize',
+              label: '字体字号',
+              name: 'tipsFontSize',
               required: false,
               placeholder: '',
-              value: 12
+              value: 16
             },
             {
               type: 'vue-color',
               label: '字体颜色',
-              name: 'lineColor',
+              name: 'tipsColor',
               required: false,
               placeholder: '',
-              value: '#e68b55'
+              value: '#00FEFF'
             },
           ],
         },

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-pie-nightingale.js

@@ -209,19 +209,19 @@ export const widgetPieNightingale = {
             list: [
               {
                 type: 'el-input-number',
-                label: '字体大小',
-                name: 'fontSize',
+                label: '字体字号',
+                name: 'tipsFontSize',
                 required: false,
                 placeholder: '',
-                value: 12
+                value: 16
               },
               {
                 type: 'vue-color',
-                label: '网格线颜色',
-                name: 'lineColor',
+                label: '字体颜色',
+                name: 'tipsColor',
                 required: false,
                 placeholder: '',
-                value: ''
+                value: '#00FEFF'
               },
             ],
           },

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-piechart.js

@@ -174,11 +174,11 @@ export const widgetPiechart =   {
               },
               {
                 type: 'el-input-number',
-                label: '字体大小',
+                label: '字体字号',
                 name: 'fontSize',
                 required: false,
                 placeholder: '',
-                value: 14,
+                value: 12,
               },
               {
                 type: 'vue-color',
@@ -209,19 +209,19 @@ export const widgetPiechart =   {
             list: [
               {
                 type: 'el-input-number',
-                label: '字体大小',
-                name: 'fontSize',
+                label: '字体字号',
+                name: 'tipFontSize',
                 required: false,
                 placeholder: '',
-                value: 12
+                value: 16
               },
               {
                 type: 'vue-color',
-                label: '网格线颜色',
-                name: 'lineColor',
+                label: '字体颜色',
+                name: 'tipsColor',
                 required: false,
                 placeholder: '',
-                value: ''
+                value: '#00FEFF'
               },
             ],
           },

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-radar.js

@@ -313,7 +313,7 @@ export const widgetRadar = {
           list: [
             {
               type: 'el-input-number',
-              label: '字体大小',
+              label: '字体字号',
               name: 'tipsFontSize',
               required: false,
               placeholder: '',
@@ -322,10 +322,10 @@ export const widgetRadar = {
             {
               type: 'vue-color',
               label: '字体颜色',
-              name: 'lineColor',
+              name: 'tipsColor',
               required: false,
               placeholder: '',
-              value: 'rgba(0, 206, 209, 1)'
+              value: '#00FEFF'
             },
           ],
         },

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-word-cloud.js

@@ -172,16 +172,16 @@ export const widgetWordCloud = {
           list: [
             {
               type: 'el-input-number',
-              label: '字体大小',
-              name: 'fontSize',
+              label: '字体字号',
+              name: 'tipsFontSize',
               required: false,
               placeholder: '',
-              value: 12
+              value: 16
             },
             {
               type: 'vue-color',
               label: '字体颜色',
-              name: 'lineColor',
+              name: 'tipsColor',
               required: false,
               placeholder: '',
               value: '#00FEFF'

report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarCompareChart.vue

@@ -441,8 +441,8 @@ export default {
         trigger: "item",
         show: true,
         textStyle: {
-          color: optionsSetup.lineColor,
-          fontSize: optionsSetup.fontSize
+          color: optionsSetup.tipsColor,
+          fontSize: optionsSetup.tipsFontSize
         }
       };
       this.options.tooltip = tooltip;

report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarLineStackChart.vue

@@ -266,7 +266,7 @@ export default {
         trigger: "item",
         show: true,
         textStyle: {
-          color: optionsSetup.lineColor,
+          color: optionsSetup.tipsColor,
           fontSize: optionsSetup.tipsFontSize
         }
       };

report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarStackChart.vue

@@ -210,7 +210,7 @@ export default {
         trigger: "item",
         show: true,
         textStyle: {
-          color: optionsSetup.lineColor,
+          color: optionsSetup.tipsColor,
           fontSize: optionsSetup.tipsFontSize
         }
       };

report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarchart.vue

@@ -234,7 +234,7 @@ export default {
         trigger: "item",
         show: true,
         textStyle: {
-          color: optionsSetup.lineColor,
+          color: optionsSetup.tipsColor,
           fontSize: optionsSetup.tipsFontSize
         }
       };

report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarlinechart.vue

@@ -323,8 +323,8 @@ export default {
         trigger: "item",
         show: true,
         textStyle: {
-          color: optionsSetup.lineColor,
-          fontSize: optionsSetup.tipFontSize
+          color: optionsSetup.tipsColor,
+          fontSize: optionsSetup.tipsFontSize
         }
       };
       this.options.tooltip = tooltip;

report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetGradientColorBarchart.vue

@@ -300,7 +300,7 @@ export default {
         trigger: "item",
         show: true,
         textStyle: {
-          color: optionsSetup.lineColor,
+          color: optionsSetup.tipsColor,
           fontSize: optionsSetup.tipsFontSize
         }
       };

report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetMoreBarLineChart.vue

@@ -338,8 +338,8 @@ export default {
         trigger: 'item',
         show: true,
         textStyle: {
-          color: optionsSetup.lineColor,
-          fontSize: optionsSetup.tipFontSize
+          color: optionsSetup.tipsColor,
+          fontSize: optionsSetup.tipsFontSize
         }
       };
       this.options.tooltip = tooltip;

report-ui/src/views/bigscreenDesigner/designer/widget/heatmap/widgetHeatmap.vue

@@ -277,8 +277,8 @@ export default {
         position: "top",
         show: true,
         textStyle: {
-          color: optionsSetup.lineColor,
-          fontSize: optionsSetup.tipsLineColor
+          color: optionsSetup.tipsColor,
+          fontSize: optionsSetup.tipsFontSize,
         }
       };
       this.options.tooltip = tooltip;

report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineCompareChart.vue

@@ -476,30 +476,30 @@ export default {
     setOptionsTooltip() {
       const optionsSetup = this.optionsSetup;
       let tooltip = {}
-      if (optionsSetup.tipType == "line") {
+      if (optionsSetup.tipsType == "line") {
         tooltip = {
-          show: optionsSetup.tipShow,
+          show: optionsSetup.tipsShow,
           trigger: 'axis',
           axisPointer: {
-            type: optionsSetup.tipType,
+            type: optionsSetup.tipsType,
             lineStyle: {
-              color: optionsSetup.tipColor,
+              color: optionsSetup.tipsColor,
               type: 'dashed',
             },
           },
         }
       } else {
         tooltip = {
-          show: optionsSetup.tipShow,
+          show: optionsSetup.tipsShow,
           trigger: 'axis',
           axisPointer: {
-            type: optionsSetup.tipType,
+            type: optionsSetup.tipsType,
             lineStyle: {
-              color: optionsSetup.tipColor,
+              color: optionsSetup.tipsColor,
               type: 'dashed',
             },
             crossStyle: {
-              color: optionsSetup.tipColor,
+              color: optionsSetup.tipsColor,
             }
           },
         }

report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue

@@ -225,7 +225,7 @@ export default {
         trigger: "item",
         show: true,
         textStyle: {
-          color: optionsSetup.lineColor,
+          color: optionsSetup.tipsColor,
           fontSize: optionsSetup.tipsFontSize
         }
       };

report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLinechart.vue

@@ -242,7 +242,7 @@ export default {
         trigger: "item",
         show: true,
         textStyle: {
-          color: optionsSetup.lineColor,
+          color: optionsSetup.tipsColor,
           fontSize: optionsSetup.tipsFontSize
         }
       };

report-ui/src/views/bigscreenDesigner/designer/widget/pie/widgetPieNightingaleRose.vue

@@ -92,98 +92,98 @@ export default {
     },
     // 标题修改
     setOptionsTitle() {
-      const optionsCollapse = this.optionsSetup;
+      const optionsSetup = this.optionsSetup;
       const title = {};
-      title.text = optionsCollapse.titleText;
-      title.show = optionsCollapse.isNoTitle;
-      title.left = optionsCollapse.textAlign;
+      title.text = optionsSetup.titleText;
+      title.show = optionsSetup.isNoTitle;
+      title.left = optionsSetup.textAlign;
       title.textStyle = {
-        color: optionsCollapse.textColor,
-        fontSize: optionsCollapse.textFontSize,
-        fontWeight: optionsCollapse.textFontWeight
+        color: optionsSetup.textColor,
+        fontSize: optionsSetup.textFontSize,
+        fontWeight: optionsSetup.textFontWeight
       };
-      title.subtext = optionsCollapse.subText;
+      title.subtext = optionsSetup.subText;
       title.subtextStyle = {
-        color: optionsCollapse.subTextColor,
-        fontWeight: optionsCollapse.subTextFontWeight,
-        fontSize: optionsCollapse.subTextFontSize
+        color: optionsSetup.subTextColor,
+        fontWeight: optionsSetup.subTextFontWeight,
+        fontSize: optionsSetup.subTextFontSize
       };
       this.options.title = title;
     },
     // 数值设定
     setOptionsValue() {
-      const optionsCollapse = this.optionsSetup;
+      const optionsSetup = this.optionsSetup;
       const series = this.options.series;
-      const numberValue = optionsCollapse.numberValue ? "{c}" : "";
-      const percentage = optionsCollapse.percentage ? "({d})%" : "";
+      const numberValue = optionsSetup.numberValue ? "{c}" : "";
+      const percentage = optionsSetup.percentage ? "({d})%" : "";
       const label = {
-        show: optionsCollapse.isShow,
+        show: optionsSetup.isShow,
         formatter: `{a|{b}：${numberValue} ${percentage}}`,
         rich: {
           a: {
             padding: [-30, 15, -20, 15],
-            color: optionsCollapse.subTextColor,
-            fontSize: optionsCollapse.fontSize,
-            fontWeight: optionsCollapse.fontWeight
+            color: optionsSetup.subTextColor,
+            fontSize: optionsSetup.fontSize,
+            fontWeight: optionsSetup.fontWeight
           }
         },
-        fontSize: optionsCollapse.fontSize,
+        fontSize: optionsSetup.fontSize,
 
-        fontWeight: optionsCollapse.optionsCollapse
+        fontWeight: optionsSetup.optionsSetup
       };
       for (const key in series) {
         if (series[key].type == "pie") {
           series[key].label = label;
-          series[key].labelLine = { show: optionsCollapse.isShow };
+          series[key].labelLine = { show: optionsSetup.isShow };
         }
       }
     },
     // tooltip 设置
     setOptionsTooltip() {
-      const optionsCollapse = this.optionsSetup;
+      const optionsSetup = this.optionsSetup;
       const tooltip = {
         trigger: "item",
         show: true,
         textStyle: {
-          color: optionsCollapse.lineColor,
-          fontSize: optionsCollapse.fontSize
+          color: optionsSetup.tipsColor,
+          fontSize: optionsSetup.tipsFontSize
         }
       };
       this.options.tooltip = tooltip;
     },
     // 边距设置
     setOptionsMargin() {
-      const optionsCollapse = this.optionsSetup;
+      const optionsSetup = this.optionsSetup;
       const grid = {
-        left: optionsCollapse.marginLeft,
-        right: optionsCollapse.marginRight,
-        bottom: optionsCollapse.marginBottom,
-        top: optionsCollapse.marginTop,
+        left: optionsSetup.marginLeft,
+        right: optionsSetup.marginRight,
+        bottom: optionsSetup.marginBottom,
+        top: optionsSetup.marginTop,
         containLabel: true
       };
       this.options.grid = grid;
     },
     // 图例操作 legend
     setOptionsLegend() {
-      const optionsCollapse = this.optionsSetup;
+      const optionsSetup = this.optionsSetup;
       const legend = this.options.legend;
-      legend.show = optionsCollapse.isShowLegend;
-      legend.left = optionsCollapse.lateralPosition == "left" ? 0 : "auto";
-      legend.right = optionsCollapse.lateralPosition == "right" ? 0 : "auto";
-      legend.top = optionsCollapse.longitudinalPosition == "top" ? 0 : "auto";
+      legend.show = optionsSetup.isShowLegend;
+      legend.left = optionsSetup.lateralPosition == "left" ? 0 : "auto";
+      legend.right = optionsSetup.lateralPosition == "right" ? 0 : "auto";
+      legend.top = optionsSetup.longitudinalPosition == "top" ? 0 : "auto";
       legend.bottom =
-        optionsCollapse.longitudinalPosition == "bottom" ? 0 : "auto";
-      legend.orient = optionsCollapse.layoutFront;
+        optionsSetup.longitudinalPosition == "bottom" ? 0 : "auto";
+      legend.orient = optionsSetup.layoutFront;
       legend.textStyle = {
-        color: optionsCollapse.legendColor,
-        fontSize: optionsCollapse.fontSize
+        color: optionsSetup.legendColor,
+        fontSize: optionsSetup.fontSize
       };
-      legend.itemWidth = optionsCollapse.legendWidth;
+      legend.itemWidth = optionsSetup.legendWidth;
     },
     // 图例颜色修改
     setOptionsColor() {
-      const optionsCollapse = this.optionsSetup;
-      const customColor = optionsCollapse.customColor;
+      const optionsSetup = this.optionsSetup;
+      const customColor = optionsSetup.customColor;
       if (!customColor) return;
       const arrColor = [];
       for (let i = 0; i < customColor.length; i++) {

report-ui/src/views/bigscreenDesigner/designer/widget/pie/widgetPiechart.vue

@@ -157,7 +157,7 @@ export default {
         show: true,
         textStyle: {
           color: optionsSetup.lineColor,
-          fontSize: optionsSetup.fontSize
+          fontSize: optionsSetup.tipFontSize
         }
       };
       this.options.tooltip = tooltip;

report-ui/src/views/bigscreenDesigner/designer/widget/radar/widgetRadar.vue

@@ -149,7 +149,7 @@ export default {
         trigger: "item",
         show: true,
         textStyle: {
-          color: optionsSetup.lineColor,
+          color: optionsSetup.tipsColor,
           fontSize: optionsSetup.tipsFontSize,
         }
       };

report-ui/src/views/bigscreenDesigner/designer/widget/widgetFunnel.vue

@@ -172,8 +172,8 @@ export default {
         trigger: "item",
         show: true,
         textStyle: {
-          color: optionsSetup.lineColor,
-          fontSize: optionsSetup.tipFontSize
+          color: optionsSetup.tipsColor,
+          fontSize: optionsSetup.tipsFontSize
         }
       };
       this.options.tooltip = tooltip;

report-ui/src/views/bigscreenDesigner/designer/widget/wordcloud/widgetWordCloud.vue

@@ -130,8 +130,8 @@ export default {
         trigger: "item",
         show: true,
         textStyle: {
-          color: optionsSetup.lineColor,
-          fontSize: optionsSetup.fontSize
+          color: optionsSetup.tipsColor,
+          fontSize: optionsSetup.tipsFontSize
         }
       };
       this.options.tooltip = tooltip;