diff --git a/nezha-fronted/src/components/chart/chart/chartStat.vue b/nezha-fronted/src/components/chart/chart/chartStat.vue index f6c30f835..52cbaa08d 100644 --- a/nezha-fronted/src/components/chart/chart/chartStat.vue +++ b/nezha-fronted/src/components/chart/chart/chartStat.vue @@ -151,8 +151,8 @@ export default { this.tooltip.show = false }, getLayout () { - this.boxWidth = this.$refs['chart-stat-box'].offsetWidth - 2 * this.boxPadding - this.boxHeight = this.$refs['chart-stat-box'].offsetHeight - 2 * this.boxPadding + this.boxWidth = this.$refs['chart-stat-box'].offsetWidth - 3 * this.boxPadding + this.boxHeight = this.$refs['chart-stat-box'].offsetHeight - 3 * this.boxPadding return new Promise(resolve => { let rateMax = 0 let col = 0 diff --git a/nezha-fronted/src/components/chart/chartList.vue b/nezha-fronted/src/components/chart/chartList.vue index b2907d223..4be18f26b 100644 --- a/nezha-fronted/src/components/chart/chartList.vue +++ b/nezha-fronted/src/components/chart/chartList.vue @@ -347,9 +347,6 @@ export default { this.$store.commit('setChartListId', `chartList${this.timestamp}`) } }, - beforeDestroy () { - this.$store.dispatch('dispatchPanelLock', { flag: true }) - }, watch: { dataList: { deep: true, diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue index a1e586b8d..d726ba560 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue @@ -778,6 +778,7 @@ export default { document.querySelector('#tableList') && document.querySelector('#tableList').removeEventListener('mouseenter', this.tableListEnter) document.querySelector('#tableList') && document.querySelector('#tableList').removeEventListener('mouseleave', this.tableListLeave) this.scrollbarWrap && this.scrollbarWrap.removeEventListener('scroll', bus.debounce) + this.$store.dispatch('dispatchPanelLock', { flag: true }) } } diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue index 001721812..6c09d0c50 100644 --- a/nezha-fronted/src/components/page/dashboard/panel.vue +++ b/nezha-fronted/src/components/page/dashboard/panel.vue @@ -527,6 +527,7 @@ export default { createSuccess (msg, data, params, panel) { this.filter.panelId = this.showPanel.id this.getData(this.filter) + this.$store.dispatch('clearPanel') }, // 获取数据,用在子页面 getData (params) { @@ -866,6 +867,9 @@ export default { }, 100) } }, + beforeDestroy () { + this.$store.dispatch('dispatchPanelLock', { flag: true }) + }, watch: { 'filter.searchName': function (n, o) { const temp = this