From 179a7b5c6e8280e941405abdff99a17342b2a70d Mon Sep 17 00:00:00 2001
From: qianming <isqianming@163.com>
Date: Thu, 20 Jan 2022 16:34:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E6=9F=B1=E7=BA=BF=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../widget/bar/widgetMoreBarLineChart.vue     | 43 ++++++++++---------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetMoreBarLineChart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetMoreBarLineChart.vue
index 8fb2b5ff..bd89bcb9 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetMoreBarLineChart.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetMoreBarLineChart.vue
@@ -212,7 +212,6 @@ export default {
       this.setOptionsX();
       this.setOptionsY();
       this.setOptionsLegend();
-      this.setOptionsLegendName();
       this.setOptionsTooltip();
       this.setOptionsMargin();
       this.setOptionsColor();
@@ -374,28 +373,22 @@ export default {
       };
       legend.itemWidth = optionsSetup.lengedWidth;
     },
-    setOptionsLegendName(){
+    setOptionsLegendName(name){
       const optionsSetup = this.optionsSetup;
       const series = this.options.series;
-      if (this.optionsData.dataType == 'staticData') {
-        const legendName = optionsSetup.legendName;
-        if (null == legendName || legendName == '') {
-          const name = [];
-          name.push('调解成功');
-          name.push('调解失败');
-          name.push('调解终止');
-          name.push('调解成功率');
-          for (let i = 0; i < name.length; i++) {
-            series[i].name = name[i];
-          }
-          this.options.legend['data'] = name;
-        }else {
-          const arr = legendName.split('|');
-          for (let i = 0; i < arr.length; i++) {
-            series[i].name = arr[i];
-          }
-          this.options.legend['data'] = arr
+      const legendName = optionsSetup.legendName;
+      // 图例没有手动写则显示原值，写了则显示新值
+      if (null == legendName || legendName == '') {
+        for (let i = 0; i < name.length; i++) {
+          series[i].name = name[i];
         }
+        this.options.legend['data'] = name;
+      }else {
+        const arr = legendName.split('|');
+        for (let i = 0; i < arr.length; i++) {
+          series[i].name = arr[i];
+        }
+        this.options.legend['data'] = arr
       }
     },
     // 颜色修改
@@ -484,6 +477,13 @@ export default {
       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);
     },
     dynamicDataFn(val, refreshTime) {
       if (!val) return;
@@ -562,7 +562,8 @@ export default {
       }
       this.options.legend['data'] = legendName;
       this.options.series = series;
-    }
+      this.setOptionsLegendName(legendName);
+    },
   }
 };