From 9846275b7c4eb3865c39ac65a868df853db0cd68 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, 13 Oct 2022 09:47:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3refreshTime=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E5=85=B6=E4=BB=96=E5=80=BC=EF=BC=8C=E4=B8=8B=E9=92=BB?=
 =?UTF-8?q?=E5=90=8E=E8=BF=94=E5=9B=9E=EF=BC=8C=E4=BB=8D=E4=B8=BA=E4=B8=8B?=
 =?UTF-8?q?=E9=92=BB=E5=89=8D=E6=9C=AA=E4=BF=AE=E6=94=B9=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/TimeRange/TimeRefresh.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/common/TimeRange/TimeRefresh.vue b/src/components/common/TimeRange/TimeRefresh.vue
index 301f2d7b..d8bb5e6b 100644
--- a/src/components/common/TimeRange/TimeRefresh.vue
+++ b/src/components/common/TimeRange/TimeRefresh.vue
@@ -72,11 +72,12 @@ export default {
     const refreshTime = store.state.panel.refreshTime
 
     if (refreshFlag) {
-      if (query.refreshTime !== undefined) {
-        refreshObj = refreshArr.find(item => item.value === Number(query.refreshTime))
-      } else if (refreshTime !== null) {
+      if (refreshTime !== null) {
         // 此处是避免下钻后浏览器返回，获取不到url的refreshTime情况
+        // 以及重新加载后改变时间但url回退仍保留上次数据的情况
         refreshObj = refreshArr.find(item => item.value === refreshTime)
+      } else if (query.refreshTime !== undefined) {
+        refreshObj = refreshArr.find(item => item.value === Number(query.refreshTime))
       }
     } else {
       // 浏览器回退时，清除掉地址栏的refreshTime