From 95cb044df368c6e63c858ba878eecc3d6687e5bb Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Fri, 18 Mar 2022 16:23:55 +0800
Subject: [PATCH] =?UTF-8?q?CN-376=20fix:=20=E5=AE=9E=E4=BD=93=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=98=BE=E7=A4=BA=E6=B4=BB=E8=B7=83=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                           |  4 +-
 src/utils/api.js                              |  8 +--
 .../charts/charts/ChartActiveIpTable.vue      |  2 +-
 src/views/entityExplorer/entityList/Row.vue   |  4 +-
 .../entityList/detailOverview/App.vue         |  7 ++-
 .../entityList/detailOverview/Domain.vue      |  8 ++-
 .../entityList/detailOverview/Ip.vue          |  7 ++-
 .../detailOverview/entityDetailMixin.js       |  7 +--
 .../entityList/entityListMixin.js             | 63 ++++++++++++++-----
 9 files changed, 73 insertions(+), 37 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index b385c302..e62966c9 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -49,11 +49,11 @@ const routes = [
       {
         path: '/chart',
         component: () => import('@/views/settings/Chart')
-      },
+      }/* ,
       {
         path: '/temp',
         component: () => import('@/views/Temp')
-      }
+      } */
     ]
   }
 ]
diff --git a/src/utils/api.js b/src/utils/api.js
index a9ffc77e..de3fa60a 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -34,8 +34,6 @@ export const api = {
   entityNew: '/interface/entity/index/new',
   entityActive: '/interface/entity/index/active',
   entityTraffic: '/interface/entity/list/traffic',
-  entityAlertNum: '/interface/entity/list/alertNum',
-  entitySecurityNum: '/interface/entity/list/detectionNum',
   ipBytes: '/interface/entity/detail/ip/bytes',
   domainBytes: '/interface/entity/detail/domain/bytes',
   appBytes: '/interface/entity/detail/app/bytes',
@@ -45,7 +43,7 @@ export const api = {
   entityAppDetailNetworkQuantity: '/interface/entity/detail/overview/app/networkQuantity',
   entityAppDetailLinkIn: '/interface/entity/detail/overview/app/linkIn',
   entityAppDetailLinkOut: '/interface/entity/detail/overview/app/linkOut',
-  entityAppDetailAlert: '/interface/entity/detail/overview/app/performanceEvent',
+  entityAppDetailPerformance: '/interface/entity/detail/overview/app/performanceEvent',
   entityAppDetailSecurity: '/interface/entity/detail/overview/app/securityEvent',
   entityAppRelatedServerDomain: '/interface/entity/detail/overview/app/relatedDomain',
   entityAppRelatedServerIp: '/interface/entity/detail/overview/app/relatedServerIp',
@@ -56,7 +54,7 @@ export const api = {
   entityDomainDetailNetworkQuantity: '/interface/entity/detail/overview/domain/networkQuantity',
   entityDomainDetailLinkIn: '/interface/entity/detail/overview/domain/linkIn',
   entityDomainDetailLinkOut: '/interface/entity/detail/overview/domain/linkOut',
-  entityDomainDetailAlert: '/interface/entity/detail/overview/domain/performanceEvent',
+  entityDomainDetailPerformance: '/interface/entity/detail/overview/domain/performanceEvent',
   entityDomainDetailSecurity: '/interface/entity/detail/overview/domain/securityEvent',
   entityDomainRelatedServerIp: '/interface/entity/detail/overview/domain/relatedServerIp',
   entityDomainRelatedServerApp: '/interface/entity/detail/overview/domain/relatedApp',
@@ -69,7 +67,7 @@ export const api = {
   entityIpDetailNetworkQuantity: '/interface/entity/detail/overview/ip/networkQuantity',
   entityIpDetailLinkIn: '/interface/entity/detail/overview/ip/linkIn',
   entityIpDetailLinkOut: '/interface/entity/detail/overview/ip/linkOut',
-  entityIpDetailAlert: '/interface/entity/detail/overview/ip/performanceEvent',
+  entityIpDetailPerformance: '/interface/entity/detail/overview/ip/performanceEvent',
   entityIpDetailSecurity: '/interface/entity/detail/overview/ip/securityEvent',
   entityIpRelatedServerDomain: '/interface/entity/detail/overview/ip/relatedDomain',
   entityIpRelatedServerApp: '/interface/entity/detail/overview/ip/relatedApp',
diff --git a/src/views/charts/charts/ChartActiveIpTable.vue b/src/views/charts/charts/ChartActiveIpTable.vue
index c853e838..0651adcb 100644
--- a/src/views/charts/charts/ChartActiveIpTable.vue
+++ b/src/views/charts/charts/ChartActiveIpTable.vue
@@ -28,7 +28,7 @@
             v-for="(c, i) in table.tableColumns"
             show-overflow-tooltip
             :key="i"
-            :label="$t(chartTableOrderOptionsMapping[c])"
+            :label="c"
             :prop="c"
         >
           <template #default="{ row }">
diff --git a/src/views/entityExplorer/entityList/Row.vue b/src/views/entityExplorer/entityList/Row.vue
index d7d52af9..9578b5ec 100644
--- a/src/views/entityExplorer/entityList/Row.vue
+++ b/src/views/entityExplorer/entityList/Row.vue
@@ -154,14 +154,14 @@
               <div class="basic-info__item">
                 <i class="cn-icon cn-icon-entity-alert"></i>
                 <span>{{ $t('entities.recentAlert') }}&nbsp;:&nbsp;&nbsp;</span>
-                <span>{{ entityData.alertCount || '-' }}</span>
+                <span>{{ entityData.performanceCount}}</span>
               </div>
               <div class="basic-info__item">
                 <i class="cn-icon cn-icon-safe"></i>
                 <span
                   >{{ $t('entities.recentSecurity') }}&nbsp;:&nbsp;&nbsp;</span
                 >
-                <span>{{ entityData.securityCount || '-' }}</span>
+                <span>{{ entityData.securityCount}}</span>
               </div>
             </div>
             <div
diff --git a/src/views/entityExplorer/entityList/detailOverview/App.vue b/src/views/entityExplorer/entityList/detailOverview/App.vue
index 578a47b8..ee26c768 100644
--- a/src/views/entityExplorer/entityList/detailOverview/App.vue
+++ b/src/views/entityExplorer/entityList/detailOverview/App.vue
@@ -192,6 +192,7 @@ import _ from 'lodash'
 import ChartSingleValue from '@/views/charts/charts/ChartSingleValue'
 import { get } from '@/utils/http'
 import relatedServer from '@/mixins/relatedServer'
+import { getSecond } from '@/utils/date-util'
 
 export default {
   name: 'App',
@@ -209,7 +210,7 @@ export default {
       networkQuantityUrl: api.entityAppDetailNetworkQuantity,
       linkInUrl: api.entityAppDetailLinkIn,
       linkOutUrl: api.entityAppDetailLinkOut,
-      alertUrl: api.entityAppDetailAlert,
+      performanceUrl: api.entityIpDetailPerformance,
       securityUrl: api.entityAppDetailSecurity,
       trafficUrlMap: api.entityAppDetailTrafficMap,
       relatedServerDomainUrl: api.entityAppRelatedServerDomain,
@@ -266,8 +267,8 @@ export default {
   methods: {
     getQueryParams () {
       const queryParams = {
-        startTime: parseInt(this.timeFilter.startTime / 1000),
-        endTime: parseInt(this.timeFilter.endTime / 1000),
+        startTime: getSecond(this.timeFilter.startTime),
+        endTime: getSecond(this.timeFilter.endTime),
         appName: this.entity.appName
       }
       return queryParams
diff --git a/src/views/entityExplorer/entityList/detailOverview/Domain.vue b/src/views/entityExplorer/entityList/detailOverview/Domain.vue
index 21a3e35b..1eb5093e 100644
--- a/src/views/entityExplorer/entityList/detailOverview/Domain.vue
+++ b/src/views/entityExplorer/entityList/detailOverview/Domain.vue
@@ -196,6 +196,8 @@ import Chart from '@/views/charts/Chart'
 import _ from 'lodash'
 import { get } from '@/utils/http'
 import relatedServer from '@/mixins/relatedServer'
+import { getSecond } from '@/utils/date-util'
+
 export default {
   name: 'Domain',
   components: {
@@ -212,7 +214,7 @@ export default {
       networkQuantityUrl: api.entityDomainDetailNetworkQuantity,
       linkInUrl: api.entityDomainDetailLinkIn,
       linkOutUrl: api.entityDomainDetailLinkOut,
-      alertUrl: api.entityDomainDetailAlert,
+      performanceUrl: api.entityDomainDetailPerformance,
       securityUrl: api.entityDomainDetailSecurity,
       trafficUrlMap: api.entityDomainDetailTrafficMap,
       relatedServerIpUrl: api.entityDomainRelatedServerIp,
@@ -270,8 +272,8 @@ export default {
   methods: {
     getQueryParams () {
       const queryParams = {
-        startTime: parseInt(this.timeFilter.startTime / 1000),
-        endTime: parseInt(this.timeFilter.endTime / 1000),
+        startTime: getSecond(this.timeFilter.startTime),
+        endTime: getSecond(this.timeFilter.endTime),
         domain: this.entity.domainName
       }
       return queryParams
diff --git a/src/views/entityExplorer/entityList/detailOverview/Ip.vue b/src/views/entityExplorer/entityList/detailOverview/Ip.vue
index 84bbae50..2cf38b84 100644
--- a/src/views/entityExplorer/entityList/detailOverview/Ip.vue
+++ b/src/views/entityExplorer/entityList/detailOverview/Ip.vue
@@ -180,6 +180,7 @@ import Chart from '@/views/charts/Chart'
 import _ from 'lodash'
 import { get } from '@/utils/http'
 import relatedServer from '@/mixins/relatedServer'
+import { getSecond } from '@/utils/date-util'
 
 export default {
   name: 'Ip',
@@ -198,7 +199,7 @@ export default {
       networkQuantityUrl: api.entityIpDetailNetworkQuantity,
       linkInUrl: api.entityIpDetailLinkIn,
       linkOutUrl: api.entityIpDetailLinkOut,
-      alertUrl: api.entityIpDetailAlert,
+      performanceUrl: api.entityIpDetailPerformance,
       securityUrl: api.entityIpDetailSecurity,
       relatedServerDomainUrl: api.entityIpRelatedServerDomain,
       relatedServerAppUrl: api.entityIpRelatedServerApp,
@@ -274,8 +275,8 @@ export default {
   methods: {
     getQueryParams () {
       const queryParams = {
-        startTime: parseInt(this.timeFilter.startTime / 1000),
-        endTime: parseInt(this.timeFilter.endTime / 1000),
+        startTime: getSecond(this.timeFilter.startTime),
+        endTime: getSecond(this.timeFilter.endTime),
         ip: this.entity.ipAddr
       }
       return queryParams
diff --git a/src/views/entityExplorer/entityList/detailOverview/entityDetailMixin.js b/src/views/entityExplorer/entityList/detailOverview/entityDetailMixin.js
index b64ff792..fd81919a 100644
--- a/src/views/entityExplorer/entityList/detailOverview/entityDetailMixin.js
+++ b/src/views/entityExplorer/entityList/detailOverview/entityDetailMixin.js
@@ -210,8 +210,8 @@ export default {
       }
     },
 
-    queryEntityDetailAlert () {
-      get(this.alertUrl, this.getQueryParams()).then(response => {
+    queryEntityDetailPerformance () {
+      get(this.performanceUrl, this.getQueryParams()).then(response => {
         if (response.code === 200) {
           this.entityData.alertNum = response.data.result.length
           this.entityData.alertList = response.data.result
@@ -230,8 +230,7 @@ export default {
 
     queryEntityDetail () {
       this.queryEntityDetailTraffic()
-      // this.queryEntityDetailRelation()
-      this.queryEntityDetailAlert()
+      this.queryEntityDetailPerformance()
       this.queryEntityDetailSecurity()
       this.queryEntityDetailNetworkQuantity()
       this.queryEntityDetailLinkOutUrl()
diff --git a/src/views/entityExplorer/entityList/entityListMixin.js b/src/views/entityExplorer/entityList/entityListMixin.js
index ee2bedfd..086bcec9 100644
--- a/src/views/entityExplorer/entityList/entityListMixin.js
+++ b/src/views/entityExplorer/entityList/entityListMixin.js
@@ -4,6 +4,7 @@ import { api } from '@/utils/api'
 import * as echarts from 'echarts'
 import { entityListLineOption } from '@/views/charts/charts/chart-options'
 import { riskLevelMapping, unitTypes } from '@/utils/constants'
+import { getSecond } from '@/utils/date-util'
 
 export default {
   props: {
@@ -149,27 +150,61 @@ export default {
     },
     querySecurity () {
       const queryParams = {
-        startTime: parseInt(this.timeFilter.startTime / 1000),
-        endTime: parseInt(this.timeFilter.endTime / 1000),
-        entityType: this.entityData.entityType,
-        name: this.entityName
+        startTime: getSecond(this.timeFilter.startTime),
+        endTime: getSecond(this.timeFilter.endTime)
       }
-      get(api.entitySecurityNum, queryParams).then(response => {
+      let url
+      switch (this.entityData.entityType) {
+        case ('ip'): {
+          url = api.entityIpDetailSecurity
+          queryParams.ip = this.entityName
+          break
+        }
+        case ('domain'): {
+          url = api.entityDomainDetailSecurity
+          queryParams.domain = this.entityName
+          break
+        }
+        case ('app'): {
+          url = api.entityAppDetailSecurity
+          queryParams.appName = this.entityName
+          break
+        }
+        default: break
+      }
+      get(url, queryParams).then(response => {
         if (response.code === 200) {
-          this.entityData.securityCount = response.data.result[0].count
+          this.entityData.securityCount = response.data.result && response.data.result.length
         }
       })
     },
-    queryAlert () {
+    queryPerformance () {
       const queryParams = {
-        startTime: parseInt(this.timeFilter.startTime / 1000),
-        endTime: parseInt(this.timeFilter.endTime / 1000),
-        entityType: this.entityData.entityType,
-        name: this.entityName
+        startTime: getSecond(this.timeFilter.startTime),
+        endTime: getSecond(this.timeFilter.endTime)
       }
-      get(api.entityAlertNum, queryParams).then(response => {
+      let url
+      switch (this.entityData.entityType) {
+        case ('ip'): {
+          url = api.entityIpDetailPerformance
+          queryParams.ip = this.entityName
+          break
+        }
+        case ('domain'): {
+          url = api.entityDomainDetailPerformance
+          queryParams.domain = this.entityName
+          break
+        }
+        case ('app'): {
+          url = api.entityAppDetailPerformance
+          queryParams.appName = this.entityName
+          break
+        }
+        default: break
+      }
+      get(url, queryParams).then(response => {
         if (response.code === 200) {
-          this.entityData.alertCount = response.data.result[0].value
+          this.entityData.performanceCount = response.data.result && response.data.result.length
         }
       })
     },
@@ -259,7 +294,7 @@ export default {
     this.entityData = _.cloneDeep(this.entity)
     setTimeout(() => { this.queryTraffic() })
     setTimeout(() => { this.querySecurity() })
-    setTimeout(() => { this.queryAlert() })
+    setTimeout(() => { this.queryPerformance() })
     if (this.listMode === 'block') {
       setTimeout(() => { this.queryTrafficLine() })
     }