Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8

This commit is contained in:
zhangyu
2023-07-21 13:35:51 +08:00
3 changed files with 18 additions and 17 deletions

View File

@@ -1168,15 +1168,14 @@ export default {
time: this.searchTime,
nowTimeType: this.nowTimeType
})
this.$store.dispatch('dispatchTimePickerRange', {
time: this.searchTime,
nowTimeType: this.nowTimeType
})
// this.$store.dispatch('dispatchTimePickerRange', {
// time: this.searchTime,
// nowTimeType: this.nowTimeType
// })
})
},
setTimePickerRange () {
this.$nextTick(() => {
console.log(13123213,this.timePickerLocked, this.timePickerRange.nowTimeType)
if (this.$route.query.searchTime) return
if (!this.timePickerLocked || !this.timePickerRange.nowTimeType) {
this.setDefaultTimeRange()
@@ -1250,12 +1249,14 @@ export default {
watch: {
showPanel: {
handler () {
if (this.timePickerLocked && this.timePickerRange && this.timePickerRange.nowTimeType) {
this.setTimePickerRange()
} else {
this.setDefaultTimeRange()
}
this.setDefaultRefresh()
this.$nextTick(() => {
if (this.timePickerLocked && this.timePickerRange && this.timePickerRange.nowTimeType) {
this.setTimePickerRange()
} else {
this.setDefaultTimeRange()
}
this.setDefaultRefresh()
})
}
},
// 监听图表联动配置