CN-544 feat: 暂时去掉CN-545的更新

src/views/entityExplorer/EntityExplorer.vue

@@ -4,8 +4,8 @@
       :class="{'entity-explorer--show-list': showList}">
     <!-- 顶部工具栏，在列表页显示 -->
     <div class="explorer-top-tools" v-show="showList">
-<!--      <DateTimeRange class="date-time-range" :start-time="timeFilter.startTime" :end-time="timeFilter.endTime" :date-range="timeFilter.dateRangeValue" ref="dateTimeRange" @change="reload"/>
+      <DateTimeRange class="date-time-range" :start-time="timeFilter.startTime" :end-time="timeFilter.endTime" :date-range="timeFilter.dateRangeValue" ref="dateTimeRange" @change="reload"/>
-      <TimeRefresh class="date-time-range" @change="timeRefreshChange" :end-time="timeFilter.endTime"/>-->
+      <TimeRefresh class="date-time-range" @change="timeRefreshChange" :end-time="timeFilter.endTime"/>
       <el-button-group size="mini">
         <el-button size="mini" @click="listMode = 'list'" :class="{'active': listMode === 'list'}"><i class="cn-icon cn-icon-list"></i></el-button>
         <el-button size="mini" @click="listMode = 'block'" :class="{'active': listMode === 'block'}"><i class="cn-icon cn-icon-blocks"></i></el-button>
@@ -25,12 +25,14 @@
             :filter-data="filterData"
             :loading-left="loadingLeft"
             :q="q"
+            :time-filter="timeFilter"
             @filter="filter"
         ></entity-filter>
         <entity-list
             :list-data="listData"
             :list-mode="listMode"
             :pageObj="pageObj"
+            :time-filter="timeFilter"
             @pageSize="pageSize"
             @pageNo="pageNo"
             :loading="listLoading"
@@ -440,26 +442,26 @@ export default {
           } else {
             this.limitFilterType = false
           }
-          this.queryFilter({ entityType: entityType, q: this.q })
+          this.queryFilter({ entityType: entityType, q: this.q, ...this.timeFilter })
-          this.queryFilter({ entityType: 'dns', q: this.q })
+          this.queryFilter({ entityType: 'dns', q: this.q, ...this.timeFilter })
-          this.queryList({ q: this.q, ...this.pageObj })
+          this.queryList({ q: this.q, ...this.pageObj, ...this.timeFilter })
-          this.queryListTotal({ q: this.q })
+          this.queryListTotal({ q: this.q, ...this.timeFilter })
         } else {
           this.limitFilterType = false
-          this.queryFilter({ entityType: 'ip', q: this.q })
+          this.queryFilter({ entityType: 'ip', q: this.q, ...this.timeFilter })
-          this.queryFilter({ entityType: 'domain', q: this.q })
+          this.queryFilter({ entityType: 'domain', q: this.q, ...this.timeFilter })
-          this.queryFilter({ entityType: 'app', q: this.q })
+          this.queryFilter({ entityType: 'app', q: this.q, ...this.timeFilter })
-          this.queryFilter({ entityType: 'dns', q: this.q })
+          this.queryFilter({ entityType: 'dns', q: this.q, ...this.timeFilter })
-          this.queryList({ q: this.q, ...this.pageObj })
+          this.queryList({ q: this.q, ...this.pageObj, ...this.timeFilter })
-          this.queryListTotal({ q: this.q })
+          this.queryListTotal({ q: this.q, ...this.timeFilter })
         }
       } else {
         this.limitFilterType = false
-        this.queryFilter({ entityType: 'ip' })
+        this.queryFilter({ entityType: 'ip', ...this.timeFilter })
-        this.queryFilter({ entityType: 'app' })
+        this.queryFilter({ entityType: 'app', ...this.timeFilter })
-        this.queryFilter({ entityType: 'domain' })
+        this.queryFilter({ entityType: 'domain', ...this.timeFilter })
-        this.queryFilter({ entityType: 'dns' })
+        this.queryFilter({ entityType: 'dns', ...this.timeFilter })
-        this.queryList({ ...this.pageObj })
+        this.queryList({ ...this.pageObj, ...this.timeFilter })
         this.queryListTotal()
       }
     },
@@ -506,9 +508,9 @@ export default {
     /* 查询filter数据 */
     queryFilter (params) {
       const queryParams = {
-        ...params/* ,
+        ...params,
         startTime: getSecond(params.startTime),
-        endTime: getSecond(params.endTime) */
+        endTime: getSecond(params.endTime)
       }
       this.loadingLeft = true
       get(api.entityFilter, queryParams).then(response => {
@@ -568,9 +570,9 @@ export default {
     queryList (params) {
       this.listLoading = true
       const queryParams = {
-        ...params/* ,
+        ...params,
         startTime: parseInt(params.startTime / 1000),
-        endTime: parseInt(params.endTime / 1000) */
+        endTime: parseInt(params.endTime / 1000)
       }
       get(api.entityList, queryParams).then(response => {
         if (response.code === 200) {
@@ -586,9 +588,9 @@ export default {
 
     queryListTotal (params) {
       const queryParams = {
-        ...params/* ,
+        ...params,
         startTime: parseInt(params.startTime / 1000),
-        endTime: parseInt(params.endTime / 1000) */
+        endTime: parseInt(params.endTime / 1000)
       }
       get(api.entityListTotal, queryParams).then(response => {
         if (response.code === 200) {
@@ -688,13 +690,13 @@ export default {
   mounted () {
     this.getEntityIndexData()
   },
-  /* watch: {
+  watch: {
     timeFilter (n) {
       this.search(this.metaList, this.q)
     }
-  }, */
+  },
   setup () {
-    const dateRangeValue = 60
+    const dateRangeValue = 60 * 24
     const { startTime, endTime } = getNowTime(dateRangeValue)
     const timeFilter = ref({ startTime, endTime, dateRangeValue })
     return {

src/views/entityExplorer/EntityFilter.vue

@@ -53,6 +53,7 @@ export default {
   props: {
     filterData: Array,
     q: String,
+    timeFilter: Object,
     loadingLeft: Boolean
   },
   data () {
@@ -76,7 +77,9 @@ export default {
         q: this.q,
         entityType: filter.type,
         column: item.topColumn,
-        top: 10
+        top: 10,
+        startTime: parseInt(this.timeFilter.startTime / 1000),
+        endTime: parseInt(this.timeFilter.endTime / 1000)
       }
       this.loading = true
       this.popoverData = []

src/views/entityExplorer/entityList/EntityList.vue

@@ -42,8 +42,6 @@
 <script>
 import Card from '@/views/entityExplorer/entityList/Card'
 import Row from '@/views/entityExplorer/entityList/Row'
-import { getNowTime } from '@/utils/date-util'
-import { ref } from 'vue'
 
 export default {
   name: 'EntityList',
@@ -52,6 +50,7 @@ export default {
     from: String,
     pageObj: Object,
     loading: Boolean,
+    timeFilter: Object,
     listMode: String
   },
   components: {
@@ -97,15 +96,6 @@ export default {
         }
       }
     }
-  },
-  setup () {
-    // date
-    const dateRangeValue = 60
-    const { startTime, endTime } = getNowTime(dateRangeValue)
-    const timeFilter = ref({ startTime, endTime, dateRangeValue })
-    return {
-      timeFilter
-    }
   }
 }
 </script>