From 0e51d49e152de1ce4fc89e3a424328f2e36d1835 Mon Sep 17 00:00:00 2001
From: hyx <hanyuxia@iie.ac.cn>
Date: Wed, 10 Jan 2024 17:09:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:=201.=E8=B0=83=E6=95=B4subscriber=E5=AE=9E?=
 =?UTF-8?q?=E4=BD=93=E4=B8=ADtab=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E4=BD=8D=E7=BD=AE=EF=BC=9B2.?=
 =?UTF-8?q?=E6=9A=82=E6=97=B6=E4=B8=8D=E8=AF=B7=E6=B1=82subscriber?=
 =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=AF=B9=E5=BA=94=E7=9A=844=E4=B8=AAtab?=
 =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=98=BE=E7=A4=BA=E6=9C=AA?=
 =?UTF-8?q?noData=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/charts2/entityDetailTabs.scss       |  8 ++++
 .../charts/entityDetail/EntityDetailTabs.vue  | 11 ++++-
 .../entityDetail/tabs/AccountInformation.vue  |  9 +++-
 .../entityDetail/tabs/DeviceInformation.vue   |  9 +++-
 .../tabs/DomainNameResolution.vue             | 14 ++++--
 .../entityDetail/tabs/SecurityEvent.vue       | 43 +++++++++++--------
 6 files changed, 65 insertions(+), 29 deletions(-)

diff --git a/src/assets/css/components/views/charts2/entityDetailTabs.scss b/src/assets/css/components/views/charts2/entityDetailTabs.scss
index c7444cd1..c09be874 100644
--- a/src/assets/css/components/views/charts2/entityDetailTabs.scss
+++ b/src/assets/css/components/views/charts2/entityDetailTabs.scss
@@ -155,6 +155,14 @@
     margin-left: 8px;
   }
 
+  .entity-subscriber-detail-error {
+    margin-top: 0px;
+    margin-left: 0px;
+    .error-block {
+      margin:0px;
+    }
+  }
+
   .entity-detail-performance {
     height: 46px;
     border-radius: $tab-border-radius;
diff --git a/src/views/charts2/charts/entityDetail/EntityDetailTabs.vue b/src/views/charts2/charts/entityDetail/EntityDetailTabs.vue
index d4163682..70179dc5 100644
--- a/src/views/charts2/charts/entityDetail/EntityDetailTabs.vue
+++ b/src/views/charts2/charts/entityDetail/EntityDetailTabs.vue
@@ -126,7 +126,11 @@ export default {
         }
         const securityResponse = response[2].value
         if (securityResponse && securityResponse.status === 200) {
-          this.initSetTag(entityDetailTabsName.securityEvent, securityResponse.data.data.result.length)
+          if (this.entity.entityType === entityType.subscriber) {
+            this.initSetTag(entityDetailTabsName.securityEvent, 0)
+          } else {
+            this.initSetTag(entityDetailTabsName.securityEvent, securityResponse.data.data.result.length)
+          }
         }
         // let performanceResponse = response[3].value
         // if (performanceResponse && performanceResponse.status === 200) {
@@ -158,6 +162,7 @@ export default {
       }
 
       if (this.entity.entityType === entityType.subscriber) {
+        /*
         axios.get(api.entity.deviceInformation, { params: this.getParamsByTabType(entityDetailTabsName.deviceInformation) }).then(response => {
           const res = response.data
           if (response.status === 200) {
@@ -169,7 +174,9 @@ export default {
           if (response.status === 200) {
             this.initSetTag(entityDetailTabsName.accountInformation, res.data.result.length)
           }
-        })
+        }) */
+        this.initSetTag(entityDetailTabsName.deviceInformation, 0)
+        this.initSetTag(entityDetailTabsName.accountInformation, 0)
       }
     },
     promiseData (data1, data2, data3) {
diff --git a/src/views/charts2/charts/entityDetail/tabs/AccountInformation.vue b/src/views/charts2/charts/entityDetail/tabs/AccountInformation.vue
index 5887b0bb..e34d6d59 100644
--- a/src/views/charts2/charts/entityDetail/tabs/AccountInformation.vue
+++ b/src/views/charts2/charts/entityDetail/tabs/AccountInformation.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <chart-error v-if="showError" :content="errorMsg" class="entity-detail-event-error"></chart-error>
+    <chart-error v-if="showError" :content="errorMsg" class="entity-subscriber-detail-error"></chart-error>
     <chart-no-data v-if="isNoData && !showError"></chart-no-data>
 
     <div v-if="!showError && !isNoData && initFlag" class="type-data__column">
@@ -90,6 +90,7 @@ export default {
     initData () {
       const params = this.getParams()
       this.toggleLoading(true)
+      /*
       axios.get(api.entity.accountInformation, { params: params }).then(response => {
         const res = response.data
         if (response.status === 200) {
@@ -108,7 +109,11 @@ export default {
       }).finally(() => {
         this.initFlag = true
         this.toggleLoading(false)
-      })
+      }) */
+      this.isNoData = true
+      this.showError = false
+      this.initFlag = true
+      this.toggleLoading(false)
     },
     httpError (e) {
       this.$emit('checkTag', entityDetailTabsName.accountInformation, 0)
diff --git a/src/views/charts2/charts/entityDetail/tabs/DeviceInformation.vue b/src/views/charts2/charts/entityDetail/tabs/DeviceInformation.vue
index 43b4dd68..003bc53b 100644
--- a/src/views/charts2/charts/entityDetail/tabs/DeviceInformation.vue
+++ b/src/views/charts2/charts/entityDetail/tabs/DeviceInformation.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <chart-error v-if="showError" :content="errorMsg" class="entity-detail-event-error"></chart-error>
+    <chart-error v-if="showError" :content="errorMsg" class="entity-subscriber-detail-error"></chart-error>
     <chart-no-data v-if="isNoData && !showError"></chart-no-data>
 
     <div v-if="!showError && !isNoData && initFlag" class="type-data__column">
@@ -69,6 +69,7 @@ export default {
     initData () {
       const params = this.getParams()
       this.toggleLoading(true)
+      /*
       axios.get(this.url, { params: params }).then(response => {
         const res = response.data
         if (response.status === 200) {
@@ -87,7 +88,11 @@ export default {
       }).finally(() => {
         this.initFlag = true
         this.toggleLoading(false)
-      })
+      }) */
+      this.isNoData = true
+      this.showError = false
+      this.initFlag = true
+      this.toggleLoading(false)
     },
     httpError (e) {
       this.$emit('checkTag', entityDetailTabsName.deviceInformation, 0)
diff --git a/src/views/charts2/charts/entityDetail/tabs/DomainNameResolution.vue b/src/views/charts2/charts/entityDetail/tabs/DomainNameResolution.vue
index 5c1bd2c8..a8d1883b 100644
--- a/src/views/charts2/charts/entityDetail/tabs/DomainNameResolution.vue
+++ b/src/views/charts2/charts/entityDetail/tabs/DomainNameResolution.vue
@@ -73,7 +73,7 @@ import { api } from '@/utils/api'
 import { getNowTime } from '@/utils/date-util'
 import chartMixin from '@/views/charts2/chart-mixin'
 import chartNoData from '@/views/charts/charts/ChartNoData'
-import { entityDetailTabsName } from '@/utils/constants'
+import { entityDetailTabsName, entityType } from '@/utils/constants'
 import { ref } from 'vue'
 
 export default {
@@ -123,24 +123,30 @@ export default {
   methods: {
     initData () {
       const params = this.getParams()
-      if (this.entity.entityType === 'app') {
+      if (this.entity.entityType === entityType.app) {
         const ipsOfApp = axios.get(api.entity.domainNameResolutionAboutIpsOfApp, { params: params })
         const domainsOfApp = axios.get(api.entity.domainNameResolutionAboutDomainsOfApp, { params: params })
         this.promiseData(ipsOfApp, domainsOfApp)
       }
 
-      if (this.entity.entityType === 'ip') {
+      if (this.entity.entityType === entityType.ip) {
         const appsOfIp = axios.get(api.entity.domainNameResolutionAboutAppsOfIp, { params: params })
         const domainsOfIp = axios.get(api.entity.domainNameResolutionAboutDomainsOfIp, { params: params })
         this.promiseData(appsOfIp, domainsOfIp)
       }
 
-      if (this.entity.entityType === 'domain') {
+      if (this.entity.entityType === entityType.domain) {
         const appsOfDomain = axios.get(api.entity.domainNameResolutionAboutAppsOfDomain, { params: params })
         const ipsOfDomain = axios.get(api.entity.domainNameResolutionAboutIpsOfDomain, { params: params })
         const fqdnsOfDomain = axios.get(api.entity.domainNameResolutionAboutFQDNsOfDomain, { params: params })
         this.promiseData(appsOfDomain, ipsOfDomain, fqdnsOfDomain)
       }
+
+      if (this.entity.entityType === entityType.subscriber) {
+        this.isNoData = true
+        this.initFlag = true
+        this.toggleLoading(false)
+      }
     },
     promiseData (data1, data2, data3) {
       this.showError0 = false
diff --git a/src/views/charts2/charts/entityDetail/tabs/SecurityEvent.vue b/src/views/charts2/charts/entityDetail/tabs/SecurityEvent.vue
index a04ea6d3..c5fd7343 100644
--- a/src/views/charts2/charts/entityDetail/tabs/SecurityEvent.vue
+++ b/src/views/charts2/charts/entityDetail/tabs/SecurityEvent.vue
@@ -77,7 +77,7 @@
 
 <script>
 import { getNowTime } from '@/utils/date-util'
-import { eventSeverityColor, entityDetailTabsName, securityLevel } from '@/utils/constants'
+import { eventSeverityColor, entityDetailTabsName, securityLevel, entityType } from '@/utils/constants'
 import unitConvert from '@/utils/unit-convert'
 import axios from 'axios'
 import { api } from '@/utils/api'
@@ -133,25 +133,30 @@ export default {
     initData () {
       const params = this.getParams()
       this.toggleLoading(true)
-      axios.get(`${api.entity.security}/${this.entityType}`, { params: params }).then(response => {
-        const res = response.data
-
-        if (response.status === 200) {
-          this.isNoData = res.data.result.length === 0
-          this.$emit('checkTag', entityDetailTabsName.securityEvent, res.data.result.length)
-          this.showError = false
-          if (!this.isNoData) {
-            this.eventList = res.data.result
-          }
-        } else {
-          this.httpError(res)
-        }
-      }).catch(e => {
-        console.error(e)
-        this.httpError(e)
-      }).finally(() => {
+      if (this.entity.entityType === entityType.subscriber) {
+        this.isNoData = true
         this.toggleLoading(false)
-      })
+      } else {
+        axios.get(`${api.entity.security}/${this.entityType}`, { params: params }).then(response => {
+          const res = response.data
+
+          if (response.status === 200) {
+            this.isNoData = res.data.result.length === 0
+            this.$emit('checkTag', entityDetailTabsName.securityEvent, res.data.result.length)
+            this.showError = false
+            if (!this.isNoData) {
+              this.eventList = res.data.result
+            }
+          } else {
+            this.httpError(res)
+          }
+        }).catch(e => {
+          console.error(e)
+          this.httpError(e)
+        }).finally(() => {
+          this.toggleLoading(false)
+        })
+      }
     },
     httpError (e) {
       this.$emit('checkTag', entityDetailTabsName.securityEvent, 0)