From 06c86b8172d3a82061f5b5f590bbc01327ac5209 Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Tue, 25 Oct 2022 19:42:48 +0800
Subject: [PATCH] =?UTF-8?q?CN-768=20fix:=201.app=E5=8D=A1=E7=89=87Bit/s?=
 =?UTF-8?q?=E6=97=B6=E5=BA=95=E4=B8=8B=E7=9A=84=E6=B5=81=E9=87=8F=E6=80=BB?=
 =?UTF-8?q?=E6=95=B0=E7=9A=84=E5=8D=95=E4=BD=8D=E9=9C=80=E8=A6=81=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8byte2.=E6=8A=98=E7=BA=BF=E5=9B=BE=E5=8D=95=E4=B8=AA?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E9=BB=98=E8=AE=A4=E9=80=89=E4=B8=AD3.network?=
 =?UTF-8?q?=20overview=20=E7=9A=84=E5=8F=B3=E4=B8=8A=E8=A7=92=E5=9B=BE?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84=E6=8C=89=E9=92=AE=E7=82=B9=E5=87=BB=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E5=88=B0npm=E7=9A=84events?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../charts2/charts/dnsInsight/DnsTrafficLine.vue      |  8 ++++----
 .../charts/networkOverview/NetworkOverviewApps.vue    |  3 ++-
 .../charts/networkOverview/NetworkOverviewLine.vue    |  8 ++++----
 .../NetworkOverviewPerformanceEvent.vue               | 11 ++++++++++-
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/views/charts2/charts/dnsInsight/DnsTrafficLine.vue b/src/views/charts2/charts/dnsInsight/DnsTrafficLine.vue
index 051540f4..9f737988 100644
--- a/src/views/charts2/charts/dnsInsight/DnsTrafficLine.vue
+++ b/src/views/charts2/charts/dnsInsight/DnsTrafficLine.vue
@@ -235,13 +235,13 @@ export default {
                   e.show = false
                 }
                 e.unitType = 'queries/s'
-                if (show !== this.lineRefer) {
-                  this.legendSelectChange(e, 0)
-                }
+                e.invertTab = false
+                this.lineTab = 'total'
+                this.legendSelectChange(e, 0)
               })
               this.mpackets = mpackets
               this.$nextTick(() => {
-                this.echartsInit(this.mpackets, show)
+                this.echartsInit(this.mpackets, true)
               })
             }
           })
diff --git a/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue b/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue
index e0dee941..89c2f89d 100644
--- a/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue
+++ b/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue
@@ -53,7 +53,8 @@
             </div>
             <div class="app-card__body-previous">
               <div>Total</div>
-              <div>{{unitConvert(app.total, unitTypes.number).join(' ')}}</div>
+              <div v-if="metricFilter === 'Bits/s'">{{unitConvert(app.total, unitTypes.byte).join(' ')}}</div>
+              <div v-else>{{unitConvert(app.total, unitTypes.number).join(' ')}}</div>
             </div>
           </div>
           <div class="chart__drawing" v-show="!isNoData" :id="`chart-${app.name}-${app.type}`"></div>
diff --git a/src/views/charts2/charts/networkOverview/NetworkOverviewLine.vue b/src/views/charts2/charts/networkOverview/NetworkOverviewLine.vue
index 22249512..60ea5722 100644
--- a/src/views/charts2/charts/networkOverview/NetworkOverviewLine.vue
+++ b/src/views/charts2/charts/networkOverview/NetworkOverviewLine.vue
@@ -281,13 +281,13 @@ export default {
                   e.show = false
                 }
                 e.unitType = 'sessions/s'
-                if (show !== this.lineRefer) {
-                  this.legendSelectChange(e, 0)
-                }
+                e.invertTab = false
+                this.lineTab = 'total'
+                this.legendSelectChange(e, 0)
               })
               this.mpackets = mpackets
               this.$nextTick(() => {
-                this.echartsInit(this.mpackets, show)
+                this.echartsInit(this.mpackets, true)
               })
             }
           })
diff --git a/src/views/charts2/charts/networkOverview/NetworkOverviewPerformanceEvent.vue b/src/views/charts2/charts/networkOverview/NetworkOverviewPerformanceEvent.vue
index d423f2d1..4d025048 100644
--- a/src/views/charts2/charts/networkOverview/NetworkOverviewPerformanceEvent.vue
+++ b/src/views/charts2/charts/networkOverview/NetworkOverviewPerformanceEvent.vue
@@ -12,7 +12,7 @@
         <div class="chart-drawing" id="chart2" v-show="!isNoData2"></div>
       </div>
     </div>
-    <el-button class="pie-button" size="small">{{$t('network.dashboards')}}<i class="cn-icon cn-icon-arrow-right"></i></el-button>
+    <el-button class="pie-button" size="small" @click="routerJump">{{$t('network.dashboards')}}<i class="cn-icon cn-icon-arrow-right"></i></el-button>
   </div>
 </template>
 
@@ -125,6 +125,15 @@ export default {
         })
       }
     },
+    routerJump () {
+      this.$router.push({
+        path: '/panel/networkAppPerformance',
+        query: {
+          tabIndex: 2,
+          t: +new Date()
+        }
+      })
+    },
     resize () {
       this.myChart.resize()
       this.myChart2.resize()