From f6f82d26c4fa64b0b1687a846a3b551a5215386d Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Sun, 27 Mar 2022 13:05:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=9E=E4=BD=93=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/entityExplorer/entityList/card.scss |  2 +-
 src/views/entityExplorer/entityList/Card.vue  | 47 ++++++++++---------
 .../detailOverview/entityDetailMixin.js       |  9 ++--
 3 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/assets/css/components/views/entityExplorer/entityList/card.scss b/src/assets/css/components/views/entityExplorer/entityList/card.scss
index eadf5f49..76cc46ad 100644
--- a/src/assets/css/components/views/entityExplorer/entityList/card.scss
+++ b/src/assets/css/components/views/entityExplorer/entityList/card.scss
@@ -160,7 +160,7 @@
       .body__detail {
         cursor: pointer;
         font-size: 14px;
-        color: #8FA1BE;
+        color: #3976CB;
         position: absolute;
         right: 30px;
       }
diff --git a/src/views/entityExplorer/entityList/Card.vue b/src/views/entityExplorer/entityList/Card.vue
index 5d7b8091..6a390b4f 100644
--- a/src/views/entityExplorer/entityList/Card.vue
+++ b/src/views/entityExplorer/entityList/Card.vue
@@ -45,19 +45,25 @@
         </div>
         <div class="body__row">
           <span class="body__row-label"><i class="cn-icon cn-icon-entity-alert"></i>{{$t('entities.recentAlert')}}：</span>
-          <div class="body__row-value" :title="entityData.alertCount">{{entityData.alertCount || '-'}}</div>
+          <div class="body__row-value" :title="entityData.performanceCount">{{entityData.performanceCount}}</div>
         </div>
         <div class="body__row">
           <span class="body__row-label"><i class="cn-icon cn-icon-safe"></i>{{$t('entities.recentSecurity')}}：</span>
-          <div class="body__row-value" :title="entityData.securityCount">{{entityData.securityCount || '-'}}</div>
+          <div class="body__row-value" :title="entityData.securityCount">{{entityData.securityCount}}</div>
         </div>
         <!-- 曲线-->
         <div class="body__drawing-box">
-          <div class="body__drawing" :id="`entityListChart${entityData.ipAddr}`"></div>
+          <div class="body__drawing" :id="`entityListChart${entityData.ipAddr}${listMode}`"></div>
         </div>
         <div class="body__statics">
-          <div class="entity-statics-down"><i class="cn-icon cn-icon-fall entity-statics-icon"></i>{{entityData.bytesReceivedRate || 0}} bps</div>
-          <div class="entity-statics-up" ><i class="cn-icon cn-icon-rise"></i>{{entityData.bytesSentRate || 0}} bps</div>
+          <div class="entity-statics-down">
+            <i class="cn-icon cn-icon-fall entity-statics-icon"></i>
+            {{entityData.bytesReceivedRate ? unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ') + 'ps' : '-'}}
+          </div>
+          <div class="entity-statics-up" >
+            <i class="cn-icon cn-icon-rise"></i>
+            {{entityData.bytesSentRate ? unitConvert(entityData.bytesSentRate, unitTypes.byte).join(' ') + 'ps' : '-'}}
+          </div>
           <div class="body__detail" @click="showDetail">{{$t('overall.detail')}}></div>
         </div>
       </template>
@@ -76,19 +82,24 @@
         </div>
         <div class="body__row">
           <span class="body__row-label"><i class="cn-icon cn-icon-entity-alert"></i>{{$t('entities.recentAlert')}}：</span>
-          <div class="body__row-value" :title="entityData.alertCount">{{entityData.alertCount || '-'}}</div>
+          <div class="body__row-value" :title="entityData.performanceCount">{{entityData.performanceCount}}</div>
         </div>
         <div class="body__row">
           <span class="body__row-label"><i class="cn-icon cn-icon-safe"></i>{{$t('entities.recentSecurity')}}：</span>
-          <div class="body__row-value" :title="entityData.securityCount">{{entityData.securityCount || '-'}}</div>
+          <div class="body__row-value" :title="entityData.securityCount">{{entityData.securityCount}}</div>
         </div>
         <!-- 曲线-->
         <div class="body__drawing-box">
-          <div class="body__drawing" :id="`entityListChart${entityData.domainName}`"></div>
+          <div class="body__drawing" :id="`entityListChart${entityData.domainName}${listMode}`"></div>
         </div>
         <div class="body__statics">
-          <div class="entity-statics-down"><i class="cn-icon cn-icon-fall entity-statics-icon"></i>{{entityData.bytesReceivedRate || 0}} bps</div>
-          <div class="entity-statics-up" ><i class="cn-icon cn-icon-rise"></i>{{entityData.bytesSentRate || 0}} bps</div>
+          <div class="entity-statics-down"><i class="cn-icon cn-icon-fall entity-statics-icon"></i>
+            {{entityData.bytesReceivedRate ? unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ') + 'ps' : '-'}}
+          </div>
+          <div class="entity-statics-up" >
+            <i class="cn-icon cn-icon-rise"></i>
+            {{entityData.bytesSentRate ? unitConvert(entityData.bytesSentRate, unitTypes.byte).join(' ') + 'ps' : '-'}}
+          </div>
           <div class="body__detail" @click="showDetail">{{$t('overall.detail')}}></div>
         </div>
       </template>
@@ -107,15 +118,15 @@
         </div>
         <div class="body__row">
           <span class="body__row-label"><i class="cn-icon cn-icon-entity-alert"></i>{{$t('entities.recentAlert')}}：</span>
-          <div class="body__row-value" :title="entityData.alertCount">{{entityData.alertCount || '-'}}</div>
+          <div class="body__row-value" :title="entityData.performanceCount">{{entityData.performanceCount}}</div>
         </div>
         <div class="body__row">
           <span class="body__row-label"><i class="cn-icon cn-icon-safe"></i>{{$t('entities.recentSecurity')}}：</span>
-          <div class="body__row-value" :title="entityData.securityCount">{{entityData.securityCount || '-'}}</div>
+          <div class="body__row-value" :title="entityData.securityCount">{{entityData.securityCount}}</div>
         </div>
         <!-- 曲线-->
         <div class="body__drawing-box">
-                <div class="body__drawing" :id="`entityListChart${entityData.appName}`"></div>
+          <div class="body__drawing" :id="`entityListChart${entityData.appName}${listMode}`"></div>
         </div>
         <div class="body__statics">
           <div class="entity-statics-down"><i class="cn-icon cn-icon-fall entity-statics-icon"></i>{{entityData.bytesReceivedRate ? unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ') + 'ps' : '-'}}</div>
@@ -129,16 +140,8 @@
 
 <script>
 import entityListMixin from './entityListMixin'
-import { unitTypes } from '@/utils/constants'
-import unitConvert from '@/utils/unit-convert'
 export default {
   name: 'Card',
-  mixins: [entityListMixin],
-  setup () {
-    return {
-      unitTypes,
-      unitConvert
-    }
-  }
+  mixins: [entityListMixin]
 }
 </script>
diff --git a/src/views/entityExplorer/entityList/detailOverview/entityDetailMixin.js b/src/views/entityExplorer/entityList/detailOverview/entityDetailMixin.js
index e9dacf80..328a65f3 100644
--- a/src/views/entityExplorer/entityList/detailOverview/entityDetailMixin.js
+++ b/src/views/entityExplorer/entityList/detailOverview/entityDetailMixin.js
@@ -24,6 +24,7 @@ export default {
         sentChart: null,
         receivedChart: null
       },
+      chartOption: null,
       queryParams: {}
     }
   },
@@ -237,20 +238,16 @@ export default {
       this.queryEntityDetailNetworkQuantity()
       this.queryEntityDetailLinkOutUrl()
       this.queryEntityDetailLinkInUrl()
-      this.queryRelated()
     }
   },
   setup () {
     return {
-      chartOption: entityListLineOption,
       unitTypes,
       unitConvert
     }
   },
   mounted () {
-    if (this.listMode === 'list') {
-      this.chartOption = _.cloneDeep(entityListLineOption)
-      setTimeout(() => { this.queryEntityDetail() })
-    }
+    this.chartOption = _.cloneDeep(entityListLineOption)
+    setTimeout(() => { this.queryEntityDetail() })
   }
 }