From 5d122f7707e68ac22bc2dfe27bf14b088cc53f46 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Thu, 20 Jul 2023 15:45:54 +0800 Subject: [PATCH] =?UTF-8?q?NEZ-3004=20fix=EF=BC=9Adashboard=20explore=20?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=20=E4=B8=8B=E5=BC=B9=E7=AA=97=E7=9A=84=20das?= =?UTF-8?q?hboard=20=E9=94=81=E5=AE=9A=E5=90=8E=20=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/chart/chartTimeSeries.vue | 2 +- .../src/components/common/timePicker.vue | 23 +++++++++++++++++-- .../src/components/layout/leftMenu.vue | 2 +- .../page/dashboard/explore/exploreItem.vue | 19 ++++++++++++++- nezha-fronted/src/store/timePicker.js | 3 ++- 5 files changed, 43 insertions(+), 6 deletions(-) diff --git a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue index 1eac4e2d5..10f66cf63 100644 --- a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue +++ b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue @@ -307,7 +307,7 @@ export default { } else { str += [month, day].join('-') } - if (diffSec <= secOneDay) { // 同一天 + if (diffSec <= secOneDay - 100) { // 同一天 return [hour, minute].join(':') } else if (diffSec < secOneMonth) { // 大于1天，小于30天 return str + '\n' + [hour, minute].join(':') diff --git a/nezha-fronted/src/components/common/timePicker.vue b/nezha-fronted/src/components/common/timePicker.vue index 66d49e899..d30a35688 100644 --- a/nezha-fronted/src/components/common/timePicker.vue +++ b/nezha-fronted/src/components/common/timePicker.vue @@ -26,7 +26,13 @@
- +
@@ -153,7 +159,7 @@ export default { type: String }, sign: [Number, String], - showLocked: { type: Boolean, default: false }, + showLocked: { type: Boolean, default: false } }, data () { return { @@ -210,6 +216,9 @@ export default { computed: { timeBoxClass () { return this.$store.getters.getTimeBoxClass + }, + nztimePickerLocked () { + return this.$store.getters.getTimePickerLocked } }, mounted () { @@ -334,6 +343,13 @@ export default { this.timePickerLocked = !this.timePickerLocked localStorage.setItem('nz-time-picker-locked', JSON.stringify(this.timePickerLocked)) this.$store.dispatch('dispatchTimePickerLocked', this.timePickerLocked) + if (this.timePickerLocked) { + console.log(this.searchTime, this.nowTimeType) + this.$store.dispatch('dispatchTimePickerRange', { + time: this.searchTime, + nowTimeType: this.nowTimeType + }) + } }, dateInputChange (type, v) { const timeFormatMain = localStorage.getItem('nz-default-dateFormat') ? localStorage.getItem('nz-default-dateFormat') : 'YYYY-MM-DD HH:mm:ss' @@ -587,6 +603,9 @@ export default { this.getRangeHistoryArr() } } + }, + nztimePickerLocked (n) { + this.timePickerLocked = n } }, beforeDestroy () { diff --git a/nezha-fronted/src/components/layout/leftMenu.vue b/nezha-fronted/src/components/layout/leftMenu.vue index ece0f66ed..992225e88 100644 --- a/nezha-fronted/src/components/layout/leftMenu.vue +++ b/nezha-fronted/src/components/layout/leftMenu.vue @@ -103,7 +103,7 @@ export default { this.$store.commit('isShrink') }, jump (route) { - this.$store.commit('setTimePickerRange', []) // 切换路由时清空已选择的时间 + // this.$store.commit('setTimePickerRange', []) // 切换路由时清空已选择的时间 if (route === this.route) { this.refresh() } diff --git a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue index c289c1ec0..36ecd5d95 100644 --- a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue +++ b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue @@ -28,7 +28,7 @@
- + @@ -3563,6 +3563,7 @@ export default { mounted () { this.scrollbarWrap = this.$refs.exploreScrollbar this.scrollbarWrap.addEventListener('scroll', this.onScroll) + this.setTimePickerRange() this.initQueryFromPath() }, beforeDestroy () { @@ -3588,6 +3589,16 @@ export default { const dom = document.getElementsByClassName('nz-explore-' + this.tabIndex)[0] dom.querySelector(id).scrollIntoView(true) }, + setTimePickerRange () { + console.log(this.timePickerLocked, !this.timePickerRange.nowTimeType) + if (!this.timePickerLocked || !this.timePickerRange.nowTimeType) { + return + } + const nowTimeType = this.nowTimeType = this.timePickerRange.nowTimeType + this.filterTime = this.timePickerRange.time + this.$refs.pickTime.$refs.timePicker.setTimeRange(this.nowTimeType, this.filterTime) + this.setSearchTime(nowTimeType.type, nowTimeType.value, nowTimeType) + }, selectMetricsLogs (val, icon, label) { if (val) { this.selectIcon = icon @@ -4408,6 +4419,12 @@ export default { const exploreItems = this.$parent.exploreItems const tabIndex = exploreItems.indexOf(this.tabIndex) return tabIndex ? 'right' : 'left' + }, + timePickerLocked () { + return this.$store.getters.getTimePickerLocked + }, + timePickerRange () { + return this.$store.getters.getTimePickerRange } }, watch: { diff --git a/nezha-fronted/src/store/timePicker.js b/nezha-fronted/src/store/timePicker.js index ddad7642c..9dcc8cfbd 100644 --- a/nezha-fronted/src/store/timePicker.js +++ b/nezha-fronted/src/store/timePicker.js @@ -1,7 +1,7 @@ const timePicker = { state: { timePickerLocked: localStorage.getItem('nz-time-picker-locked') ? JSON.parse(localStorage.getItem('nz-time-picker-locked')) : false, - timePickerRange: {} + timePickerRange: localStorage.getItem('nz-time-picker-range') ? JSON.parse(localStorage.getItem('nz-time-picker-range')) : {}, }, mutations: { setTimePickerLocked (state, flag) { @@ -9,6 +9,7 @@ const timePicker = { }, setTimePickerRange (state, range) { state.timePickerRange = range + localStorage.setItem('nz-time-picker-range', JSON.stringify(range)) } }, getters: {