From 61f0bdfcf82d7b159032b66b65d3186ed8a5342c Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Thu, 12 May 2022 10:15:41 +0800
Subject: [PATCH] =?UTF-8?q?CN-545=20feat:=20=E5=AE=9E=E4=BD=93=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=88=97=E8=A1=A8=E4=B9=9F=E5=8E=BB=E6=8E=89=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/entityExplorer/EntityExplorer.vue   | 50 +++++++++----------
 src/views/entityExplorer/EntityFilter.vue     |  5 +-
 .../entityExplorer/entityList/EntityList.vue  | 14 +++++-
 .../entityList/entityListMixin.js             |  2 +-
 4 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/src/views/entityExplorer/EntityExplorer.vue b/src/views/entityExplorer/EntityExplorer.vue
index e09a5570..67cac518 100644
--- a/src/views/entityExplorer/EntityExplorer.vue
+++ b/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"/>
-      <TimeRefresh class="date-time-range" @change="timeRefreshChange" :end-time="timeFilter.endTime"/>
+<!--      <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"/>-->
       <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,14 +25,12 @@
             :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"
@@ -428,24 +426,24 @@ export default {
           } else {
             this.limitFilterType = false
           }
-          this.queryFilter({ entityType: entityType, q: this.q, ...this.timeFilter })
-          this.queryList({ q: this.q, ...this.timeFilter, ...this.pageObj })
-          this.queryListTotal({ q: this.q, ...this.timeFilter })
+          this.queryFilter({ entityType: entityType, q: this.q })
+          this.queryList({ q: this.q, ...this.pageObj })
+          this.queryListTotal({ q: this.q })
         } else {
           this.limitFilterType = false
-          this.queryFilter({ entityType: 'ip', q: this.q, ...this.timeFilter })
-          this.queryFilter({ entityType: 'domain', q: this.q, ...this.timeFilter })
-          this.queryFilter({ entityType: 'app', q: this.q, ...this.timeFilter })
-          this.queryList({ q: this.q, ...this.timeFilter, ...this.pageObj })
-          this.queryListTotal({ q: this.q, ...this.timeFilter })
+          this.queryFilter({ entityType: 'ip', q: this.q })
+          this.queryFilter({ entityType: 'domain', q: this.q })
+          this.queryFilter({ entityType: 'app', q: this.q })
+          this.queryList({ q: this.q, ...this.pageObj })
+          this.queryListTotal({ q: this.q })
         }
       } else {
         this.limitFilterType = false
-        this.queryFilter({ entityType: 'ip', ...this.timeFilter })
-        this.queryFilter({ entityType: 'app', ...this.timeFilter })
-        this.queryFilter({ entityType: 'domain', ...this.timeFilter })
-        this.queryList({ ...this.timeFilter, ...this.pageObj })
-        this.queryListTotal({ ...this.timeFilter })
+        this.queryFilter({ entityType: 'ip' })
+        this.queryFilter({ entityType: 'app' })
+        this.queryFilter({ entityType: 'domain' })
+        this.queryList({ ...this.pageObj })
+        this.queryListTotal()
       }
     },
     pageSize (val) {
@@ -491,9 +489,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 => {
@@ -542,9 +540,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) {
@@ -560,9 +558,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) {
@@ -662,13 +660,13 @@ export default {
   mounted () {
     this.getEntityIndexData()
   },
-  watch: {
+  /* watch: {
     timeFilter (n) {
       this.search(this.metaList, this.q)
     }
-  },
+  }, */
   setup () {
-    const dateRangeValue = 60 * 24
+    const dateRangeValue = 60
     const { startTime, endTime } = getNowTime(dateRangeValue)
     const timeFilter = ref({ startTime, endTime, dateRangeValue })
     return {
diff --git a/src/views/entityExplorer/EntityFilter.vue b/src/views/entityExplorer/EntityFilter.vue
index b0e645cb..e4cf0e39 100644
--- a/src/views/entityExplorer/EntityFilter.vue
+++ b/src/views/entityExplorer/EntityFilter.vue
@@ -50,7 +50,6 @@ export default {
   props: {
     filterData: Array,
     q: String,
-    timeFilter: Object,
     loadingLeft: Boolean
   },
   data () {
@@ -79,9 +78,7 @@ export default {
         q: this.q,
         entityType: type,
         column: item.topColumn,
-        top: 10,
-        startTime: parseInt(this.timeFilter.startTime / 1000),
-        endTime: parseInt(this.timeFilter.endTime / 1000)
+        top: 10
       }
       this.loading = true
       get(api.filterTop, queryParams).then(response => {
diff --git a/src/views/entityExplorer/entityList/EntityList.vue b/src/views/entityExplorer/entityList/EntityList.vue
index 5c6feab8..a4650bdc 100644
--- a/src/views/entityExplorer/entityList/EntityList.vue
+++ b/src/views/entityExplorer/entityList/EntityList.vue
@@ -42,6 +42,8 @@
 <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',
@@ -50,8 +52,7 @@ export default {
     from: String,
     pageObj: Object,
     loading: Boolean,
-    listMode: String,
-    timeFilter: Object
+    listMode: String
   },
   components: {
     'entity-card': Card,
@@ -96,6 +97,15 @@ export default {
         }
       }
     }
+  },
+  setup () {
+    // date
+    const dateRangeValue = 60
+    const { startTime, endTime } = getNowTime(dateRangeValue)
+    const timeFilter = ref({ startTime, endTime, dateRangeValue })
+    return {
+      timeFilter
+    }
   }
 }
 </script>
diff --git a/src/views/entityExplorer/entityList/entityListMixin.js b/src/views/entityExplorer/entityList/entityListMixin.js
index 8a6fc897..821cb268 100644
--- a/src/views/entityExplorer/entityList/entityListMixin.js
+++ b/src/views/entityExplorer/entityList/entityListMixin.js
@@ -11,7 +11,7 @@ import { shallowRef } from 'vue'
 export default {
   props: {
     entity: Object,
-    timeFilter: {},
+    timeFilter: Object,
     listMode: String,
     loading: Boolean
   },