From c5104b3697303d94787412e890d3e915ee84fa08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com>
Date: Fri, 2 Jun 2023 14:26:22 +0800
Subject: [PATCH] =?UTF-8?q?CN-1060:=20=E5=AE=9E=E4=BD=93=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?--=E5=AE=89=E5=85=A8=E4=BA=8B=E4=BB=B6=E5=92=8C=E6=80=A7?=
 =?UTF-8?q?=E8=83=BD=E4=BA=8B=E4=BB=B6tab=E6=8E=A5=E5=8F=A3=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mock/entity.js                            |  8 ++---
 src/utils/api.js                              |  4 +--
 .../charts/entityDetail/EntityDetailTabs.vue  | 13 ++++++---
 .../entityDetail/tabs/PerformanceEvent.vue    | 27 +++--------------
 .../entityDetail/tabs/SecurityEvent.vue       | 29 ++++---------------
 5 files changed, 24 insertions(+), 57 deletions(-)

diff --git a/src/mock/entity.js b/src/mock/entity.js
index f4c87fcd..9f85147a 100644
--- a/src/mock/entity.js
+++ b/src/mock/entity.js
@@ -1,8 +1,8 @@
 import Mock from 'mockjs'
-
+const urlAndVersion = BASE_CONFIG.baseUrl + BASE_CONFIG.apiVersion
 const openMock = true
 if (openMock) {
-  Mock.mock(new RegExp(BASE_CONFIG.baseUrl + BASE_CONFIG.apiVersion + '/entity/detail/traffic/throughput.*'), 'get', function (requestObj) {
+  Mock.mock(new RegExp(urlAndVersion + '/entity/detail/traffic/throughput.*'), 'get', function (requestObj) {
     const titleList = ['totalBitsRate', 'inboundBitsRate', 'outboundBitsRate', 'internalBitsRate', 'throughBitsRate', 'other']
     const arr = [{ type: 'Bits/s' }, { type: 'Packets/s' }, { type: 'Sessions/s' }]
 
@@ -66,7 +66,7 @@ if (openMock) {
       }
     }
   })
-  Mock.mock(new RegExp(BASE_CONFIG.baseUrl + 'interface/entityDetail/securityEvent.*'), 'get', function (requestObj) {
+  Mock.mock(new RegExp(urlAndVersion + '/entity/detail/event/security.*'), 'get', function (requestObj) {
     const result = [
       {
         eventId: '1298414830886991872',
@@ -183,7 +183,7 @@ if (openMock) {
       }
     }
   })
-  Mock.mock(new RegExp(BASE_CONFIG.baseUrl + 'interface/entityDetail/performanceEvent.*'), 'get', function (requestObj) {
+  Mock.mock(new RegExp(urlAndVersion + '/entity/detail/event/performance.*'), 'get', function (requestObj) {
     const result = [
       {
         eventId: '1308078720390412288',
diff --git a/src/utils/api.js b/src/utils/api.js
index d312e391..8b776987 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -232,8 +232,8 @@ export const api = {
   },
   entity: {
     throughput: BASE_CONFIG.apiVersion + '/entity/detail/traffic/throughput',
-    securityEvent: 'interface/entityDetail/securityEvent',
-    performanceEvent: 'interface/entityDetail/performanceEvent',
+    security: BASE_CONFIG.apiVersion + '/entity/detail/event/security',
+    performance: BASE_CONFIG.apiVersion + '/entity/detail/event/performance',
     domainNameResolutionRelatedApp: 'interface/entity/detail/overview/ip/relatedApp',
     domainNameResolutionRelatedIP: 'interface/entity/detail/overview/ip/relatedIp',
     domainNameResolutionRelatedDomain: 'interface/entity/detail/overview/ip/relatedDomain',
diff --git a/src/views/charts2/charts/entityDetail/EntityDetailTabs.vue b/src/views/charts2/charts/entityDetail/EntityDetailTabs.vue
index 88fec9e3..d278d13d 100644
--- a/src/views/charts2/charts/entityDetail/EntityDetailTabs.vue
+++ b/src/views/charts2/charts/entityDetail/EntityDetailTabs.vue
@@ -13,9 +13,9 @@
         </template>
         <information-aggregation v-if="tab.name === entityDetailTabsName.informationAggregation && tab.name === activeTab" @toggleLoading="setLoading"></information-aggregation>
         <domain-name-resolution v-else-if="tab.name === entityDetailTabsName.domainNameResolution && tab.name === activeTab" @toggleLoading="setLoading"></domain-name-resolution>
-        <digital-certificate v-else-if="tab.name === entityDetailTabsName.digitalCertificate && tab.name === activeTab" @toggleLoading="setLoading" />
-        <security-event v-else-if="tab.name === entityDetailTabsName.securityEvent && tab.name === activeTab" @toggleLoading="setLoading" :timeFilter="timeFilter" />
-        <performance-event v-else-if="tab.name === entityDetailTabsName.performanceEvent && tab.name === activeTab" @toggleLoading="setLoading" />
+        <digital-certificate v-else-if="tab.name === entityDetailTabsName.digitalCertificate && tab.name === activeTab" @toggleLoading="setLoading" :timeFilter="oneDayTimeFilter" />
+        <security-event v-else-if="tab.name === entityDetailTabsName.securityEvent && tab.name === activeTab" @toggleLoading="setLoading" :timeFilter="oneDayTimeFilter" />
+        <performance-event v-else-if="tab.name === entityDetailTabsName.performanceEvent && tab.name === activeTab" @toggleLoading="setLoading" :timeFilter="oneDayTimeFilter" />
         <open-port v-else-if="tab.name === entityDetailTabsName.openPort && tab.name === activeTab" @toggleLoading="setLoading"></open-port>
       </el-tab-pane>
     </el-tabs>
@@ -49,7 +49,12 @@ export default {
   },
   data () {
     return {
-      timer: null
+      timer: null,
+      // 最近一天的时间
+      oneDayTimeFilter: {
+        startTime: window.$dayJs.tz().valueOf() - 1440 * 60 * 1000,
+        endTime: window.$dayJs.tz().valueOf()
+      }
     }
   },
   watch: {
diff --git a/src/views/charts2/charts/entityDetail/tabs/PerformanceEvent.vue b/src/views/charts2/charts/entityDetail/tabs/PerformanceEvent.vue
index 906e0cc3..ba278a1c 100644
--- a/src/views/charts2/charts/entityDetail/tabs/PerformanceEvent.vue
+++ b/src/views/charts2/charts/entityDetail/tabs/PerformanceEvent.vue
@@ -49,12 +49,11 @@
 </template>
 
 <script>
-import { getNowTime, getSecond } from '@/utils/date-util'
+import { getSecond } from '@/utils/date-util'
 import { eventSeverityColor1 } from '@/utils/constants'
 import unitConvert from '@/utils/unit-convert'
 import axios from 'axios'
 import { api } from '@/utils/api'
-import { ref } from 'vue'
 import { useRoute } from 'vue-router'
 import chartMixin from '@/views/charts2/chart-mixin'
 import ChartError from '@/components/common/Error'
@@ -75,27 +74,10 @@ export default {
     const { query } = useRoute()
     const entityType = query.entityType
     const entityName = query.entityName
-    // 获取url携带的range、startTime、endTime
-    const rangeParam = query.range
-    const startTimeParam = query.startTime
-    const endTimeParam = query.endTime
-    // 若url携带了，使用携带的值，否则使用默认值。
-
-    const dateRangeValue = rangeParam ? parseInt(query.range) : 60
-    const timeFilter = ref({ dateRangeValue })
-    if (!startTimeParam || !endTimeParam) {
-      const { startTime, endTime } = getNowTime(60)
-      timeFilter.value.startTime = startTime
-      timeFilter.value.endTime = endTime
-    } else {
-      timeFilter.value.startTime = parseInt(startTimeParam)
-      timeFilter.value.endTime = parseInt(endTimeParam)
-    }
 
     return {
       entityType,
-      entityName,
-      timeFilter
+      entityName
     }
   },
   mounted () {
@@ -105,14 +87,13 @@ export default {
     unitConvert,
     initData () {
       const params = {
-        type: this.entityType,
-        name: this.entityName,
+        resource: this.entityName,
         startTime: getSecond(this.timeFilter.startTime),
         endTime: getSecond(this.timeFilter.endTime)
       }
 
       this.toggleLoading(true)
-      axios.get(api.entity.performanceEvent, { params: params }).then(response => {
+      axios.get(`${api.entity.performance}/${this.entityType}`, { params: params }).then(response => {
         const res = response.data
 
         if (res.code === 200) {
diff --git a/src/views/charts2/charts/entityDetail/tabs/SecurityEvent.vue b/src/views/charts2/charts/entityDetail/tabs/SecurityEvent.vue
index 37fdc9c2..f7afb38f 100644
--- a/src/views/charts2/charts/entityDetail/tabs/SecurityEvent.vue
+++ b/src/views/charts2/charts/entityDetail/tabs/SecurityEvent.vue
@@ -73,12 +73,11 @@
 </template>
 
 <script>
-import { getNowTime, getSecond } from '@/utils/date-util'
+import { getSecond } from '@/utils/date-util'
 import { eventSeverityColor1 } from '@/utils/constants'
 import unitConvert from '@/utils/unit-convert'
 import axios from 'axios'
 import { api } from '@/utils/api'
-import { ref } from 'vue'
 import { useRoute } from 'vue-router'
 import chartMixin from '@/views/charts2/chart-mixin'
 
@@ -96,28 +95,11 @@ export default {
   setup () {
     const { query } = useRoute()
     const entityType = query.entityType
-    const entityName = query.entityName
-    // 获取url携带的range、startTime、endTime
-    const rangeParam = query.range
-    const startTimeParam = query.startTime
-    const endTimeParam = query.endTime
-    // 若url携带了，使用携带的值，否则使用默认值。
-
-    const dateRangeValue = rangeParam ? parseInt(query.range) : 60
-    const timeFilter = ref({ dateRangeValue })
-    if (!startTimeParam || !endTimeParam) {
-      const { startTime, endTime } = getNowTime(60)
-      timeFilter.value.startTime = startTime
-      timeFilter.value.endTime = endTime
-    } else {
-      timeFilter.value.startTime = parseInt(startTimeParam)
-      timeFilter.value.endTime = parseInt(endTimeParam)
-    }
+    const entityName = query.name
 
     return {
       entityType,
-      entityName,
-      timeFilter
+      entityName
     }
   },
   mounted () {
@@ -127,14 +109,13 @@ export default {
     unitConvert,
     initData () {
       const params = {
-        type: this.entityType,
-        name: this.entityName,
+        resource: this.entityName,
         startTime: getSecond(this.timeFilter.startTime),
         endTime: getSecond(this.timeFilter.endTime)
       }
 
       this.toggleLoading(true)
-      axios.get(api.entity.securityEvent, { params: params }).then(response => {
+      axios.get(`${api.entity.security}/${this.entityType}`, { params: params }).then(response => {
         const res = response.data
 
         if (res.code === 200) {