From 9ebcd6a9eb5a956a197053ad399e1f844a0dee42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= Date: Sun, 24 Sep 2023 21:32:16 +0800 Subject: [PATCH] =?UTF-8?q?CN-1329=20fix:=20=E4=BF=AE=E5=A4=8D=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E4=B8=BB=E9=A1=B5=E7=9B=B8=E5=90=8C=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E9=87=8D=E5=A4=8D=E5=B1=95=E7=A4=BA=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/DateTimeRange.vue | 3 ++- src/views/entityExplorer/search/ExplorerSearch.vue | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/components/common/TimeRange/DateTimeRange.vue b/src/components/common/TimeRange/DateTimeRange.vue index 898d5be3..d78e2497 100644 --- a/src/components/common/TimeRange/DateTimeRange.vue +++ b/src/components/common/TimeRange/DateTimeRange.vue @@ -254,7 +254,8 @@ export default { const returnValue = () => { store.commit('setTimeFilter', { startTime: myStartTime.value, endTime: myEndTime.value, range: dateRangeValue.value }) cancelHttp() - if (rangeHistory.value[0] && rangeHistory.value[0].start !== myStartTime.value && rangeHistory.value[0].end !== myEndTime.value) { + const obj = rangeHistory.value.find(d => d.start === myStartTime.value && d.end === myEndTime.value) + if (!obj) { rangeHistory.value.unshift({ start: myStartTime.value, end: myEndTime.value diff --git a/src/views/entityExplorer/search/ExplorerSearch.vue b/src/views/entityExplorer/search/ExplorerSearch.vue index 81bdb93e..85c5ff68 100644 --- a/src/views/entityExplorer/search/ExplorerSearch.vue +++ b/src/views/entityExplorer/search/ExplorerSearch.vue @@ -98,7 +98,12 @@ export default { const newItem = { str, date: this.dateFormatByAppearance(new Date()) } if (!_.isEmpty(oldHistory)) { const oldArr = JSON.parse(oldHistory) - oldArr.unshift(newItem) + const obj = oldArr.find(d => d.str === str) + if (obj) { + oldArr[0].date = this.dateFormatByAppearance(new Date()) + } else { + oldArr.unshift(newItem) + } arr = [...oldArr] if (arr.length > 30) { arr = arr.slice(0, 30)