From 49eb4d42cea59b3a6458c62aaa651dbb98702ac7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com>
Date: Fri, 28 Oct 2022 10:28:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=A7=A3=E5=86=B3timeRange=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E5=90=8E=E4=B8=8B=E9=92=BB=E8=BF=94=E5=9B=9E=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E8=A2=AB=E9=87=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/charts2/Panel.vue | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/views/charts2/Panel.vue b/src/views/charts2/Panel.vue
index 15ed118f..81a14366 100644
--- a/src/views/charts2/Panel.vue
+++ b/src/views/charts2/Panel.vue
@@ -168,18 +168,14 @@ export default {
     const panel = ref({})
     let panelType = 1 // 取得panel的type
     const { params, query, path } = useRoute()
-    // 下钻和返回都是在同一路由下进行，根据store存储的timeRange可避免下钻后返回被重置的情况，
-    // 切换其他界面时重置timeRange，避免影响其他界面使用timeRange
-    if (path === store.getters.getRouterPath) {
-      if (query.startTime === undefined && store.getters.getTimeRangeFlag !== null) {
-        // 为了避免下钻后返回timeRange被重置，以及timeRange被修改，返回时url没有更新
-        const newUrl = urlParamsHandler(window.location.href, query, {
-          startTime: store.getters.getTimeRangeArray[0],
-          endTime: store.getters.getTimeRangeArray[1],
-          range: store.getters.getTimeRangeFlag
-        })
-        overwriteUrl(newUrl)
-      }
+    // 只要当前路由和vuex里的路由一致，且vuex存储的range有值，即代表已经下钻后返回，此时直接使用vuex里存储的时间范围
+    if (path === store.getters.getRouterPath && store.getters.getTimeRangeFlag !== null) {
+      const newUrl = urlParamsHandler(window.location.href, query, {
+        startTime: store.getters.getTimeRangeArray[0],
+        endTime: store.getters.getTimeRangeArray[1],
+        range: store.getters.getTimeRangeFlag
+      })
+      overwriteUrl(newUrl)
     } else {
       store.commit('setTimeRangeArray', [])
       store.commit('setTimeRangeFlag', null)