From 537ddd8ad30e639df9db4a36a664e61ac4e025c3 Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Tue, 23 Aug 2022 17:16:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20apps=20=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../networkOverview/NetworkOverviewApps.vue   | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue b/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue
index 6e439b49..d5841105 100644
--- a/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue
+++ b/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue
@@ -73,7 +73,8 @@
           <el-tabs v-model="appTypeTab" @tab-click="appTypeTabChange">
             <el-tab-pane :label="$t('networkOverview.appType.provider')" :name="0">
               <div class="body__apps" :class="{'body__apps-no-grid': providerOptions.length === 0}">
-                <chart-no-data v-if="providerOptions.length === 0"></chart-no-data>
+                <loading :loading="loadingBody"></loading>
+                <chart-no-data v-if="providerOptions.length === 0 && !loadingBody"></chart-no-data>
                 <div class="body__app" v-else :class="{'provide-show': app.provideShow}" v-for="(app, index) in providerOptions" :key="index"  @click="appCheckedChange(app, 0)">
                   <div class="body__app-content">
                     <div class="body__app-left">
@@ -89,7 +90,8 @@
             </el-tab-pane>
             <el-tab-pane :label="$t('networkOverview.appType.app')" :name="1">
               <div class="body__apps" :class="{'body__apps-no-grid': appOptions.length === 0}">
-                <chart-no-data v-if="appOptions.length === 0"></chart-no-data>
+                <loading :loading="loadingBody"></loading>
+                <chart-no-data v-if="appOptions.length === 0 && !loadingBody"></chart-no-data>
                 <div class="body__app" v-else :class="{'app-show': app.appShow}" v-for="(app, index) in appOptions" :key="index" @click="appCheckedChange(app, 1)">
                   <div class="body__app-content">
                     <div class="body__app-left">
@@ -168,11 +170,9 @@ export default {
       providerOptions: [],
       appOptions: [],
       appTypeTab: 0,
-      appShowName: false,
       searcherApp: '',
       // 选中的app，不区分app和provider
       toSaveApp: [],
-      myChartArray: [],
       appShowType: 'bytes',
       pageObj: { // 分页对象
         pageNo: 1,
@@ -184,7 +184,7 @@ export default {
       offset: 0,
       flag: false,
       timerSearc: null,
-      timerHandle: null
+      loadingBody: false
     }
   },
   watch: {
@@ -375,7 +375,9 @@ export default {
                 }
               })
             })
-            if (val && !show) {
+            if (val) {
+              this.providerOptions = res.data.list
+            } else if (!val && !show) {
               this.providerOptions = res.data.list
             } else {
               this.providerOptions.push(...res.data.list)
@@ -383,6 +385,7 @@ export default {
             }
           }
           this.loading = false
+          this.loadingBody = false
         })
       } else if (this.appTypeTab == 1) {
         params.type = 'overviewApp'
@@ -396,7 +399,9 @@ export default {
                 }
               })
             })
-            if (val && !show) {
+            if (val) {
+              this.appOptions = res.data.list
+            } else if (!val && !show) {
               this.appOptions = res.data.list
             } else {
               this.appOptions.push(...res.data.list)
@@ -404,6 +409,7 @@ export default {
             }
           }
           this.loading = false
+          this.loadingBody = false
         })
       }
     },
@@ -424,6 +430,7 @@ export default {
       this.pageObj.pageNo = 1
       this.searcherApp = ''
       this.addApp()
+      this.loadingBody = true
       window.addEventListener('scroll', this.scrollChange, true)
       this.timerScroll = setTimeout(() => {
         window.removeEventListener('scroll', this.scrollChange, true)