From 7ec4ab62ffede3f3e50b2cc0b91a2d39a74706ca Mon Sep 17 00:00:00 2001
From: hyx <hanyuxia@iie.ac.cn>
Date: Fri, 2 Dec 2022 15:50:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20CN-817=20=E4=B8=8B=E9=92=BBtable?=
 =?UTF-8?q?=E7=9A=84error=E4=BA=A4=E4=BA=92=E5=AE=9E=E6=96=BD:=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E5=9B=BE=E6=A0=87=E6=98=BE=E7=A4=BA=E5=90=8E=E6=B6=88?=
 =?UTF-8?q?=E5=A4=B1=E9=97=AE=E9=A2=98=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../networkOverview/NetworkOverviewTabs.vue   | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue b/src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue
index 529abb58..bcbee19b 100644
--- a/src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue
+++ b/src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue
@@ -337,14 +337,14 @@ export default {
           this.initData()
         } else {
           this.showError = true
-          this.errorMsg = response.message
+          this.errorMsg = response.msg || response.message || 'Unknown'
           this.isNoData = true
           this.toggleLoading(false)
         }
       }).catch(e => {
         console.error(e)
         this.showError = true
-        this.errorMsg = e.message
+        this.errorMsg = e.msg || e.message || 'Unknown'
       }).finally(() => {
         this.changeUrlTabState()
         this.toggleLoading(false)
@@ -694,12 +694,12 @@ export default {
                 })
               }else {
                 tableColumn.showError = true
-                tableColumn.errorMsg = response.message
+                tableColumn.errorMsg = response.msg || response.message || 'Unknown'
               }
             }).catch(e => {
               console.log(e)
               tableColumn.showError = true
-              tableColumn.errorMsg = e.message
+              tableColumn.errorMsg = e.msg || e.message || 'Unknown'
             }).finally(e => {
               this.tableData = tableDataTmp
               this.tableDataBackup = tableDataTmp
@@ -712,8 +712,10 @@ export default {
                 if (tableColumn.columnType === tableColumnType.chainRatio && !tableColumn.isInMainUrl) {
                   get(self.gerColumnUrl(tableColumn), queryParams).then(response => {
                     if (response.code === 200) {
-                      tableColumn.showError = false
-                      tableColumn.errorMsg = ''
+                      if(!tableColumn.showError){
+                        tableColumn.showError = false
+                        tableColumn.errorMsg = ''
+                      }
                       const columnList = response.data.result
                       self.tableData.forEach((item, i) => {
                         const data = columnList.find(i => i[curTab.prop] === item.tab)
@@ -735,12 +737,12 @@ export default {
                       })
                     }else {
                       tableColumn.showError = true
-                      tableColumn.errorMsg = tableColumn.errorMsg ? (tableColumn.errorMsg + ',' + response.message) : response.message
+                      tableColumn.errorMsg = response.msg || response.message || 'Unknown'
                     }
                   }).catch(e => {
                     console.log(e)
                     tableColumn.showError = true
-                    tableColumn.errorMsg = tableColumn.errorMsg ? (tableColumn.errorMsg + ',' + e.message) : e.message
+                    tableColumn.errorMsg = e.msg || e.message || 'Unknown'
                   }).finally(e => {
                     // 查询需要单独查询的，且需要展示环比图标，列的前一周期的数据
                     if (tableColumn.cycle && self.tableData && self.tableData.length > 0) {
@@ -750,8 +752,10 @@ export default {
                       }
                       get(self.gerColumnUrl(tableColumn), queryCycleParams).then(response => {
                         if (response.code === 200) {
-                          tableColumn.showError = false
-                          tableColumn.errorMsg = ''
+                          if(!tableColumn.showError){
+                            tableColumn.showError = false
+                            tableColumn.errorMsg = ''
+                          }
                           cycleTotalList = response.data.result
                           self.tableData.forEach(item => {
                             const cycle = cycleTotalList.find(i => i[curTab.prop] === item.tab)
@@ -801,12 +805,12 @@ export default {
                           })
                         }else {
                           tableColumn.showError = true
-                          tableColumn.errorMsg = tableColumn.errorMsg ? (tableColumn.errorMsg + ',' + response.message) : response.message
+                          tableColumn.errorMsg = response.msg || response.message || 'Unknown'
                         }
                       }).catch(e => {
                         console.log(e)
                         tableColumn.showError = true
-                        tableColumn.errorMsg = tableColumn.errorMsg ? (tableColumn.errorMsg + ',' + e.message) : e.message
+                        tableColumn.errorMsg = e.msg || e.message || 'Unknown'
                       })
                     }
                   })