From 0e63e1325951ea7965ec58babd1b9155144d1041 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 14 Jul 2021 10:39:44 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-825=20fix=EF=BC=9B=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E5=91=8A=E8=AD=A6=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=20=E5=88=86=E9=A1=B5=E6=8C=89=E9=92=AE=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E6=9F=A5=E8=AF=A2=E6=97=A0=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bottomBox/tabs/alertMessageTabNew.vue     | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
index 1eb4e7761..53359a61a 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
@@ -17,6 +17,7 @@
         <el-select v-model="state" class="margin-r-10" size="small" value-key="value" @change="getTableData">
           <el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
         </el-select>
+        <pick-time v-model="searchTimeHeader" :default-pick="12" :refresh-data-func="getTableData" :show-empty="true" :use-chart-unit="false" :use-refresh="false"></pick-time>
       </template>
       <template v-slot>
         <alertMessageTable
@@ -44,6 +45,7 @@
     </nz-bottom-data-list>
     <el-dialog id="viewGraphDialog"
                :modal-append-to-body='false'
+               destroy-on-close
                :title="$t('overall.detail')"
                :visible.sync="graphShow"
                class="line-chart-block-modal nz-dialog endpoint-dialog"
@@ -169,6 +171,7 @@ export default {
       sameLabels: ['instance', 'module', 'project', 'asset', 'endpoint', 'datacenter'],
       legend: [],
       searchTime: [],
+      searchTimeHeader: [],
       searchTimeSelect: bus.getTimezontDateRange(),
       currentMsg: {},
       chartUnit: 5,
@@ -201,10 +204,10 @@ export default {
     },
     queryChartDate () {
       const $temp = this
-      // const start = this.searchTime[0] ? this.searchTime[0] : getTime(-1, 'h')
-      // const end = this.searchTime[1] ? this.searchTime[1] : getTime(0, 'h')
-      const start = this.currentMsg.startAt
-      const end = this.currentMsg.endAt
+      const start = this.searchTime[0] ? this.searchTime[0] : getTime(-1, 'h')
+      const end = this.searchTime[1] ? this.searchTime[1] : getTime(0, 'h')
+      // const start = this.currentMsg.startAt
+      // const end = this.currentMsg.endAt
       this.searchTime = [start, end]
       const timeDiff = (new Date(end).getTime() - new Date(start).getTime()) / 1000 / (24 * 60 * 60)
       let step = '15s'
@@ -333,9 +336,9 @@ export default {
       this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo)
       this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize)
       this.$set(this.searchLabel, 'state', this.state)
-      if (this.searchTime && this.searchTime.length > 1) {
-        this.$set(this.searchLabel, 'startAt', this.timezoneToUtcTimeStr(this.searchTime[0]))
-        this.$set(this.searchLabel, 'endAt', this.timezoneToUtcTimeStr(this.searchTime[1]))
+      if (this.searchTimeHeader && this.searchTimeHeader.length > 1) {
+        this.$set(this.searchLabel, 'startAt', this.timezoneToUtcTimeStr(this.searchTimeHeader[0]))
+        this.$set(this.searchLabel, 'endAt', this.timezoneToUtcTimeStr(this.searchTimeHeader[1]))
       } else {
         delete this.searchLabel.startAt
         delete this.searchLabel.endAt
@@ -366,7 +369,8 @@ export default {
         }
       })
     },
-    promQueryParamConvert (obj) {
+    promQueryParamConvert (alert) {
+      const obj = { ...alert }
       let r = '(' + obj.alertRule.expr.replace(/\"/g, '\'') + ')'
       let intoLabels = false
       obj.labels = JSON.parse(obj.labels)
@@ -425,6 +429,7 @@ export default {
         this.currentMsg = { ...row, alertRule: { ...res.data } }
         this.graphShow = true
         this.$nextTick(() => {
+          this.searchTime = [bus.computeTimezoneTime(new Date().getTime() - 1 * 30 * 60 * 1000), bus.computeTimezoneTime(new Date().getTime())]
           this.queryChartDate()
         })
       })