CN-1717 fix: 修复entityType传参问题

3 files changed, 10 insertions, 10 deletions

diff --git a/src/views/entityExplorer/entityList/Row.vue b/src/views/entityExplorer/entityList/Row.vue
index 41873600..e0d18b9e 100644
--- a/src/views/entityExplorer/entityList/Row.vue
+++ b/src/views/entityExplorer/entityList/Row.vue
@@ -91,7 +91,7 @@
                   <span class="row-item-value">{{ entityData.category ? appRisk(entityData.category.appRisk) : '-' }}</span>
                 </div>
               </template>
-              <template v-else-if="entityData.entityType === 'subscriber'">
+              <template v-else-if="entityData.entityType === 'subscriber_id'">
                 <div class="basic-info__item">
                   <i class="cn-icon cn-icon-shoujihaoma"></i>
                   <span class="row-item-label">MSISDN&nbsp;:&nbsp;&nbsp;</span>
@@ -167,7 +167,7 @@
       <div class="show-detail__block">
         <div class="new-show-detail">
           <div @click="showDetail"><i class="cn-icon cn-icon-detail"></i>{{ $t('overall.detail') }} ></div>
-          <div @click="showGraph" v-if="entity.entityType !== 'subscriber'"><i class="cn-icon cn-icon-graph"></i>{{ $t('entities.graph') }} ></div>
+          <div @click="showGraph" v-if="entity.entityType !== 'subscriber_id'"><i class="cn-icon cn-icon-graph"></i>{{ $t('entities.graph') }} ></div>
         </div>
       </div>
       <el-collapse-transition>
@@ -277,7 +277,7 @@ export default {
           url = api.entity.entityList.appBasicInfo
           break
         }
-        case ('subscriber'): {
+        case ('subscriber_id'): {
           url = api.entity.entityList.subscriberBasicInfo
           break
         }
@@ -300,12 +300,12 @@ export default {
           url = api.entity.entityList.ipTags
           break
         }
-        case ('subscriber'): {
+        case ('subscriber_id'): {
           url = api.entity.entityList.subscriberTags
           break
         }
       }
-      if (this.entity.entityType === 'domain' || this.entity.entityType === 'ip' || this.entity.entityType === 'subscriber') {
+      if (this.entity.entityType === 'domain' || this.entity.entityType === 'ip' || this.entity.entityType === 'subscriber_id') {
         axios.get(`${url}?resource=${this.entity.entityValue}`).then(responese => {
           const res = responese.data
           if (responese.status === 200) {
diff --git a/src/views/entityExplorer/entityList/detailOverview/DetailOverview.vue b/src/views/entityExplorer/entityList/detailOverview/DetailOverview.vue
index e03e89fa..69dfa45e 100644
--- a/src/views/entityExplorer/entityList/detailOverview/DetailOverview.vue
+++ b/src/views/entityExplorer/entityList/detailOverview/DetailOverview.vue
@@ -9,7 +9,7 @@
     <template v-else-if="entity.entityType === 'app'">
       <app-overview :entity="entity" :time-filter="timeFilter" :keywordList="keywordList" @reloadEntity="getEntity" @eventNum="getEventNum"></app-overview>
     </template>
-    <template v-else-if="entity.entityType === 'subscriber'">
+    <template v-else-if="entity.entityType === 'subscriber_id'">
       <subscriber-overview :entity="entity" :time-filter="timeFilter" :keywordList="keywordList" @reloadEntity="getEntity" @eventNum="getEventNum"></subscriber-overview>
     </template>
   </div>
diff --git a/src/views/entityExplorer/entityList/entityListMixin.js b/src/views/entityExplorer/entityList/entityListMixin.js
index e550afe1..c69a906d 100644
--- a/src/views/entityExplorer/entityList/entityListMixin.js
+++ b/src/views/entityExplorer/entityList/entityListMixin.js
@@ -51,7 +51,7 @@ export default {
           className = 'cn-icon cn-icon-app2'
           break
         }
-        case 'subscriber': {
+        case 'subscriber_id': {
           className = 'cn-icon cn-icon-pedestrian'
           break
         }
@@ -125,7 +125,7 @@ export default {
   methods: {
     showDetail () {
       const queryParam = {
-        entityType: this.entityData.entityType,
+        entityType: this.entityData.entityType === 'subscriber_id' ? 'subscriber' : this.entityData.entityType,
         entityName: this.entityData.entityValue,
         range: this.timeFilter.dateRangeValue
       }
@@ -273,7 +273,7 @@ export default {
             this.performanceEventUrl = api.entity.entityList.appEventPerformance
             break
           }
-          case 'subscriber': {
+          case 'subscriber_id': {
             this.trafficUrl = api.entity.entityList.subscriberThroughput
             break
           }
@@ -361,7 +361,7 @@ export default {
     this.initUrl()
     setTimeout(() => {
       this.queryEntityDetailTraffic()
-      if (this.entity.entityType !== 'subscriber') {
+      if (this.entity.entityType !== 'subscriber_id') {
         this.queryNetworkQuantity()
         this.queryEventNum()
       }