From e019f8a02e29d094c4f50267d908b5038eeff2be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com>
Date: Thu, 27 Oct 2022 16:32:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20timeRange=E6=B7=BB=E5=8A=A0=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/panel.js  | 2 +-
 src/views/charts2/Panel.vue | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/store/modules/panel.js b/src/store/modules/panel.js
index feac4dd6..e534890c 100644
--- a/src/store/modules/panel.js
+++ b/src/store/modules/panel.js
@@ -53,7 +53,7 @@ const panel = {
     refreshTime: null, // 自动刷新时间的秒数
     refreshFlag: true, // 关闭自动刷新标志，true为off，false即开启自动刷新
     timeRangeArray: [], // 时间范围列表：开始/结束时间
-    timeRangeFlag: 60, // 时间范围标志，默认60即一小时，-1为手动选择的时间范围
+    timeRangeFlag: null, // 时间范围标志，默认60即一小时，-1为手动选择的时间范围
     routerPath: '', // 当前路由路径
     httpCancel: null // 终止http请求
   },
diff --git a/src/views/charts2/Panel.vue b/src/views/charts2/Panel.vue
index 0e962b1b..15ed118f 100644
--- a/src/views/charts2/Panel.vue
+++ b/src/views/charts2/Panel.vue
@@ -168,9 +168,11 @@ 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被重置，以及timeRange被修改，返回时url没有更新
         const newUrl = urlParamsHandler(window.location.href, query, {
           startTime: store.getters.getTimeRangeArray[0],
           endTime: store.getters.getTimeRangeArray[1],