From 1507c00d5363f0d4dd90be7d164eefcb57e7bba0 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Wed, 23 Aug 2023 09:57:52 +0800 Subject: [PATCH] =?UTF-8?q?NEZ-3107=20fix=EF=BC=9AMessages=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E6=9F=A5=E8=AF=A2All=20time=EF=BC=8C?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detailView/list/terminalLogDetail/terminalLogDetail.vue | 4 ++-- nezha-fronted/src/components/common/timePicker.vue | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/nezha-fronted/src/components/common/detailView/list/terminalLogDetail/terminalLogDetail.vue b/nezha-fronted/src/components/common/detailView/list/terminalLogDetail/terminalLogDetail.vue index 6546c6d4f..0fd7301ce 100644 --- a/nezha-fronted/src/components/common/detailView/list/terminalLogDetail/terminalLogDetail.vue +++ b/nezha-fronted/src/components/common/detailView/list/terminalLogDetail/terminalLogDetail.vue @@ -27,8 +27,8 @@ @mouseenter="labelHover(item, 'other', true, false, $event)" @mouseleave="labelHover(item, 'other', false, false,)" > -
-
+
+
{{$t(getStatusText(item.status))}} diff --git a/nezha-fronted/src/components/common/timePicker.vue b/nezha-fronted/src/components/common/timePicker.vue index 347dd4575..4b83253d0 100644 --- a/nezha-fronted/src/components/common/timePicker.vue +++ b/nezha-fronted/src/components/common/timePicker.vue @@ -564,6 +564,9 @@ export default { this.$set(this.searchTime, 2, val + 'd') } else { this.isCustom = true + if (!time[0]) { + this.isCustom = false + } this.$set(this.searchTime, 0, time[0]) this.$set(this.searchTime, 1, time[1]) }