多柱线更新

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

@@ -420,7 +420,7 @@ export const widgetMoreBarLine = {
             {
               type: 'el-input-number',
               label: '左坐标字号',
-              name: 'namefontSizeYLeft',
+              name: 'nameFontSizeYLeft',
               required: false,
               placeholder: '',
               value: 14,
@@ -452,7 +452,7 @@ export const widgetMoreBarLine = {
             {
               type: 'el-input-number',
               label: '右坐标字号',
-              name: 'namefontSizeYRight',
+              name: 'nameFontSizeYRight',
               required: false,
               placeholder: '',
               value: 14,
@@ -650,7 +650,6 @@ export const widgetMoreBarLine = {
               required: false,
               value: [
                 {color: '#4bdfff'},
-                {color: '#5dc1fd'},
                 {color: '#55f49c'},
                 {color: '#ffa43a'},
               ],
@@ -697,14 +696,14 @@ export const widgetMoreBarLine = {
         relactiveDom: 'dataType',
         relactiveDomValue: 'staticData',
         value: [
-          {"date": "2014", "unsales": 400, "manus": 300, "rework": 400, "sales": 4.2,},
+          {"date": "2014", "unsales": 400, "manus": 300, "sales": 4.2,},
-          {"date": "2015", "unsales": 400, "manus": 500, "rework": 300, "sales": 3.6,},
+          {"date": "2015", "unsales": 400, "manus": 500, "sales": 3.6,},
-          {"date": "2016", "unsales": 300, "manus": 500, "rework": 500, "sales": 5.8,},
+          {"date": "2016", "unsales": 300, "manus": 500, "sales": 5.8,},
-          {"date": "2017", "unsales": 300, "manus": 500, "rework": 700, "sales": 3.4,},
+          {"date": "2017", "unsales": 300, "manus": 500, "sales": 3.4,},
-          {"date": "2018", "unsales": 400, "manus": 400, "rework": 1000, "sales": 2.5,},
+          {"date": "2018", "unsales": 400, "manus": 400, "sales": 2.5,},
-          {"date": "2019", "unsales": 400, "manus": 500, "rework": 500, "sales": 5.8,},
+          {"date": "2019", "unsales": 400, "manus": 500, "sales": 5.8,},
-          {"date": "2020", "unsales": 300, "manus": 400, "rework": 600, "sales": 7.6,},
+          {"date": "2020", "unsales": 300, "manus": 400, "sales": 7.6,},
-          {"date": "2021", "unsales": 300, "manus": 600, "rework": 400, "sales": 3.4,},
+          {"date": "2021", "unsales": 300, "manus": 600, "sales": 3.4,},
         ]
       },
       {

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

@@ -80,7 +80,6 @@ export default {
             nameTextStyle: {
               color: '#666666'
             },
-            position: 'right',
             axisLine: {
               lineStyle: {
                 color: '#cdd5e2'
@@ -283,9 +282,9 @@ export default {
           type: 'value',
           show: optionsSetup.isShowYLeft, // 坐标轴是否显示
           name: optionsSetup.textNameYLeft, // 坐标轴名称
-          nameTextStyle: { // 别名
+          nameTextStyle: { //颜色字号
             color: optionsSetup.nameColorYLeft,
-            fontSize: optionsSetup.namefontSizeYLeft
+            fontSize: optionsSetup.nameFontSizeYLeft
           },
           axisLabel: {
             show: true,
@@ -295,7 +294,7 @@ export default {
             }
           },
           axisLine: {
-            show: optionsSetup.isShowYLeft,
+            show: true,
             lineStyle: {
               color: optionsSetup.lineColorY
             }
@@ -306,12 +305,11 @@ export default {
         },
         {
           type: 'value',
-          position: 'right',
           show: optionsSetup.isShowYRight, // 坐标轴是否显示
           name: optionsSetup.textNameYRight, // 坐标轴名称
-          nameTextStyle: { // 别名
+          nameTextStyle: { // 颜色字号
             color: optionsSetup.nameColorYRight,
-            fontSize: optionsSetup.namefontSizeYRight
+            fontSize: optionsSetup.nameFontSizeYRight
           },
           axisLabel: {
             show: true,
@@ -321,7 +319,7 @@ export default {
             }
           },
           axisLine: {
-            show: optionsSetup.isShowYRight,
+            show: true,
             lineStyle: {
               color: optionsSetup.lineColorY
             }
@@ -423,13 +421,11 @@ export default {
       let axis = [];
       let bar1 = [];
       let bar2 = [];
-      let bar3 = [];
       let line = [];
       for (const i in val) {
         axis[i] = val[i].date;
         bar1[i] = val[i].unsales;
         bar2[i] = val[i].manus;
-        bar3[i] = val[i].rework;
         line[i] = val[i].sales;
       }
       // x轴
@@ -476,12 +472,10 @@ export default {
       }
       series[0].data = bar1;
       series[1].data = bar2;
-      series[2].data = bar3;
       series[3].data = line;
       const legendName = [];
       legendName.push('调解成功');
       legendName.push('调解失败');
-      legendName.push('调解终止');
       legendName.push('调解成功率');
       this.options.legend['data'] = legendName;
       this.setOptionsLegendName(legendName);