gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zhangyu
2023-07-21 13:35:51 +08:00
parent 27c28a6122 b8746e9459
commit 5e7b658551
3 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nezha-fronted/src/components/chart/ChartScreenHeader.vue
View File

@@ -207,8 +207,8 @@ export default {
this.$refs.pickTime.$refs.timePicker.setCustomTime(this.nowType) this.$refs.pickTime.$refs.timePicker.setCustomTime(this.nowType)
this.setSearchTime(this.nowType.type, this.nowType.value, this.nowType) this.setSearchTime(this.nowType.type, this.nowType.value, this.nowType)
} else { } else {
this.$refs.pickTime.$refs.timePicker.setCustomTime(this.nowTimeType) this.$refs.pickTime.$refs.timePicker.setCustomTime(this.nowType)
this.setSearchTime(this.nowType.type, this.nowType.value, this.nowTimeType) this.setSearchTime(this.nowType.type, this.nowType.value, this.nowType)
} }
} }
} }

8
nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue
View File

@@ -875,10 +875,10 @@ export default {
time: this.searchTime, time: this.searchTime,
nowTimeType: this.nowTimeType nowTimeType: this.nowTimeType
}) })
this.$store.dispatch('dispatchTimePickerRange', { // this.$store.dispatch('dispatchTimePickerRange', {
time: this.searchTime, // time: this.searchTime,
nowTimeType: this.nowTimeType // nowTimeType: this.nowTimeType
}) // })
}) })
}, },
setTimePickerRange () { setTimePickerRange () {

11
nezha-fronted/src/components/page/dashboard/dashboard.vue
View File

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