From 49e08f723a381bc2ad9ab0b58964c305ce999ed3 Mon Sep 17 00:00:00 2001
From: hyx <hanyuxia@iie.ac.cn>
Date: Thu, 1 Dec 2022 16:11:21 +0800
Subject: [PATCH] =?UTF-8?q?CN-817=20=E4=B8=8B=E9=92=BBtable=E7=9A=84error?=
 =?UTF-8?q?=E4=BA=A4=E4=BA=92=E5=AE=9E=E6=96=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/charts2/networkOverviewTabs.scss    |  9 ++++
 .../networkOverview/NetworkOverviewTabs.vue   | 45 ++++++++++++++++---
 2 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/src/assets/css/components/views/charts2/networkOverviewTabs.scss b/src/assets/css/components/views/charts2/networkOverviewTabs.scss
index dd11c9c5..77a0220d 100644
--- a/src/assets/css/components/views/charts2/networkOverviewTabs.scss
+++ b/src/assets/css/components/views/charts2/networkOverviewTabs.scss
@@ -113,6 +113,15 @@
       .el-table thead {
         color: $grey;
       }
+      .el-table__empty-text{
+        line-height:20px !important;
+      }
+      .el-table__header th .cell {
+        display:flex;
+        flex-direction:row;
+        justify-content: center;
+        align-items: center;
+      }
       .score-cell {
         display: flex !important;
         justify-content: center;
diff --git a/src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue b/src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue
index 91e62279..3b423629 100644
--- a/src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue
+++ b/src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue
@@ -33,7 +33,7 @@
             <template v-for="(item, index) in customTableTitles">
               <el-table-column
                       v-if="item.checked"
-                      :sortable="sortable(item)"
+                      :sortable="item.showError ? false : sortable(item)"
                       align="center"
                       :prop="item.prop"
                       class="data-column"
@@ -42,6 +42,7 @@
               >
                 <template #header >
                   <span class="data-column__span" >{{$t(item.label)}}</span>
+                  <chart-error v-if="item.showError" tooltip :content="item.errorMsg" width="300"  />
                 </template>
                 <template  #default="scope" :column="item">
                   <template v-if="item.columnType === tableColumnType.chainRatio"  >
@@ -123,8 +124,9 @@
                 </template>
               </el-table-column>
             </template>
-            <template v-slot:empty>
-              <div class="table-no-data" v-if="isNoData">
+            <template v-slot:empty >
+              <chart-error v-if="showError" :content="errorMsg"  />
+              <div class="table-no-data" v-else-if="isNoData">
                 <div class="table-no-data__title">{{ $t('npm.noData') }}</div>
               </div>
             </template>
@@ -259,7 +261,9 @@ export default {
       tableSortTab: '',
       urlChangeParams: {},
       showUnit: false,
-      fromRoute: fromRoute
+      fromRoute: fromRoute,
+      showError: false,
+      errorMsg: ''
     }
   },
   props: {
@@ -327,14 +331,20 @@ export default {
       const requestUrl = this.getCurUrl()
       get(requestUrl, queryParams).then(response => {
         if (response.code === 200) {
+          this.showError = false
+          this.errorMsg = ''
           this.chartData = response.data.result
           this.initData()
         } else {
+          this.showError = true
+          this.errorMsg = response.message
           this.isNoData = true
           this.toggleLoading(false)
         }
       }).catch(e => {
         console.error(e)
+        this.showError = true
+        this.errorMsg = e.message
       }).finally(() => {
         this.changeUrlTabState()
         this.toggleLoading(false)
@@ -636,6 +646,8 @@ export default {
           if (tableColumn.columnType === tableColumnType.chainRatio && tableColumn.isInMainUrl && tableDataTmp && tableDataTmp.length > 0) {
             get(self.gerCycleUrl(), queryParams).then(response => {
               if (response.code === 200) {
+                tableColumn.showError = false
+                tableColumn.errorMsg = ''
                 cycleTotalList = response.data.result
                 tableDataTmp.forEach(item => {
                   const cycle = cycleTotalList.find(i => i[curTab.prop] === item.tab)
@@ -680,9 +692,14 @@ export default {
                   }
                   item[tableColumn.prop] = [(item[tableColumn.prop] || item[tableColumn.prop] === 0) ? item[tableColumn.prop] : '', trend, trendPercent]
                 })
+              }else {
+                tableColumn.showError = true
+                tableColumn.errorMsg = response.message
               }
             }).catch(e => {
               console.log(e)
+              tableColumn.showError = true
+              tableColumn.errorMsg = e.message
             }).finally(e => {
               this.tableData = tableDataTmp
               this.tableDataBackup = tableDataTmp
@@ -695,6 +712,8 @@ 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 = ''
                       const columnList = response.data.result
                       self.tableData.forEach((item, i) => {
                         const data = columnList.find(i => i[curTab.prop] === item.tab)
@@ -714,9 +733,14 @@ export default {
                           }
                         }
                       })
+                    }else {
+                      tableColumn.showError = true
+                      tableColumn.errorMsg = tableColumn.errorMsg ? (tableColumn.errorMsg + ',' + response.message) : response.message
                     }
                   }).catch(e => {
                     console.log(e)
+                    tableColumn.showError = true
+                    tableColumn.errorMsg = tableColumn.errorMsg ? (tableColumn.errorMsg + ',' + e.message) : e.message
                   }).finally(e => {
                     // 查询需要单独查询的，且需要展示环比图标，列的前一周期的数据
                     if (tableColumn.cycle && self.tableData && self.tableData.length > 0) {
@@ -726,6 +750,8 @@ export default {
                       }
                       get(self.gerColumnUrl(tableColumn), queryCycleParams).then(response => {
                         if (response.code === 200) {
+                          tableColumn.showError = false
+                          tableColumn.errorMsg = ''
                           cycleTotalList = response.data.result
                           self.tableData.forEach(item => {
                             const cycle = cycleTotalList.find(i => i[curTab.prop] === item.tab)
@@ -773,9 +799,14 @@ export default {
                               item[tableColumn.prop] = [(item[tableColumn.prop] || item[tableColumn.prop] === 0) ? item[tableColumn.prop] : '', trend, trendPercent]
                             }
                           })
+                        }else {
+                          tableColumn.showError = true
+                          tableColumn.errorMsg = tableColumn.errorMsg ? (tableColumn.errorMsg + ',' + response.message) : response.message
                         }
                       }).catch(e => {
                         console.log(e)
+                        tableColumn.showError = true
+                        tableColumn.errorMsg = tableColumn.errorMsg ? (tableColumn.errorMsg + ',' + e.message) : e.message
                       })
                     }
                   })
@@ -1116,7 +1147,7 @@ export default {
         4.设置菜单：第三级，第四级名称，并保存到store中
         5.设置panel名称，表格维度类型：如ip，domain等(即查询参数中的type)
     * */
-    handleTabValue (columnName, columnValue) {
+    async handleTabValue (columnName, columnValue) {
       // console.log('NetworkOverview类------handleTabValue：下钻')
       // 下钻前保存当前路由状态
       this.beforeRouterPush()
@@ -1158,7 +1189,7 @@ export default {
         })
       }
 
-      this.saveUserLocalConfig()
+      await this.saveUserLocalConfig()
       let forthMenuName = ''
       if (clickTab.prop === 'qtype') {
         forthMenuName = this.dnsQtypeMapData.get(columnValue)
@@ -1856,7 +1887,7 @@ export default {
         }
       }
     }
-    this.saveUserLocalConfig()
+    await this.saveUserLocalConfig()
     this.getChartData()
   },
   setup (props) {