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-20 18:04:05 +08:00
parent 2dddcd6ad9 e2652c9dc6
commit adbd03525a
7 changed files with 53 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -618,6 +618,10 @@ export default {
this.$set(this.searchTime, 2, val + 'd')
}
this.$refs.pickTime.$refs.timePicker.searchTime = this.searchTime
this.$store.dispatch('dispatchPanelTime', {
time: this.searchTime,
nowTimeType: this.nowTimeType
})
},
getVarType (from) {
if (from === this.fromRoute.asset) {
@@ -878,13 +882,15 @@ export default {
})
},
setTimePickerRange () {
if (!this.timePickerLocked || !this.timePickerRange.nowTimeType) {
this.setDefaultTimeRange()
}
const nowTimeType = this.nowTimeType = this.timePickerRange.nowTimeType
this.searchTime = this.timePickerRange.time
this.$refs.pickTime.$refs.timePicker.setTimeRange(this.nowTimeType, this.searchTime)
this.setSearchTime(nowTimeType.type, nowTimeType.value, nowTimeType)
this.$nextTick(() => {
if (!this.timePickerLocked || !this.timePickerRange.nowTimeType) {
this.setDefaultTimeRange()
}
const nowTimeType = this.nowTimeType = this.timePickerRange.nowTimeType
this.searchTime = this.timePickerRange.time
this.$refs.pickTime && this.$refs.pickTime.$refs.timePicker.setTimeRange(this.nowTimeType, this.searchTime)
this.setSearchTime(nowTimeType.type, nowTimeType.value, nowTimeType)
})
},
// 设置默认刷新
setDefaultRefresh () {