Merge branch 'dev' of https://git.mesalab.cn/cyber-narrator/cn-ui into dev

src/views/entityExplorer/entityList/Row.vue

@@ -54,7 +54,7 @@
                 <div class="basic-info__item">
                   <i class="cn-icon cn-icon-category"></i>
                   <span>{{$t('entities.subcategory')}}&nbsp;:&nbsp;&nbsp;</span>
-                  <span>{{entityData.appSubategory || '-'}}</span>
+                  <span>{{entityData.appSubcategory || '-'}}</span>
                 </div>
                 <div class="basic-info__item">
                   <i class="cn-icon cn-icon-sub-category"></i>

src/views/entityExplorer/entityList/detailOverview/Domain.vue

@@ -217,6 +217,7 @@ export default {
       trafficUrlMap: api.entityDomainDetailTrafficMap,
       relatedServerIpUrl: api.entityDomainRelatedServerIp,
       relatedServerAppUrl: api.entityDomainRelatedServerApp,
+      basicProperties:api.entityDomainDetailBasic,
       chartData: null,
       listMode: 'list',
       singleValues: {
@@ -285,6 +286,13 @@ export default {
           this.chartData = response.data.result
         }
       })
+    },
+    getBasicProperties(){
+      get(this.basicProperties, this.getQueryParams()).then(response => {
+        if (response.code === 200) {
+          this.entityData = response.data.result
+        }
+      })
     }
   },
   watch: {
@@ -311,6 +319,7 @@ export default {
     this.$nextTick(() => {
       setTimeout(() => {
         this.chartGetMap()
+        this.getBasicProperties()
       }, 250)
     })
   },