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({