From ef6dba85891f128573d0ee816bbdae0fdefbacb6 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Mon, 24 Jan 2022 10:41:05 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E8=B0=83=E6=95=B4block=E5=86=85gro?=
 =?UTF-8?q?up=E9=97=AA=E7=83=81=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/charts/Panel.vue             |  2 +-
 src/views/charts/PanelChartList.vue    |  2 +-
 src/views/charts/charts/ChartBlock.vue | 22 +++++++++++++++++++++-
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/views/charts/Panel.vue b/src/views/charts/Panel.vue
index c5f1e46e..7de28c1e 100644
--- a/src/views/charts/Panel.vue
+++ b/src/views/charts/Panel.vue
@@ -125,7 +125,7 @@ export default {
         }
       }
       if (chart.type === 95) {
-        chart.h += 1
+        chart.h += 0
       }
       if (!this.$_.isEmpty(chart.children)) {
         chart.children.forEach(c => {
diff --git a/src/views/charts/PanelChartList.vue b/src/views/charts/PanelChartList.vue
index faac211a..61241b1f 100644
--- a/src/views/charts/PanelChartList.vue
+++ b/src/views/charts/PanelChartList.vue
@@ -121,7 +121,7 @@ export default {
           if (item.params.collpase) {
             item.h = 1
           } else {
-            item.h = getGroupHeight(item.children) + 2
+            item.h = getGroupHeight(item.children) + 1
           }
         }
       })
diff --git a/src/views/charts/charts/ChartBlock.vue b/src/views/charts/charts/ChartBlock.vue
index 9e80059e..56d6f7e0 100644
--- a/src/views/charts/charts/ChartBlock.vue
+++ b/src/views/charts/charts/ChartBlock.vue
@@ -1,7 +1,7 @@
 <template>
   <panel-chart-list
       :time-filter="timeFilter"
-      :data-list="chartInfo.children"
+      :data-list="dataList"
       :panel-lock="true"
       :entity="entity"
   >
@@ -17,7 +17,27 @@ export default {
   props: {
     timeFilter: Object
   },
+  data () {
+    return {
+      dataList: [],
+      firstShow: false
+    }
+  },
+  watch: {
+    'chartInfo.children': {
+      immediate: true,
+      deep: true,
+      handle (n) {
+        if (!this.firstShow) {
+          this.dataList = JSON.parse(JSON.stringify(this.chartInfo.children))
+          this.firstShow = true
+        }
+      }
+    }
+  },
   mounted () {
+    this.dataList = JSON.parse(JSON.stringify(this.chartInfo.children))
+    this.firstShow = true
   }
 }
 </script>