From 364c9a44587911abc4a76a16ba4fd01576cab7d0 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Thu, 28 Apr 2022 22:51:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9B=BE=E8=A1=A8bloc?=
 =?UTF-8?q?k=E5=88=B7=E6=96=B0=E6=8C=89=E9=92=AE=E6=97=A0=E6=95=88?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../css/components/views/charts/panel.scss     |  3 +++
 src/views/charts/Chart.vue                     |  2 +-
 src/views/charts/ChartHeader.vue               |  2 +-
 src/views/charts/PanelChart.vue                |  8 +++++---
 src/views/charts/charts/ChartBlock.vue         | 18 +++++++-----------
 .../charts/charts/ChartEchartWithTable.vue     |  2 +-
 6 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/assets/css/components/views/charts/panel.scss b/src/assets/css/components/views/charts/panel.scss
index e33fc351..3b2e7c20 100644
--- a/src/assets/css/components/views/charts/panel.scss
+++ b/src/assets/css/components/views/charts/panel.scss
@@ -103,6 +103,9 @@
             justify-content: space-between;
             align-items: center;
 
+            .panel__time {
+              top: 7px;
+            }
             .header__operation-btn {
               margin-left: 12px;
               cursor: pointer;
diff --git a/src/views/charts/Chart.vue b/src/views/charts/Chart.vue
index 9e85538e..d1b35c69 100644
--- a/src/views/charts/Chart.vue
+++ b/src/views/charts/Chart.vue
@@ -396,7 +396,7 @@ export default {
     isError: Boolean,
     table: Object,
     timeFilter: Object,
-    orderPieTable: Object,
+    orderPieTable: String,
     tabHandleClickType: String
   },
   computed: {
diff --git a/src/views/charts/ChartHeader.vue b/src/views/charts/ChartHeader.vue
index e8700a27..fc676aa3 100644
--- a/src/views/charts/ChartHeader.vue
+++ b/src/views/charts/ChartHeader.vue
@@ -264,7 +264,7 @@ export default {
       default: false
     },
     table: Object,
-    orderPieTable: Object
+    orderPieTable: String
   },
   components: {
     ChartError
diff --git a/src/views/charts/PanelChart.vue b/src/views/charts/PanelChart.vue
index 9b0ad94e..ad0005f6 100644
--- a/src/views/charts/PanelChart.vue
+++ b/src/views/charts/PanelChart.vue
@@ -266,12 +266,14 @@ export default {
             this.loading = false
           })
         } else if (this.isGroup || this.isTabs) {
-          this.$refs.chart.$refs.chart.reload()
+          this.$refs.chart && this.$refs.chart.$refs.chart && this.$refs.chart.$refs.chart.reload()
         } else if (this.isBlock) {
           if (!this.chartInfo.firstShow) {
             this.chartInfo.firstShow = true
           } else {
-            this.$refs.chart.$refs.chart.reload()
+            if (this.$refs.chart && this.$refs.chart.$refs.chart) {
+              this.$refs.chart.$refs.chart.reload()
+            }
           }
         }
       } catch (e) {
@@ -400,7 +402,7 @@ export default {
     const dateRangeValue = 60
     const { startTime, endTime } = getNowTime(dateRangeValue)
     const chartTimeFilter = ref({ startTime, endTime, dateRangeValue })
-    const table = ref('')
+    const table = ref({})
     if (isBasicTable(props.chartInfo.type)) {
       table.value = {
         pageSize: chartTableDefaultPageSize,
diff --git a/src/views/charts/charts/ChartBlock.vue b/src/views/charts/charts/ChartBlock.vue
index 27afd319..280d93bc 100644
--- a/src/views/charts/charts/ChartBlock.vue
+++ b/src/views/charts/charts/ChartBlock.vue
@@ -11,22 +11,18 @@
 <script>
 import chartMixin from '@/views/charts/charts/chart-mixin'
 import _ from 'lodash'
+import { ref } from 'vue'
 
 export default {
   name: 'ChartBlock',
   mixins: [chartMixin],
-  data () {
-    return {
-      time: {},
-      firstShow: false
-    }
-  },
-  mounted () {
-    this.firstShow = true
-  },
   methods: {
     reload () {
-      this.dataList = _.cloneDeep(this.dataList)
+      const t = _.cloneDeep(this.dataList)
+      this.dataList = []
+      this.$nextTick(() => {
+        this.dataList = t
+      })
     }
   },
   setup (props) {
@@ -36,7 +32,7 @@ export default {
         return data1.x - data2.x
       })
     }
-    const dataList = copyAndSort(props.chartInfo.children)
+    const dataList = ref(copyAndSort(props.chartInfo.children))
     return {
       copyAndSort,
       dataList
diff --git a/src/views/charts/charts/ChartEchartWithTable.vue b/src/views/charts/charts/ChartEchartWithTable.vue
index 8eed856c..15ecb881 100644
--- a/src/views/charts/charts/ChartEchartWithTable.vue
+++ b/src/views/charts/charts/ChartEchartWithTable.vue
@@ -30,7 +30,7 @@ export default {
   props: {
     resultType: Object,
     queryParams: Object,
-    orderPieTable: Object
+    orderPieTable: String
   },
   components: {
     PieTable