Merge branch 'dev-3.10' of git.mesalab.cn:nezha/nezha-fronted into dev-3.11

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))
+          ]
         }
       }
     }

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)

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')