From 5f448c0ccba6ef40920bf74cf1e617681d6e5442 Mon Sep 17 00:00:00 2001
From: hyx <hanyuxia@iie.ac.cn>
Date: Tue, 1 Nov 2022 10:33:23 +0800
Subject: [PATCH] =?UTF-8?q?CN-778=20=20=E4=B8=8B=E9=92=BBtable=E5=8F=96?=
 =?UTF-8?q?=E5=80=BC=E5=8F=98=E6=9B=B4=EF=BC=9A=20=20npm=E3=80=81dns?=
 =?UTF-8?q?=E3=80=81link=E7=9A=84throughput=E5=88=97=E5=8F=96=E5=80=BC?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BAtotalBytes=EF=BC=8C=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BAbyte=20CN-776=20NPM=20Dashboard=E7=BB=B4?=
 =?UTF-8?q?=E5=BA=A6=E8=A1=A8=E4=B8=AD=E5=88=86=E6=95=B0=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/charts2/networkOverviewTabs.scss           |  9 +++++++++
 src/utils/constants.js                               | 12 ++++++------
 .../charts/networkOverview/NetworkOverviewTabs.vue   | 10 +++++++++-
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/assets/css/components/views/charts2/networkOverviewTabs.scss b/src/assets/css/components/views/charts2/networkOverviewTabs.scss
index ef15415e..2a087ae3 100644
--- a/src/assets/css/components/views/charts2/networkOverviewTabs.scss
+++ b/src/assets/css/components/views/charts2/networkOverviewTabs.scss
@@ -115,6 +115,15 @@
       .el-table thead {
         color: $grey;
       }
+      .data-score-red {
+        color: #E26154;
+      }
+      .data-score-yellow {
+        color: #E5A219;
+      }
+      .data-score-green {
+        color: #749F4D;
+      }
     }
     .el-tabs__header {
       margin-bottom: 10px;
diff --git a/src/utils/constants.js b/src/utils/constants.js
index ecea5483..a2436300 100644
--- a/src/utils/constants.js
+++ b/src/utils/constants.js
@@ -291,7 +291,7 @@ export const customTableTitlesForAppPerformance = [
   { label: 'network.score', prop: 'score', checked: true, tabColumn: false, columnType: tableColumnType.normal },
   {
     label: 'networkAppPerformance.throughput',
-    prop: 'totalBitsRate',
+    prop: 'totalBytes',
     checked: true,
     tabColumn: false,
     columnType: tableColumnType.chainRatio,
@@ -379,7 +379,7 @@ export const customTableTitlesForLinkMonitor = [
   { label: 'network.score', prop: 'score', checked: true, tabColumn: false, columnType: tableColumnType.normal },
   {
     label: 'networkAppPerformance.throughput',
-    prop: 'totalBitsRate',
+    prop: 'totalBytes',
     checked: true,
     tabColumn: false,
     columnType: tableColumnType.chainRatio,
@@ -475,7 +475,7 @@ export const customTableTitlesForDns = [
   },
   { label: 'dns.queriesFromIE', prop: 'totalInExNum', checked: true, tabColumn: true, columnType: tableColumnType.percent },
   { label: 'dns.dnsResponseTime', prop: 'dnsResponseLatencyAvg', checked: true, tabColumn: true, columnType: tableColumnType.normal },
-  { label: 'overall.throughput', prop: 'totalBitsRate', checked: true, tabColumn: true, columnType: tableColumnType.normal }
+  { label: 'overall.throughput', prop: 'totalBytes', checked: true, tabColumn: true, columnType: tableColumnType.normal }
 ]
 // NetworkOverview类型表格的列:prop 为接口响应数据中的属性名
 export const customTableTitlesForNetworkOverview = [
@@ -1041,7 +1041,7 @@ export const dnsServiceInsightsTabList = [
 
 // 用于组织数据时的名称，对应的属性名称
 export const bytesColumnNameGroupForNpm = {
-  totalBitsRate: 'totalBitsRate',
+  totalBytes: 'totalBytes',
   tcpConEstLatency: 'establishLatencyMs',
   packetLoss: 'tcpLostlenPercent',
   packetRetrans: 'pktRetransPercent',
@@ -1050,7 +1050,7 @@ export const bytesColumnNameGroupForNpm = {
 }
 
 export const bytesCycleColumnNameGroupForNpm = {
-  totalBitsRate: 'totalBitsRate'
+  totalBytes: 'totalBytes'
 }
 
 // 用于组织数据时的名称，对应的属性名称
@@ -1058,7 +1058,7 @@ export const bytesColumnNameGroupForDns = {
   queryRate: 'queryRate',
   totalInExNum: 'totalInternalQueryNum,totalExternalQueryNum',
   dnsResponseLatencyAvg: 'dnsResponseLatencyAvg',
-  totalBitsRate: 'totalBitsRate'
+  totalBytes: 'totalBytes'
 }
 
 export const bytesCycleColumnNameGroupForDns = {
diff --git a/src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue b/src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue
index 8aa517a1..f61653ab 100644
--- a/src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue
+++ b/src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue
@@ -86,7 +86,15 @@
                     </div>
                   </template>
                   <template v-else-if="item.prop === 'score'" >
-                    {{scope.row[item.prop] ? unitConvert(scope.row[item.prop], unitTypes.number).join(' ') : ''}}
+                    <div v-if="scope.row.score <= 2" class="data-score-red" >
+                      {{scope.row[item.prop] ? unitConvert(scope.row[item.prop], unitTypes.number).join(' ') : ''}}
+                    </div>
+                    <div v-else-if="scope.row.score <= 4" class="data-score-yellow" >
+                      {{scope.row[item.prop] ? unitConvert(scope.row[item.prop], unitTypes.number).join(' ') : ''}}
+                    </div>
+                    <div v-else-if="scope.row.score <= 6" class="data-score-green" >
+                      {{scope.row[item.prop] ? unitConvert(scope.row[item.prop], unitTypes.number).join(' ') : ''}}
+                    </div>
                   </template>
                   <template v-else>
                     <template v-if="showUnit && item.unit">