diff --git a/nezha-fronted/src/assets/css/components/common/bottomBox/dashboardTab.scss b/nezha-fronted/src/assets/css/components/common/bottomBox/dashboardTab.scss index a22fae581..1a9b3a710 100644 --- a/nezha-fronted/src/assets/css/components/common/bottomBox/dashboardTab.scss +++ b/nezha-fronted/src/assets/css/components/common/bottomBox/dashboardTab.scss @@ -71,7 +71,6 @@ .table-list { overflow-y: auto; height: 100%; - padding: 20px 0; box-sizing: border-box; } diff --git a/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue b/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue index fb1a04416..68c97c18f 100644 --- a/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue +++ b/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue @@ -70,6 +70,7 @@ import alertDetail from '@/components/common/alert/alertDetail' import dashboard from '@/components/page/integration/integration-tabs/dashboard' import { fromRoute } from '@/components/common/js/constants' import snapshotProgress from '@/components/common/snapshotProgress/snapshotProgress.vue' +import bus from '@/libs/bus' // import alertLabelMixin from '@/components/common/mixin/alertLabelMixin' export default { name: 'alertMessageInfoTab', @@ -185,7 +186,10 @@ export default { immediate: true, handler (n) { if (n && n.length) { - this.timeRange = [this.timeFormate(n[0] * 1000), this.timeFormate(n[1] * 1000)] + this.timeRange = this.timeRange = [ + bus.timeFormate(bus.computeTimezone(n[0] * 1000)), + bus.timeFormate(bus.computeTimezone(n[1] * 1000)) + ] } } } diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue index 128581bd2..852a189b7 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue @@ -89,7 +89,7 @@ -
+
diff --git a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js index 1c910a890..07b6dac7d 100644 --- a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js +++ b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js @@ -394,7 +394,7 @@ export default { boxHeight = null }) this.position.show = true - setTimeout(()=>{ + setTimeout(() => { if (this.$refs.meta2dTooltip && this.$refs.meta2dTooltip.$refs.panelChart) { this.$refs.meta2dTooltip.$refs.panelChart.loading = false // console.log(this.chartParams) diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue index a079493d5..bed6468db 100644 --- a/nezha-fronted/src/components/page/alert/alertMessage.vue +++ b/nezha-fronted/src/components/page/alert/alertMessage.vue @@ -1309,6 +1309,10 @@ export default { }, beforeDestroy () { clearTimeout(this.timer) + this.$store.dispatch('dispatchPanelTime', { + time: [], + nowTimeType: {} + }) }, destroyed () { localStorage.removeItem('alertMessageProjectId')