From 51f6daaed1fe305d7ad66c34c404543eb92780bd Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Tue, 28 May 2024 10:00:00 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-3480=20fix:=20=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=20=E4=BA=8C=E7=BA=A7=E9=A1=B5=E9=9D=A2=E6=89=93?=
 =?UTF-8?q?=E5=BC=80=20=E5=88=87=E6=8D=A2tab=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/bottomBox/tabs/alertMessageTabNew.vue          | 8 ++++----
 nezha-fronted/src/components/common/table/nzDataList.vue  | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
index 4ff4c55af..a6cbc03fe 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
@@ -296,7 +296,7 @@ export default {
       sameLabels: ['instance', 'module', 'project', 'asset', 'endpoint', 'datacenter'],
       legend: [],
       searchTime: [],
-      searchTimeHeader: [bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())).setHours(new Date(bus.computeTimezone(new Date().getTime())).getHours() - 24 * 7)), bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime()))), '7d'],
+      searchTimeHeader: [bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())).setHours(new Date(bus.computeTimezone(new Date().getTime())).getHours() - 1)), bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime()))), '1h'],
       searchTimeSelect: bus.getTimezontDateRange(),
       currentMsg: {},
       chartUnit: 5,
@@ -311,9 +311,9 @@ export default {
       isError: false,
       errorContent: '',
       chartInfo: {},
-      defaultPick: 10,
-      defaultPickType: 'date',
-      defaultPickVal: 7
+      defaultPick: 4,
+      defaultPickType: 'hour',
+      defaultPickVal: 1
     }
   },
   created () {
diff --git a/nezha-fronted/src/components/common/table/nzDataList.vue b/nezha-fronted/src/components/common/table/nzDataList.vue
index 3cc447042..e65a774a8 100644
--- a/nezha-fronted/src/components/common/table/nzDataList.vue
+++ b/nezha-fronted/src/components/common/table/nzDataList.vue
@@ -287,9 +287,9 @@ export default {
     },
     showBottomBox (targetTab, row) {
       this.sign = row.id
-      if (!this.bottomBox.showSubList) {
-        this.bottomBox.targetTab = targetTab
-      }
+      // if (!this.bottomBox.showSubList) {
+      this.bottomBox.targetTab = targetTab
+      // }
       this.bottomBox.object = JSON.parse(JSON.stringify(row))
       this.bottomBox.showSubList = true
     },