From 83a33be298f3d87c75703a2deff3a15a5fe88d3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com>
Date: Tue, 3 Sep 2024 14:22:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Ddetection=E5=92=8Centi?=
 =?UTF-8?q?ty=E6=90=9C=E7=B4=A2=E6=97=B6=E5=8F=82=E6=95=B0=E4=B8=A2?=
 =?UTF-8?q?=E5=A4=B1=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/detections/Index.vue              | 12 ++++++------
 src/views/entityExplorer/EntityExplorer.vue | 13 ++++++-------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/views/detections/Index.vue b/src/views/detections/Index.vue
index 2780cadf..78ef5ea6 100644
--- a/src/views/detections/Index.vue
+++ b/src/views/detections/Index.vue
@@ -569,12 +569,6 @@ export default {
       this.timeFilter = { startTime: s, endTime: e, dateRangeValue: v.value }
     },
     search (param) {
-      // 如果不是最新时间，则获取当前时间
-      if (!param.isNowDate) {
-        const myTimeFilter = getNowDate(this.$_.cloneDeep(this.timeFilter))
-        this.reload(myTimeFilter.startTime, myTimeFilter.endTime, myTimeFilter.dateRangeValue)
-        return true
-      }
       let q
       let metaList
       if (param) {
@@ -612,6 +606,12 @@ export default {
         mode: mode
       })
       overwriteUrl(newUrl)
+      // 如果不是最新时间，则获取当前时间
+      if (!param.isNowDate) {
+        const myTimeFilter = getNowDate(this.$_.cloneDeep(this.timeFilter))
+        this.reload(myTimeFilter.startTime, myTimeFilter.endTime, myTimeFilter.dateRangeValue)
+        return true
+      }
       this.queryFilter(this.q)
       this.queryList(this.q)
     },
diff --git a/src/views/entityExplorer/EntityExplorer.vue b/src/views/entityExplorer/EntityExplorer.vue
index 06027b76..9f5bd216 100644
--- a/src/views/entityExplorer/EntityExplorer.vue
+++ b/src/views/entityExplorer/EntityExplorer.vue
@@ -413,13 +413,6 @@ export default {
       return result
     },
     search (param) {
-      // 如果不是最新时间，则获取当前时间
-      if (!param.isNowDate) {
-        const myTimeFilter = getNowDate(this.$_.cloneDeep(this.timeFilter))
-        this.reload(myTimeFilter.startTime, myTimeFilter.endTime, myTimeFilter.dateRangeValue)
-        return true
-      }
-      // 下版本08版本删除 ---- end
       let q
       let metaList
       if (param) {
@@ -465,6 +458,12 @@ export default {
         hideRelated: this.isHideRelatedEntities
       })
 
+      // 如果不是最新时间，则获取当前时间
+      if (!param.isNowDate) {
+        const myTimeFilter = getNowDate(this.$_.cloneDeep(this.timeFilter))
+        this.reload(myTimeFilter.startTime, myTimeFilter.endTime, myTimeFilter.dateRangeValue)
+        return true
+      }
       if (!this.showList) {
         // 首页进入搜索时重载页面，视觉上进入列表页面
         this.$router.push({