From 48c3df2b006c09c5baf9216010d12c2f8f6abd86 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Tue, 5 Sep 2023 17:13:44 +0800
Subject: [PATCH] =?UTF-8?q?CN-1272=20fix:=20=E4=BF=AE=E5=A4=8D=E6=9C=89?=
 =?UTF-8?q?=E4=BA=9B=E9=80=9F=E7=8E=87=E5=8D=95=E4=BD=8D=E7=94=A8=E4=BA=86?=
 =?UTF-8?q?=E5=A4=A7=E5=86=99B=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/entityExplorer/entityList/Row.vue            |  4 ++--
 .../entityExplorer/entityList/detailOverview/App.vue   | 10 +++++-----
 .../entityList/detailOverview/Domain.vue               |  8 ++++----
 .../entityExplorer/entityList/detailOverview/Ip.vue    | 10 +++++-----
 .../entityList/detailOverview/entityDetailMixin.js     |  4 ++--
 src/views/entityExplorer/entityList/entityListMixin.js |  4 ++--
 6 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/views/entityExplorer/entityList/Row.vue b/src/views/entityExplorer/entityList/Row.vue
index de219e64..d89196d1 100644
--- a/src/views/entityExplorer/entityList/Row.vue
+++ b/src/views/entityExplorer/entityList/Row.vue
@@ -80,7 +80,7 @@
                   <span class="row-item-label">{{ $t('entities.sentThroughput') }}&nbsp;:&nbsp;&nbsp;</span>
                   <span class="row-item-value">
                     {{
-                      valueToRangeValue(entityData.bytesSentRate, unitTypes.byte).join(' ') !=='- ' ? valueToRangeValue(entityData.bytesSentRate, unitTypes.byte).join(' ') + 'ps' : '-'
+                      valueToRangeValue(entityData.bytesSentRate, unitTypes.bps).join(' ') !=='- ' ? valueToRangeValue(entityData.bytesSentRate, unitTypes.bps).join(' ') : '-'
                     }}
                   </span>
                   <!-- 曲线-->
@@ -110,7 +110,7 @@
                   <i class="cn-icon cn-icon-fall"></i>
                   <span class="row-item-label">{{ $t('entities.receivedThroughput') }}&nbsp;:&nbsp;&nbsp;</span>
                   <span class="row-item-value">
-                    {{ valueToRangeValue(entityData.bytesReceivedRate, unitTypes.byte).join(' ') !== '- ' ? valueToRangeValue(entityData.bytesReceivedRate, unitTypes.byte).join(' ') + 'ps' : '-' }}
+                    {{ valueToRangeValue(entityData.bytesReceivedRate, unitTypes.bps).join(' ') !== '- ' ? valueToRangeValue(entityData.bytesReceivedRate, unitTypes.bps).join(' ') : '-' }}
                   </span>
                   <div class="item-box-loading">
                     <loading :loading="loading" size="small"></loading>
diff --git a/src/views/entityExplorer/entityList/detailOverview/App.vue b/src/views/entityExplorer/entityList/detailOverview/App.vue
index 7133b57b..fe6c8428 100644
--- a/src/views/entityExplorer/entityList/detailOverview/App.vue
+++ b/src/views/entityExplorer/entityList/detailOverview/App.vue
@@ -31,13 +31,13 @@
       <div class="overview__row">
         <div class="row__label row__label--width130">{{$t('overall.peak')}}</div>
         <div class="row__content">
-          {{valueToRangeValue(entityData.max, unitTypes.byte).join(' ') !== '- ' ? valueToRangeValue(entityData.max, unitTypes.byte).join(' ') + '/s' : '-'}}
+          {{valueToRangeValue(entityData.max, unitTypes.bps).join(' ') !== '- ' ? valueToRangeValue(entityData.max, unitTypes.bps).join(' ') : '-'}}
         </div>
       </div>
       <div class="overview__row">
-        <div class="row__label row__label--width130">{{$t('overall.mean')}}</div>
+        <div class="row__label row__label--width130">{{$t('overall.average')}}</div>
         <div class="row__content">
-          {{valueToRangeValue(entityData.avg, unitTypes.byte).join(' ') !== '- ' ? valueToRangeValue(entityData.avg, unitTypes.byte).join(' ') + '/s' : '-'}}
+          {{valueToRangeValue(entityData.avg, unitTypes.bps).join(' ') !== '- ' ? valueToRangeValue(entityData.avg, unitTypes.bps).join(' ') : '-'}}
         </div>
       </div>
       <div class="overview__row">
@@ -45,7 +45,7 @@
         <div class="row__contents">
           <div class="row__content">
             <div class="row__charts-msg">{{$t('overall.sent')}}：
-              {{valueToRangeValue(entityData.bytesSentRate, unitTypes.byte).join(' ') !== '- ' ? valueToRangeValue(entityData.bytesSentRate, unitTypes.byte).join(' ') + 'ps' : '-'}}
+              {{valueToRangeValue(entityData.bytesSentRate, unitTypes.bps).join(' ') !== '- ' ? valueToRangeValue(entityData.bytesSentRate, unitTypes.bps).join(' ') : '-'}}
             </div>
             <!-- 曲线-->
             <div class="row__content-loading">
@@ -54,7 +54,7 @@
           </div>
           <div class="row__content row__content-accept">
             <div class="row__charts-msg">{{$t('overall.received')}}：
-              {{valueToRangeValue(entityData.bytesReceivedRate, unitTypes.byte).join(' ') !== '- ' ? valueToRangeValue(entityData.bytesReceivedRate, unitTypes.byte).join(' ') + 'ps' : '-'}}
+              {{valueToRangeValue(entityData.bytesReceivedRate, unitTypes.bps).join(' ') !== '- ' ? valueToRangeValue(entityData.bytesReceivedRate, unitTypes.bps).join(' ') : '-'}}
             </div>
             <!-- 曲线-->
             <div class="row__content-loading">
diff --git a/src/views/entityExplorer/entityList/detailOverview/Domain.vue b/src/views/entityExplorer/entityList/detailOverview/Domain.vue
index 81d1e7ad..b8d04589 100644
--- a/src/views/entityExplorer/entityList/detailOverview/Domain.vue
+++ b/src/views/entityExplorer/entityList/detailOverview/Domain.vue
@@ -39,13 +39,13 @@
       <div class="overview__row">
         <div class="row__label row__label--width130">{{$t('overall.peak')}}</div>
         <div class="row__content">
-          {{valueToRangeValue(entityData.max, unitTypes.byte).join(' ') !== '- ' ? valueToRangeValue(entityData.max, unitTypes.byte).join(' ') + '/s' : '-'}}
+          {{valueToRangeValue(entityData.max, unitTypes.bps).join(' ') !== '- ' ? valueToRangeValue(entityData.max, unitTypes.bps).join(' ') : '-'}}
         </div>
       </div>
       <div class="overview__row">
         <div class="row__label row__label--width130">{{$t('overall.average')}}</div>
         <div class="row__content">
-          {{valueToRangeValue(entityData.avg, unitTypes.byte).join(' ') !== '- ' ? valueToRangeValue(entityData.avg, unitTypes.byte).join(' ') + '/s' : '-'}}
+          {{valueToRangeValue(entityData.avg, unitTypes.bps).join(' ') !== '- ' ? valueToRangeValue(entityData.avg, unitTypes.bps).join(' ') : '-'}}
         </div>
       </div>
       <div class="overview__row">
@@ -53,7 +53,7 @@
         <div class="row__contents">
           <div class="row__content">
             <div class="row__charts-msg">{{$t('overall.sent')}}：
-              {{valueToRangeValue(entityData.bytesSentRate, unitTypes.byte).join(' ') !== '- ' ? valueToRangeValue(entityData.bytesSentRate, unitTypes.byte).join(' ') + 'ps' : '-'}}
+              {{valueToRangeValue(entityData.bytesSentRate, unitTypes.bps).join(' ') !== '- ' ? valueToRangeValue(entityData.bytesSentRate, unitTypes.bps).join(' ') : '-'}}
             </div>
             <!-- 曲线-->
             <div class="row__content-loading">
@@ -62,7 +62,7 @@
           </div>
           <div class="row__content row__content-accept">
             <div class="row__charts-msg">{{$t('overall.received')}}：
-              {{valueToRangeValue(entityData.bytesReceivedRate, unitTypes.byte).join(' ') !== '- ' ? valueToRangeValue(entityData.bytesReceivedRate, unitTypes.byte).join(' ') + 'ps' : '-'}}
+              {{valueToRangeValue(entityData.bytesReceivedRate, unitTypes.bps).join(' ') !== '- ' ? valueToRangeValue(entityData.bytesReceivedRate, unitTypes.bps).join(' ') : '-'}}
             </div>
             <!-- 曲线-->
             <div class="row__content-loading">
diff --git a/src/views/entityExplorer/entityList/detailOverview/Ip.vue b/src/views/entityExplorer/entityList/detailOverview/Ip.vue
index bc1cab9d..8396028d 100644
--- a/src/views/entityExplorer/entityList/detailOverview/Ip.vue
+++ b/src/views/entityExplorer/entityList/detailOverview/Ip.vue
@@ -53,7 +53,7 @@
         <div class="row__label row__label--width130">{{$t('overall.dnsServerInfo.queryRate')}}</div>
         <div class="row__contents">
           <div class="row__content">
-            <div class="row__charts-msg">{{valueToRangeValue(entityData.queryRate, unitTypes.byte).join(' ')}}ps</div>
+            <div class="row__charts-msg">{{valueToRangeValue(entityData.queryRate, unitTypes.bps).join(' ')}}</div>
             <!-- 曲线-->
             <div class="row__content-loading">
               <loading :loading="!loadingDns && loading" size="small"></loading>
@@ -71,13 +71,13 @@
       <div class="overview__row">
         <div class="row__label row__label--width130">{{$t('overall.peak')}}</div>
         <div class="row__content">
-          {{valueToRangeValue(entityData.max, unitTypes.byte).join(' ') !== '- ' ? valueToRangeValue(entityData.max, unitTypes.byte).join(' ') + '/s' : '-'}}
+          {{valueToRangeValue(entityData.max, unitTypes.bps).join(' ') !== '- ' ? valueToRangeValue(entityData.max, unitTypes.bps).join(' ') : '-'}}
         </div>
       </div>
       <div class="overview__row">
         <div class="row__label row__label--width130">{{$t('overall.average')}}</div>
         <div class="row__content">
-          {{valueToRangeValue(entityData.avg, unitTypes.byte).join(' ') !== '- ' ? valueToRangeValue(entityData.avg, unitTypes.byte).join(' ') + '/s' : '-'}}
+          {{valueToRangeValue(entityData.avg, unitTypes.bps).join(' ') !== '- ' ? valueToRangeValue(entityData.avg, unitTypes.bps).join(' ') : '-'}}
         </div>
       </div>
       <div class="overview__row">
@@ -85,7 +85,7 @@
         <div class="row__contents">
           <div class="row__content">
             <div class="row__charts-msg">{{$t('overall.sent')}}:
-              {{valueToRangeValue(entityData.bytesSentRate, unitTypes.byte).join(' ') !== '- ' ? valueToRangeValue(entityData.bytesSentRate, unitTypes.byte).join(' ') + 'ps' : '-'}}
+              {{valueToRangeValue(entityData.bytesSentRate, unitTypes.bps).join(' ') !== '- ' ? valueToRangeValue(entityData.bytesSentRate, unitTypes.bps).join(' ') : '-'}}
             </div>
             <!-- 曲线-->
             <div class="row__content-loading">
@@ -94,7 +94,7 @@
           </div>
           <div class="row__content row__content-accept">
             <div class="row__charts-msg">{{$t('overall.received')}}:
-              {{valueToRangeValue(entityData.bytesReceivedRate, unitTypes.byte).join(' ') !== '- ' ? valueToRangeValue(entityData.bytesReceivedRate, unitTypes.byte).join(' ') + 'ps' : '-'}}
+              {{valueToRangeValue(entityData.bytesReceivedRate, unitTypes.bps).join(' ') !== '- ' ? valueToRangeValue(entityData.bytesReceivedRate, unitTypes.bps).join(' ') : '-'}}
             </div>
             <!-- 曲线-->
             <div class="row__content-loading">
diff --git a/src/views/entityExplorer/entityList/detailOverview/entityDetailMixin.js b/src/views/entityExplorer/entityList/detailOverview/entityDetailMixin.js
index e45d9a6b..032f6591 100644
--- a/src/views/entityExplorer/entityList/detailOverview/entityDetailMixin.js
+++ b/src/views/entityExplorer/entityList/detailOverview/entityDetailMixin.js
@@ -111,7 +111,7 @@ export default {
               this.entityData.p50 = t.aggregation.p50
               this.entityData.p90 = t.aggregation.p90
             } else if (t.legend === 'bytesSentRate') {
-              this.entityData.bytesSentRate = _.nth(t.values, -3)[1]
+              this.entityData.bytesSentRate = t.aggregation.avg
               this.chartOptionSent = {
                 ...this.chartOption,
                 series: [
@@ -131,7 +131,7 @@ export default {
                 ]
               }
             } else if (t.legend === 'bytesReceivedRate') {
-              this.entityData.bytesReceivedRate = t.aggregation.last
+              this.entityData.bytesReceivedRate = t.aggregation.avg
               this.chartOptionReceived = {
                 ...this.chartOption,
                 series: [
diff --git a/src/views/entityExplorer/entityList/entityListMixin.js b/src/views/entityExplorer/entityList/entityListMixin.js
index 34cb796f..629c7d7e 100644
--- a/src/views/entityExplorer/entityList/entityListMixin.js
+++ b/src/views/entityExplorer/entityList/entityListMixin.js
@@ -120,7 +120,7 @@ export default {
               this.entityData.p50 = t.aggregation.p50
               this.entityData.p90 = t.aggregation.p90
             } else if (t.legend === 'bytesSentRate') {
-              this.entityData.bytesSentRate = _.nth(t.values, -3)[1]
+              this.entityData.bytesSentRate = t.aggregation.avg
               sentSeries = {
                 name: i18n.global.t('entities.sentThroughput'),
                 type: 'line',
@@ -135,7 +135,7 @@ export default {
                 showSymbol: false
               }
             } else if (t.legend === 'bytesReceivedRate') {
-              this.entityData.bytesReceivedRate = t.aggregation.last
+              this.entityData.bytesReceivedRate = t.aggregation.avg
               receivedSeries = {
                 name: i18n.global.t('entities.receivedThroughput'),
                 type: 'line',