Merge branch 'cherry-pick-468026b3' into 'dev-23.06'

fix: 修复link monitor有些图没数据时没显示nodata的问题

See merge request cyber-narrator/cn-ui!30

2 files changed, 8 insertions, 5 deletions

diff --git a/src/views/charts2/charts/linkMonitor/LinkBlock.vue b/src/views/charts2/charts/linkMonitor/LinkBlock.vue
index a0290415..93a85572 100644
--- a/src/views/charts2/charts/linkMonitor/LinkBlock.vue
+++ b/src/views/charts2/charts/linkMonitor/LinkBlock.vue
@@ -231,6 +231,7 @@ export default {
                   }
                 }
               })
+              this.linkNoData = data.length === 0
               data.forEach((item) => {
                 item.totalBitsRate = item.egressBitsRate + item.ingressBitsRate
               })
@@ -246,7 +247,7 @@ export default {
               this.linkData = sorted
             }
           } else {
-            this.linkNoData = false
+            this.linkNoData = true
             this.showError1 = true
             this.errorMsg1 = this.errorMsgHandler(res[0])
           }
@@ -267,7 +268,7 @@ export default {
               directionArr = Array.from(new Set(directionArr))
 
               const newNextHopData = []
-
+              this.nextHopNoData = directionArr.length === 0
               directionArr.forEach((item1) => {
                 const newObj = { egressBitsRate: 0, ingressBitsRate: 0, totalBitsRate: 0, linkDirection: item1 }
                 nextHopData.forEach((item2) => {
@@ -309,7 +310,7 @@ export default {
             }
           } else {
             this.showError2 = true
-            this.nextHopNoData = false
+            this.nextHopNoData = true
             this.errorMsg2 = this.errorMsgHandler(res[1])
           }
         }
diff --git a/src/views/charts2/charts/linkMonitor/LinkDirectionGrid.vue b/src/views/charts2/charts/linkMonitor/LinkDirectionGrid.vue
index 0629b483..84b58711 100644
--- a/src/views/charts2/charts/linkMonitor/LinkDirectionGrid.vue
+++ b/src/views/charts2/charts/linkMonitor/LinkDirectionGrid.vue
@@ -138,10 +138,11 @@ export default {
                   }
                 }
               })
+              this.isLinkNoData = linkGridData.length === 0
               this.linkGridData = linkGridData
             }
           } else {
-            this.isLinkNoData = false
+            this.isLinkNoData = true
             this.isLinkShowError = true
             this.linkErrorMsg = this.errorMsgHandler(res[0])
           }
@@ -227,10 +228,11 @@ export default {
                   }
                 }
               })
+              this.isNextNoData = nextGridData.length === 0
               this.nextGridData = nextGridData
             }
           } else {
-            this.isNextNoData = false
+            this.isNextNoData = true
             this.isNextShowError = true
             this.nextErrorMsg = this.errorMsgHandler(res[1])
           }