From 9f1ab860be59328dcdf4ffc3075270908640fc69 Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Wed, 26 Jan 2022 18:32:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?style:=20=E5=8E=BB=E9=99=A4=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E8=A1=A8=E5=A4=B4=E5=BA=95=E9=83=A8=E8=BE=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/components/views/charts/panel.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/assets/css/components/views/charts/panel.scss b/src/assets/css/components/views/charts/panel.scss
index b0f1d2a3..37b4fac8 100644
--- a/src/assets/css/components/views/charts/panel.scss
+++ b/src/assets/css/components/views/charts/panel.scss
@@ -54,6 +54,7 @@
             font-size: 20px;
             color: #333;
             padding: 0;
+            border-bottom: none;
           }
           .chart-header__title {
             max-width: calc(100% - 100px);

From b5a7ed482b7076809341652aef87b35a0a116c0a Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 26 Jan 2022 18:34:38 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20block=20?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E6=97=A0=E6=95=88=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/Chart2.vue            |  2 ++
 src/views/charts/ChartHeader.vue       |  1 +
 src/views/charts/PanelChart.vue        | 16 ++++++++++++----
 src/views/charts/charts/ChartBlock.vue | 21 +++++++++------------
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/views/charts/Chart2.vue b/src/views/charts/Chart2.vue
index 669d953a..c8677ca8 100644
--- a/src/views/charts/Chart2.vue
+++ b/src/views/charts/Chart2.vue
@@ -31,6 +31,7 @@
       <chart-block
         v-else-if="isBlock"
         ref="chart"
+        :timeFilter="queryParams"
         :chart-info="chartInfo"
         :chart-data="chartData"
         :entity="entity"
@@ -38,6 +39,7 @@
 
       <chart-group
               v-else-if="isGroup"
+              :timeFilter="queryParams"
               :chart-info="chartInfo"
               :chart-data="chartData"
               :entity="entity"
diff --git a/src/views/charts/ChartHeader.vue b/src/views/charts/ChartHeader.vue
index b887a180..2388f5d5 100644
--- a/src/views/charts/ChartHeader.vue
+++ b/src/views/charts/ChartHeader.vue
@@ -184,6 +184,7 @@ export default {
     },
     dateTimeRangeChange (s, e, v) {
       this.chartTimeFilter = { startTime: s, endTime: e, dateRangeValue: v }
+      this.$emit('refresh', this.chartTimeFilter)
     },
     tableLimitChange () {
       this.$emit('tableChange')
diff --git a/src/views/charts/PanelChart.vue b/src/views/charts/PanelChart.vue
index ab52f340..b00cb8b4 100644
--- a/src/views/charts/PanelChart.vue
+++ b/src/views/charts/PanelChart.vue
@@ -165,13 +165,15 @@ export default {
   },
   methods: {
     /* 参数 extraParams 额外请求参数，isRefresh 是否是刷新 */
-    getChartData (url, extraParams = {}, isRefresh) {
+    getChartData (url, extraParams = {}, isRefresh, chartTimeFilter) {
       const vm = this
       this.loading = true
       this.standaloneTimeRange.use = !!isRefresh
       try {
         // 单个图表刷新时，使用单独的时间
-        if (this.standaloneTimeRange.use) {
+        if (chartTimeFilter) {
+          this.queryTimeRange = { startTime: getSecond(chartTimeFilter.startTime), endTime: getSecond(chartTimeFilter.endTime) }
+        } else if (this.standaloneTimeRange.use) {
           this.queryTimeRange = { startTime: getSecond(this.standaloneTimeRange.startTime), endTime: getSecond(this.standaloneTimeRange.endTime) }
         } else if (this.timeFilter) {
           this.queryTimeRange = { startTime: getSecond(this.timeFilter.startTime), endTime: getSecond(this.timeFilter.endTime) }
@@ -227,6 +229,12 @@ export default {
           })
         } else if (this.chartInfo.type === 94) {
           this.chartInfo.children = [...this.chartInfo.children]
+        } else if (this.chartInfo.type === 95) {
+          if (!this.chartInfo.firstShow) {
+            this.chartInfo.firstShow = true
+          } else {
+            this.$refs.chart.$refs.chart.reload()
+          }
         }
       } catch (e) {
         console.error(e)
@@ -253,14 +261,14 @@ export default {
     resize () {
       this.$refs.chart.resize()
     },
-    refresh () {
+    refresh (chartTimeFilter) {
       const myEndTime = window.$dayJs.tz().valueOf()
       const myStartTime = myEndTime - this.chartTimeFilter.dateRangeValue * 60 * 1000
       this.standaloneTimeRange.use = true
       this.standaloneTimeRange.startTime = myStartTime
       this.standaloneTimeRange.endTime = myEndTime
       this.emitter.emit('chart-pageNo')
-      this.getChartData(null, {}, true)
+      this.getChartData(null, {}, true, chartTimeFilter)
     },
     showFullscreen (show) {
       this.$emit('showFullscreen', show, this.chartInfo)
diff --git a/src/views/charts/charts/ChartBlock.vue b/src/views/charts/charts/ChartBlock.vue
index 2a7d4307..b5c38a5e 100644
--- a/src/views/charts/charts/ChartBlock.vue
+++ b/src/views/charts/charts/ChartBlock.vue
@@ -20,24 +20,21 @@ export default {
   data () {
     return {
       dataList: [],
+      time: {},
       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.time = JSON.parse(JSON.stringify(this.timeFilter))
     this.firstShow = true
+  },
+  methods: {
+    reload () {
+      console.log(123132)
+      this.dataList = JSON.parse(JSON.stringify(this.chartInfo.children))
+      // this.time = JSON.parse(JSON.stringify(this.timeFilter))
+    }
   }
 }
 </script>