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

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

@@ -103,6 +103,7 @@
<chart-list
ref="chartList"
:variablesInit="variablesInit"
:timerInit="true"
name="dashboard"
:dashboardId="showPanel.id"
:class="{'show-top':showTopBtn, 'is-dashboard': true}"
@@ -1171,14 +1172,17 @@ export default {
})
},
setTimePickerRange () {
if (this.$route.query.searchTime) return
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(() => {
console.log(13123213,this.timePickerLocked, this.timePickerRange.nowTimeType)
if (this.$route.query.searchTime) return
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 () {
@@ -1203,10 +1207,12 @@ export default {
mode: { target: this, propertyName: 'mode', type: 'string' }
}
this.initQueryFromPath(searchKeys)
this.$store.dispatch('dispatchTimePickerRange', {
time: this.searchTime,
nowTimeType: this.nowTimeType
})
if (this.$route.query.searchTime) {
this.$store.dispatch('dispatchTimePickerRange', {
time: this.searchTime,
nowTimeType: this.nowTimeType
})
}
this.showPanel.id = this.dashboardId
this.filter.dashboardId = this.dashboardId
// 设置查看模式