From 43f1e3544a6acc4bcd98f5e94c6db9dd5508b331 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 18 Apr 2023 15:15:48 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-2781=20fix=EF=BC=9AAlert=20Message=20?=
 =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E5=88=97=E8=A1=A8=20=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=B8=8D=E4=BC=9A=E5=8A=A8=E6=80=81=E5=8F=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/bottomBox/tabs/alertMessageTabNew.vue           | 5 +++--
 .../src/components/common/bottomBox/tabs/logBottomTab.vue  | 7 +++++--
 nezha-fronted/src/components/common/timePicker.vue         | 5 +++++
 nezha-fronted/src/components/page/alert/alertMessage.vue   | 5 +++--
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
index a88415ab0..61db89e40 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
@@ -19,7 +19,7 @@
         <el-select v-model="state" class="margin-r-10" size="small" value-key="value" :disabled="from === fromRoute.alertSilence" @change="getTableData" popper-class="right-box-select-top right-public-box-dropdown-top" style="width: 110px">
           <el-option v-for="item in stateOptions" :key="item.value" :label="$t(item.label)" :value="item.value"></el-option>
         </el-select>
-        <pick-time v-model="searchTimeHeader" :default-pick="10" :refresh-data-func="getTableData" :show-empty="true" :use-chart-unit="false" :use-refresh="false" :sign="sign"></pick-time>
+        <pick-time ref="pickTime" v-model="searchTimeHeader" :default-pick="10" :refresh-data-func="getTableData" :show-empty="true" :use-chart-unit="false" :use-refresh="false" :sign="sign"></pick-time>
       </template>
       <template v-slot>
         <alertMessageTable
@@ -630,7 +630,8 @@ export default {
       if (this.$refs.dataTable) {
         this.$refs.dataTable.$refs.dataTable.bodyWrapper.scrollTop = 0
       }
-      this.getTableData()
+      // this.getTableData()
+      this.$refs.pickTime && this.$refs.pickTime.$refs.timePicker.refresh()
     },
     fillProject (module) {
       this.$get('project', { id: module.projectId }).then(response => {
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
index 31a312c63..ce2e074db 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
@@ -13,7 +13,7 @@
   >
     <template v-slot:title><span :title="obj.name">{{obj.name}}</span></template>
     <template v-slot:top-tool-right>
-      <el-input v-model="matchContent" class="margin-r-10" placeholder="" size="small" @keyup.enter.native="queryLogData()">
+      <el-input v-model="matchContent" class="margin-r-10" placeholder="" size="small" @keyup.enter.native="dateChange()">
         <el-select slot="prepend" v-model="matchSymbol" class="symbol-select" size="small" style="width: 60px;">
           <el-option value="|=">
             <span style="font-family: Inter-Regular">|=</span>
@@ -28,7 +28,7 @@
             <span style="font-family: Inter-Regular">!~</span>
           </el-option>
         </el-select>
-        <button  slot="suffix" class="search-icon-btn"><i class="el-icon-search" @click="queryLogData()"></i></button>
+        <button  slot="suffix" class="search-icon-btn"><i class="el-icon-search" @click="dateChange()"></i></button>
       </el-input>
       <pick-time id="explore" ref="pickTime" v-model="filterTime" :refresh-data-func="queryLogData" :sign="sign" :use-chart-unit="false" :use-refresh="false">
         <template slot="added-text">{{$t('overall.query')}}</template>
@@ -114,6 +114,9 @@ export default {
         reader.readAsText(error.response.data)
       })
     },
+    dateChange () {
+      this.$refs.pickTime && this.$refs.pickTime.$refs.timePicker.refresh()
+    },
     queryLogData (limit = 100) { // log的chart和table是一个请求
       this.loading = true
       if (this.expressions.length > 0) {
diff --git a/nezha-fronted/src/components/common/timePicker.vue b/nezha-fronted/src/components/common/timePicker.vue
index b5e9230dc..9dab3e127 100644
--- a/nezha-fronted/src/components/common/timePicker.vue
+++ b/nezha-fronted/src/components/common/timePicker.vue
@@ -590,6 +590,10 @@ export default {
       } else {
         this.isPopoverDisabled = false
       }
+    },
+    refresh () {
+      this.setSearchTime(this.nowTimeType.type, this.nowTimeType.value, this.searchTime)
+      this.$emit('change', this.searchTime)
     }
   },
   watch: {
@@ -601,6 +605,7 @@ export default {
           if (showTime) {
             this.showTime = Object.assign({}, showTime)
             this.searchTime = this.$parent.searchTime
+            this.nowTimeType = this.showTime
           }
           if (this.showEmpty && this.defaultPick === 12) {
             this.searchTime = []
diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue
index 2c6a89da4..1a023a07d 100644
--- a/nezha-fronted/src/components/page/alert/alertMessage.vue
+++ b/nezha-fronted/src/components/page/alert/alertMessage.vue
@@ -18,7 +18,7 @@
         <button id="asset-filter" :class="[dataListLayout.indexOf('clickSearch') > -1?'is-focus':'' ]" class="top-tool-btn margin-r-10" @click.stop="showClickSearch" :title="$t('dashboard.panel.chartForm.filter')">
           <i class="nz-icon nz-icon-funnel"></i>
         </button>
-        <pick-time v-model="searchTime" sign="message" :default-pick="10" :refresh-data-func="getTableData" :show-empty="true" :use-chart-unit="false" :use-refresh="false"></pick-time>
+        <pick-time ref="pickTime" v-model="searchTime" sign="message" :default-pick="10" :refresh-data-func="getTableData" :show-empty="true" :use-chart-unit="false" :use-refresh="false"></pick-time>
         <button id="roles-add" v-has="'alertMessage_view'" :title="$t('overall.exportExcel')" class="top-tool-btn margin-r-10" type="button" @click="showExportDialog">
           <i class="nz-icon-download1 nz-icon"></i>
         </button>
@@ -1176,7 +1176,8 @@ export default {
       if (this.$refs.dataTable) {
         this.$refs.dataTable.$refs.dataTable.bodyWrapper.scrollTop = 0
       }
-      this.getTableData()
+      // this.getTableData()
+      this.$refs.pickTime && this.$refs.pickTime.$refs.timePicker.refresh()
     },
     computeDistance (str) {
       let width = 0