From d8c9ff367bf456bf46ef5b15aab1311caefcd2bb Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Fri, 29 Apr 2022 10:02:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Ddns=20=E5=AE=9E?=
 =?UTF-8?q?=E6=97=B6=E5=91=8A=E8=AD=A6=E5=88=97=E8=A1=A8=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=86=85=E5=AE=B9=E9=94=99=E8=AF=AF=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/charts/Chart.vue                 |  9 ----
 src/views/charts/ChartHeader.vue           |  3 ++
 src/views/charts/charts/ChartAlarmInfo.vue | 54 ++++------------------
 3 files changed, 11 insertions(+), 55 deletions(-)

diff --git a/src/views/charts/Chart.vue b/src/views/charts/Chart.vue
index 9e85538e..12185357 100644
--- a/src/views/charts/Chart.vue
+++ b/src/views/charts/Chart.vue
@@ -380,7 +380,6 @@ export default {
   },
   data () {
     return {
-      tabHandleClickType: ''
     }
   },
   props: {
@@ -452,14 +451,6 @@ export default {
       this.$emit('query', params)
     }
   },
-  watch: {
-    tabHandleClickType: {
-      deep: true,
-      handler (n) {
-        this.tabHandleClickType = n
-      }
-    }
-  },
   setup (props) {
     return {
       isEcharts: isEcharts(props.chartInfo.type),
diff --git a/src/views/charts/ChartHeader.vue b/src/views/charts/ChartHeader.vue
index e8700a27..98542db4 100644
--- a/src/views/charts/ChartHeader.vue
+++ b/src/views/charts/ChartHeader.vue
@@ -311,6 +311,9 @@ export default {
   methods: {
     refresh () {
       this.$emit('refresh')
+      if (this.isAlarmInfo) {
+        this.tabHandleClick('All')
+      }
     },
     timeRefreshChange () {
       // 不是自选时间
diff --git a/src/views/charts/charts/ChartAlarmInfo.vue b/src/views/charts/charts/ChartAlarmInfo.vue
index fa799b2a..87580f51 100644
--- a/src/views/charts/charts/ChartAlarmInfo.vue
+++ b/src/views/charts/charts/ChartAlarmInfo.vue
@@ -13,16 +13,12 @@
               <div
                 class="icon-box__icon"
                 :style="{
-                  background: eventSeverityColor[value.eventSeverity],
-                  opacity: 0.1,
-                }"
+                  background: eventSeverityColor[value.eventSeverity], opacity: 0.1}"
               ></div>
               <i
                 class="cn-icon cn-icon-alert"
                 :style="{
-                  color: eventSeverityColor[value.eventSeverity],
-                  opacity: 1,
-                }"
+                  color: eventSeverityColor[value.eventSeverity], opacity: 1}"
               ></i>
             </div>
             <div class="content__text-box">
@@ -56,11 +52,7 @@
                     &nbsp; {{ $t(`dns.startTime`) }}:&nbsp;&nbsp;&nbsp;
                   </div>
                   <div>
-                    {{
-                      value.startTime
-                        ? dateFormatByAppearance(value.startTime)
-                        : '-'
-                    }}
+                    {{value.startTime ? dateFormatByAppearance(value.startTime) : '-'}}
                   </div>
                 </div>
                 &nbsp;&nbsp;&nbsp;
@@ -79,11 +71,7 @@
                   ></div>
                   &nbsp;&nbsp;&nbsp;
                   <div>
-                    {{
-                      unitConvert(value.endTime - value.startTime, 'time').join(
-                        ' ',
-                      )
-                    }}
+                    {{unitConvert(value.endTime - value.startTime, 'time').join(' ')}}
                   </div>
                 </div>
               </div>
@@ -105,11 +93,9 @@
 
 <script>
 import { eventSeverityColor } from '@/utils/constants'
-import _ from 'lodash'
 import unitConvert from '@/utils/unit-convert'
 import ChartTablePagination from '@/views/charts/charts/ChartTablePagination'
 import { get } from '@/utils/http'
-import { getMillisecond } from '@/utils/date-util'
 import { api } from '@/utils/api'
 
 export default {
@@ -126,21 +112,7 @@ export default {
       eventSeverityColor: eventSeverityColor,
       pageNo: 1,
       alarmInfoCount: {},
-      fromChartData: '',
-      isNoData: false
-      // result: [
-      //   {
-      //     entityType: 'ip',
-      //     serverIp: '1.2.3.41.2.3.41.2.3.41.2.3.41.2.3.41.2.3.4',
-      //     domain: '',
-      //     appName: 'wechat',
-      //     eventSeverity: 'high',
-      //     eventType: 'type',
-      //     startTime: 1111111111,
-      //     durationMs: 60000,
-      //     endTime: 1111111112,
-      //   },
-      // ],
+      fromChartData: ''
     }
   },
   computed: {
@@ -160,18 +132,6 @@ export default {
           this.getData(1, n)
         })
       }
-    },
-    alarmInfoCount: {
-      deep: true,
-      handler (n) {}
-    },
-    queryParams: {
-      deep: true,
-      handler (n) {
-        if (n.startTime && n.endTime) {
-          this.getCount(1)
-        }
-      }
     }
   },
   components: {
@@ -179,7 +139,6 @@ export default {
   },
   methods: {
     unitConvert,
-    getMillisecond,
     getCount () {
       const countQuery = {
         startTime: this.queryParams.startTime,
@@ -231,6 +190,9 @@ export default {
     pageJump (val) {
       this.getData(val)
     }
+  },
+  mounted () {
+    this.getCount()
   }
 }
 </script>