diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
index 506b8af90..623492643 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 @@
-
+
{
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 @@
>
{{obj.name}}
-
+
|=
@@ -28,7 +28,7 @@
!~
-
+
{{$t('overall.query')}}
@@ -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 11eedcede..420dff20a 100644
--- a/nezha-fronted/src/components/common/timePicker.vue
+++ b/nezha-fronted/src/components/common/timePicker.vue
@@ -599,6 +599,10 @@ export default {
} else {
this.isPopoverDisabled = false
}
+ },
+ refresh () {
+ this.setSearchTime(this.nowTimeType.type, this.nowTimeType.value, this.searchTime)
+ this.$emit('change', this.searchTime)
}
},
watch: {
@@ -610,6 +614,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 0a1ec7f2c..af0ae61cb 100644
--- a/nezha-fronted/src/components/page/alert/alertMessage.vue
+++ b/nezha-fronted/src/components/page/alert/alertMessage.vue
@@ -18,8 +18,8 @@
-
-