From 085a18931c7574383a7aa5bb5b4fe618e81d3906 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:07:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=201=E3=80=81=E4=BF=AE=E5=A4=8Ddetection?=
 =?UTF-8?q?=E5=92=8Centity=E6=90=9C=E7=B4=A2=E6=97=B6=EF=BC=8C=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E4=B8=8D=E6=98=AF=E6=9C=80=E6=96=B0=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/utils/date-util.js                      | 12 ++++++++++++
 src/views/detections/Index.vue              | 10 ++++++++--
 src/views/entityExplorer/EntityExplorer.vue | 11 ++++++-----
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/utils/date-util.js b/src/utils/date-util.js
index 2302f54d..972366df 100644
--- a/src/utils/date-util.js
+++ b/src/utils/date-util.js
@@ -209,3 +209,15 @@ export function getDurationsTimeByType (number, type) {
   }
   return `P${T}${number}${switchValueByDateType(type)}`
 }
+
+export function getNowDate (timeFilter) {
+  if (timeFilter?.dateRangeValue > -1) {
+    return {
+      startTime: (new Date()).getTime() - (timeFilter.dateRangeValue * 60 * 1000),
+      endTime: (new Date()).getTime(),
+      dateRangeValue: { value: timeFilter.dateRangeValue }
+    }
+  } else {
+    return timeFilter
+  }
+}
diff --git a/src/views/detections/Index.vue b/src/views/detections/Index.vue
index eee74d13..2780cadf 100644
--- a/src/views/detections/Index.vue
+++ b/src/views/detections/Index.vue
@@ -129,7 +129,7 @@ import DetectionFilter from '@/views/detections/DetectionFilter'
 import DetectionList from '@/views/detections/DetectionList'
 import Pagination from '@/components/common/Pagination'
 import { defaultPageSize, detectionPageType, detectionEventType } from '@/utils/constants'
-import { getNowTime, getSecond, getMillisecond } from '@/utils/date-util'
+import { getNowTime, getSecond, getMillisecond, getNowDate } from '@/utils/date-util'
 import { ref, shallowRef } from 'vue'
 import * as echarts from 'echarts'
 import {
@@ -569,6 +569,12 @@ 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) {
@@ -857,7 +863,7 @@ export default {
       }
     },
     timeFilter () {
-      this.search({ metaList: this.metaList, q: this.q })
+      this.search({ metaList: this.metaList, q: this.q, isNowDate: true })
     }
   },
   beforeUnmount () {
diff --git a/src/views/entityExplorer/EntityExplorer.vue b/src/views/entityExplorer/EntityExplorer.vue
index 42716066..06027b76 100644
--- a/src/views/entityExplorer/EntityExplorer.vue
+++ b/src/views/entityExplorer/EntityExplorer.vue
@@ -207,7 +207,7 @@ import EntityList from '@/views/entityExplorer/entityList/EntityList'
 import { defaultPageSize, riskLevelMapping } from '@/utils/constants'
 import axios from 'axios'
 import { api } from '@/utils/api'
-import { getNowTime, getSecond } from '@/utils/date-util'
+import { getNowDate, getNowTime, getSecond } from '@/utils/date-util'
 import { ref } from 'vue'
 import _ from 'lodash'
 import Loading from '@/components/common/Loading'
@@ -413,9 +413,10 @@ export default {
       return result
     },
     search (param) {
-      // todo 下版本08版本删除 ---- start
-      if (param && param.q.indexOf("QUERY('") > -1) {
-        this.$message.error(this.$t('overall.versionNotSupportThisFormat'))
+      // 如果不是最新时间，则获取当前时间
+      if (!param.isNowDate) {
+        const myTimeFilter = getNowDate(this.$_.cloneDeep(this.timeFilter))
+        this.reload(myTimeFilter.startTime, myTimeFilter.endTime, myTimeFilter.dateRangeValue)
         return true
       }
       // 下版本08版本删除 ---- end
@@ -936,7 +937,7 @@ export default {
   watch: {
     timeFilter () {
       const keywordList = this.getKeywordListByMetaList(this.metaList)
-      this.search({ metaList: this.metaList, q: this.q, str: this.str, keywordList: keywordList })
+      this.search({ metaList: this.metaList, q: this.q, str: this.str, keywordList: keywordList, isNowDate: true })
     }
   },
   setup () {