From ef73a68ac2b18b2f005118015c0394d654fe3ceb Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Mon, 22 Aug 2022 19:54:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=201.=E4=BF=AE=E5=A4=8D=20no=20Data=20?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=9B2.=E6=8A=98=E7=BA=BF=E5=9B=BE?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9=EF=BC=9B3.=E5=85=B3?=
 =?UTF-8?q?=E8=81=94session=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../charts/networkOverview/NetworkOverviewApps.vue     |  1 +
 .../charts/networkOverview/NetworkOverviewLine.vue     |  4 ++--
 .../charts/networkOverview/NetworkOverviewTabs.vue     |  1 +
 src/views/charts2/charts/npm/NpmAppCategoryScore.vue   | 10 +---------
 src/views/charts2/charts/npm/RelatedSessions.vue       |  4 ++--
 5 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue b/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue
index 72fd11c4..6e439b49 100644
--- a/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue
+++ b/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue
@@ -246,6 +246,7 @@ export default {
       }
     },
     handleData (prevRequest, request, _t) {
+      this.toggleLoading(true)
       Promise.all([prevRequest, request]).then(res => {
         if (res[0].code === 200 && res[1].code === 200) {
           const prevData = res[0].data.result
diff --git a/src/views/charts2/charts/networkOverview/NetworkOverviewLine.vue b/src/views/charts2/charts/networkOverview/NetworkOverviewLine.vue
index 3d1f0053..632b7429 100644
--- a/src/views/charts2/charts/networkOverview/NetworkOverviewLine.vue
+++ b/src/views/charts2/charts/networkOverview/NetworkOverviewLine.vue
@@ -171,13 +171,13 @@ export default {
               mpackets[1].analysis = t.inboundBitsRate.analysis
               mpackets[2].analysis = t.outboundBitsRate.analysis
               mpackets[3].analysis = t.internalBitsRate.analysis
-              mpackets[4].analysis = t.externalBitsRate.analysis
+              mpackets[4].analysis = t.throughBitsRate.analysis
               mpackets[5].analysis = t.other.analysis
               mpackets[0].data = t.totalBitsRate.values ? t.totalBitsRate.values : []
               mpackets[1].data = t.inboundBitsRate.values ? t.inboundBitsRate.values : []
               mpackets[2].data = t.outboundBitsRate.values ? t.outboundBitsRate.values : []
               mpackets[3].data = t.internalBitsRate.values ? t.internalBitsRate.values : []
-              mpackets[4].data = t.externalBitsRate.values ? t.externalBitsRate.values : []
+              mpackets[4].data = t.throughBitsRate.values ? t.throughBitsRate.values : []
               mpackets[5].data = t.other.values ? t.other.values : []
               mpackets.forEach(e => {
                 e.unitType = 'bps'
diff --git a/src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue b/src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue
index 78eea853..aaf97313 100644
--- a/src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue
+++ b/src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue
@@ -24,6 +24,7 @@
                   :header-cell-style="tableHeaderCellStyle"
                   class="tab-table"
                   height="100%"
+                  empty-text=" "
           >
             <template v-for="(item,index) in customTableTitles">
               <el-table-column
diff --git a/src/views/charts2/charts/npm/NpmAppCategoryScore.vue b/src/views/charts2/charts/npm/NpmAppCategoryScore.vue
index 0dc8f93c..a23ba136 100644
--- a/src/views/charts2/charts/npm/NpmAppCategoryScore.vue
+++ b/src/views/charts2/charts/npm/NpmAppCategoryScore.vue
@@ -1,6 +1,5 @@
 <template>
   <div class="npm-app">
-    <chart-no-data v-if="isNoData"></chart-no-data>
     <div class="npm-app-left">
       <div class="npm-app-letter">
         <div v-for="(letter, index) in colorPatchData" :key="index">
@@ -21,6 +20,7 @@
           :data="tableData"
           class="app-table"
           height="100%"
+          empty-text=" "
       >
         <template v-for="(item, index) in customTableTitles" :key="index">
           <el-table-column class="data-column">
@@ -102,7 +102,6 @@ import { getSecond } from '@/utils/date-util'
 import { get } from '@/utils/http'
 import { getChainRatio, computeScore } from '@/utils/tools'
 import chartMixin from '@/views/charts2/chart-mixin'
-import ChartNoData from '@/views/charts/charts/ChartNoData'
 export default {
   name: 'NpmAppCategoryScore',
   data () {
@@ -128,9 +127,6 @@ export default {
       ]
     }
   },
-  components: {
-    ChartNoData
-  },
   mixins: [chartMixin],
   methods: {
     init (params) {
@@ -143,12 +139,10 @@ export default {
       // 获取table后三列内容
       const currentTrafficRequest = get(api.npm.overview.appTrafficAnalysis, { ...params, cycle: 0 })
       const lastCycleTrafficRequest = get(api.npm.overview.appTrafficAnalysis, { ...params, cycle: 1 })
-      this.toggleLoading(true)
       Promise.all([currentTrafficRequest, lastCycleTrafficRequest]).then(res => {
         const prevData = res[1].data.result
         const data = res[0].data.result
         if (data && data.length > 0) {
-          this.isNoData = false
           const tableData = data.map(d => {
             const mapping = npmCategoryInfoMapping.find(mapping => mapping.appSubcategory === d.appSubcategory)
             const result = {
@@ -199,8 +193,6 @@ export default {
             })
             this.tableData = tableData
           })
-        } else {
-          this.isNoData = true
         }
       }).finally(() => {
         this.toggleLoading(false)
diff --git a/src/views/charts2/charts/npm/RelatedSessions.vue b/src/views/charts2/charts/npm/RelatedSessions.vue
index ad1b6bde..30cba832 100644
--- a/src/views/charts2/charts/npm/RelatedSessions.vue
+++ b/src/views/charts2/charts/npm/RelatedSessions.vue
@@ -62,8 +62,8 @@ export default {
       get(api.npm.overview.relatedSessions, params).then(res => {
         if (res.code === 200) {
           this.sessionData = res.data.result
-          this.clientSessions = this.sessionData.clientSessions / (this.sessionData.clientSessions + this.sessionData.serverSessions)
-          this.serverSessions = this.sessionData.serverSessions / (this.sessionData.clientSessions + this.sessionData.serverSessions)
+          this.clientSessions = this.sessionData.clientSessions / (this.sessionData.clientSessions * 1 + this.sessionData.serverSessions * 1)
+          this.serverSessions = this.sessionData.serverSessions / (this.sessionData.clientSessions * 1 + this.sessionData.serverSessions * 1)
           this.sessionData.clientSessions = unitConvert(this.clientSessions, unitTypes.percent).join('')
           this.sessionData.serverSessions = unitConvert(this.serverSessions, unitTypes.percent).join('')
           if (this.clientSessions === 1) {