From f50bd497be6e9b6ee50ee5794c17d40c0346026a Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 2 Apr 2024 18:15:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=BB=94=E8=A5=BF=E5=8D=97?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/bigscreen/dv/AppQxnDv.vue | 5 -----
 ui/packages/tools/AiEchartV2.vue   | 4 ++--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/packages/bigscreen/dv/AppQxnDv.vue b/packages/bigscreen/dv/AppQxnDv.vue
index 01700e7a..9a88af46 100644
--- a/packages/bigscreen/dv/AppQxnDv.vue
+++ b/packages/bigscreen/dv/AppQxnDv.vue
@@ -99,7 +99,6 @@
               </div>
               <ai-echart-v2
                 style="height: 220px; width: 100%; margin-top: 10px;"
-                :ref="'chart2'"
                 :data="lineData9"
                 :ops="barChart9">
               </ai-echart-v2>
@@ -112,7 +111,6 @@
               </div>
               <ai-echart-v2
                 style="height: 236px; width: 100%; margin-top: 10px;"
-                :ref="'chart2'"
                 :data="dwData"
                 :ops="barChart8">
               </ai-echart-v2>
@@ -123,7 +121,6 @@
               </div>
               <ai-echart-v2
                 style="height: 160px; width: 100%; margin-top: 20px;"
-                :ref="'chart2'"
                 :data="qrsGmData"
                 :ops="pieChart">
               </ai-echart-v2>
@@ -907,8 +904,6 @@
                 }
               })
             }
-
-            this.lineData9 = res.data.tagInfo
           }
         })
 
diff --git a/ui/packages/tools/AiEchartV2.vue b/ui/packages/tools/AiEchartV2.vue
index 3745db99..6b817dce 100644
--- a/ui/packages/tools/AiEchartV2.vue
+++ b/ui/packages/tools/AiEchartV2.vue
@@ -59,7 +59,7 @@ export default {
           colors = this.theme === '1' ? this.colors : (options.color || this.colors),
           legend = {textStyle: {color: '#fff', padding: [0, 0, 0, 8], fontSize: 14}, show: false},
           series = data?.[0] ? Array(Object.keys(data?.[0]).length - 1).fill(1)
-              .map((e, i) => ({type, ...(typeof style == 'object' ? style : style(colors[i]))})) : []
+              .map((e, i) => ({type, ...daemon, ...(typeof style == 'object' ? style : style(colors[i]))})) : []
       return {
         tooltip: {},
         xAxis: {
@@ -99,7 +99,7 @@ export default {
           top: '26px',
           containLabel: true
         },
-        legend, series: {...daemon, ...series}, ...options,
+        legend, series, ...options,
         color: colors
       }
     },