From e0e55ab9f3c85092dfe850e09c576e4c3fb27360 Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Fri, 10 Jun 2022 15:02:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=20=E5=AE=9E=E4=BD=93?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=20=E6=A3=80=E6=B5=8BNo=20data=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/table/report/reportTestTable.vue    | 2 +-
 src/views/charts/Chart.vue                         | 9 +++++++--
 src/views/charts/PanelChart.vue                    | 4 +---
 src/views/charts/PanelChartList.vue                | 3 ---
 src/views/charts/charts/ChartNoData.vue            | 2 +-
 src/views/charts/charts/chartDetectionSecurity.vue | 1 +
 src/views/charts/charts/chartDetectionService.vue  | 1 +
 7 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/components/table/report/reportTestTable.vue b/src/components/table/report/reportTestTable.vue
index 110fc935..b11f9347 100644
--- a/src/components/table/report/reportTestTable.vue
+++ b/src/components/table/report/reportTestTable.vue
@@ -30,7 +30,7 @@
             />
           </div>
           <div class="expand">
-            <chart-no-data v-if="downDataList.length === 0"></chart-no-data>
+            <chart-no-data v-if="downDataList.length === 0 && !loadingDown"></chart-no-data>
             <div class="expand-cell" v-for="(item, index) in downDataList" :key="index">
               <div class="expand-right">
                 <div class="demo-progress">
diff --git a/src/views/charts/Chart.vue b/src/views/charts/Chart.vue
index a735ac4b..4ff7b115 100644
--- a/src/views/charts/Chart.vue
+++ b/src/views/charts/Chart.vue
@@ -255,6 +255,7 @@
         :time-filter="timeFilter"
         :chart-info="chartInfo"
         :query-params="queryParams"
+        @chartDetection="chartDetection"
         v-else-if="isDetectionSecurity"
         @getDetectionData="getDetectionData"
       ></chart-detection-security>
@@ -264,6 +265,7 @@
         :time-filter="timeFilter"
         :chart-info="chartInfo"
         :query-params="queryParams"
+        @chartDetection="chartDetection"
         v-else-if="isDetectionService"
         @getDetectionData="getDetectionData"
       ></chart-detection-service>
@@ -381,6 +383,7 @@ export default {
   },
   data () {
     return {
+      activeTab: ''
     }
   },
   props: {
@@ -397,8 +400,7 @@ export default {
     table: Object,
     timeFilter: Object,
     orderPieTable: String,
-    tabHandleClickType: String,
-    activeTab: Number
+    tabHandleClickType: String
   },
   computed: {
     isNoData () {
@@ -451,6 +453,9 @@ export default {
     },
     query (params) {
       this.$emit('query', params)
+    },
+    chartDetection(type) {
+      this.activeTab = type
     }
   },
   setup (props) {
diff --git a/src/views/charts/PanelChart.vue b/src/views/charts/PanelChart.vue
index 3285964b..ddfd2a4a 100644
--- a/src/views/charts/PanelChart.vue
+++ b/src/views/charts/PanelChart.vue
@@ -36,7 +36,6 @@
         :loading="loading"
         :entity="entity"
         :table="table"
-        :active-tab="activeTab"
         :is-fullscreen="isFullscreen"
         :order-pie-table="orderPieTable"
         :time-filter="timeFilter"
@@ -103,8 +102,7 @@ export default {
     timeFilter: Object, // 时间范围
     isFullscreen: Boolean,
     panelLock: Boolean,
-    entity: Object,
-    activeTab: Number
+    entity: Object
   },
   data () {
     return {
diff --git a/src/views/charts/PanelChartList.vue b/src/views/charts/PanelChartList.vue
index 2cb09371..245431d6 100644
--- a/src/views/charts/PanelChartList.vue
+++ b/src/views/charts/PanelChartList.vue
@@ -32,7 +32,6 @@
             :chart-info="item"
             :time-filter="timeFilter"
             :entity="entity"
-            :active-tab="activeTab"
             @groupShow="groupShow"
             @showFullscreen="showFullscreen"
         ></panel-chart>
@@ -57,7 +56,6 @@
           :is-fullscreen="true"
           :panelLock="panelLock"
           :time-filter="timeFilter"
-          :active-tab="activeTab"
           @showFullscreen="showFullscreen"
       ></panel-chart>
     </el-dialog>
@@ -86,7 +84,6 @@ export default {
     panelLock: { type: Boolean, default: true },
     isGroup: Boolean,
     entity: Object,
-    activeTab: Number,
     dataList: Array // 看板中所有图表信息
   },
   data () {
diff --git a/src/views/charts/charts/ChartNoData.vue b/src/views/charts/charts/ChartNoData.vue
index 832dfd76..40806192 100644
--- a/src/views/charts/charts/ChartNoData.vue
+++ b/src/views/charts/charts/ChartNoData.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="!activeTab && activeTab !== 706 && activeTab !== 707" class="panel-chart__no-data">No data</div>
+  <div v-if="activeTab !== 709 && activeTab !== 710" class="panel-chart__no-data">No data</div>
   <div v-else class="panel-chart__no-data all-clear">
     <div class="no-recent-alerts">
       <i class="el-icon-circle-check"></i>
diff --git a/src/views/charts/charts/chartDetectionSecurity.vue b/src/views/charts/charts/chartDetectionSecurity.vue
index 925c39b0..5e8e586d 100644
--- a/src/views/charts/charts/chartDetectionSecurity.vue
+++ b/src/views/charts/charts/chartDetectionSecurity.vue
@@ -79,6 +79,7 @@ export default {
     }
   },
   mounted () {
+    this.$emit('chartDetection', this.chartInfo.type)
     this.securityCount()
   }
 }
diff --git a/src/views/charts/charts/chartDetectionService.vue b/src/views/charts/charts/chartDetectionService.vue
index 5d8d4196..51422816 100644
--- a/src/views/charts/charts/chartDetectionService.vue
+++ b/src/views/charts/charts/chartDetectionService.vue
@@ -77,6 +77,7 @@ export default {
     }
   },
   mounted () {
+    this.$emit('chartDetection', this.chartInfo.type)
     this.securityCount()
   }
 }