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

NEZ-3006 fix：Explorer保存图表 preview 时间选择器出现invalid date

Browse Source
This commit is contained in:
zhangyu
2023-07-21 11:59:28 +08:00
parent f85c7a61ed
commit b8746e9459
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

@@ -205,8 +205,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

@@ -865,10 +865,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 () {

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

@@ -1154,15 +1154,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()
@@ -1236,12 +1235,14 @@ export default {
watch: { watch: {
showPanel: { showPanel: {
handler () { handler () {
if (this.timePickerLocked && this.timePickerRange && this.timePickerRange.nowTimeType) { this.$nextTick(() => {
this.setTimePickerRange() if (this.timePickerLocked && this.timePickerRange && this.timePickerRange.nowTimeType) {
} else { this.setTimePickerRange()
this.setDefaultTimeRange() } else {
} this.setDefaultTimeRange()
this.setDefaultRefresh() }
this.setDefaultRefresh()
})
} }
}, },
// 监听图表联动配置 // 监听图表联动配置