Merge branch 'cherry-pick-2c703306' into 'dev-24.04'24.04dev-24.04

fix: 修复双向链路配置下，链路下钻后id不对的问题

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

2 files changed, 24 insertions, 8 deletions

diff --git a/src/views/charts2/Panel.vue b/src/views/charts2/Panel.vue
index d8d72ff6..f3bec690 100644
--- a/src/views/charts2/Panel.vue
+++ b/src/views/charts2/Panel.vue
@@ -122,7 +122,7 @@ export default {
   watch: {
     timeFilter: {
       handler () {
-        if (this.$route.path === '/panel/networkAppPerformance') {
+        if (this.$route.path === '/panel/networkAppPerformance' || this.$route.path === '/panel/linkMonitor') {
           this.$store.commit('resetScoreBase')
           this.queryScoreBase()
           if (this.lineQueryCondition || this.networkOverviewBeforeTab) {
@@ -227,7 +227,7 @@ export default {
         this.scoreCalculation()
       }
     }
-    if (this.$route.path === '/panel/networkAppPerformance') {
+    if (this.$route.path === '/panel/networkAppPerformance' || this.$route.path === '/panel/linkMonitor') {
       this.$store.commit('resetScoreBase')
       this.queryScoreBase()
     }
diff --git a/src/views/charts2/charts/linkMonitor/LinkBlock.vue b/src/views/charts2/charts/linkMonitor/LinkBlock.vue
index a83f5d3a..d86f1ad4 100644
--- a/src/views/charts2/charts/linkMonitor/LinkBlock.vue
+++ b/src/views/charts2/charts/linkMonitor/LinkBlock.vue
@@ -237,12 +237,26 @@ export default {
                 }
               })
               this.linkNoData = data.length === 0
-              data.forEach(item => {
-                item.totalBitsRate = item.outBitsRate + item.inBitsRate
-                linkConfig.filter(info => info.interfaceName === item.interfaceName).forEach(info => {
-                  item.linkId = info.linkId
+              if (!isTwoWay) {
+                data.forEach(item => {
+                  item.totalBitsRate = item.outBitsRate + item.inBitsRate
+                  linkConfig.filter(info => info.interfaceName === item.interfaceName).forEach(info => {
+                    item.linkId = info.linkId
+                  })
                 })
-              })
+              } else {
+                data.forEach(item => {
+                  item.totalBitsRate = item.outBitsRate + item.inBitsRate
+                  item.isTwoWay = true
+                  linkConfig.filter(info => info.interfaceName === item.interfaceName).forEach(info => {
+                    if (info.direction === 0) {
+                      item.outLinkId = info.linkId
+                    } else if (info.direction === 1) {
+                      item.inLinkId = info.linkId
+                    }
+                  })
+                })
+              }
 
               const sorted = data.sort((a, b) => b.totalBitsRate - a.totalBitsRate)
               const linkColors = colorGradientCalculation(this.gradientColor[0], this.gradientColor[1], sorted.map(s => s.totalBitsRate))
@@ -384,7 +398,9 @@ export default {
       return width
     },
     drillLinkId (item) {
-      const queryCondition = `out_link_id = ${item.linkId} or in_link_id = ${item.linkId}`
+      const queryCondition = item.isTwoWay
+        ? `out_link_id = ${item.outLinkId} or in_link_id = ${item.inLinkId}`
+        : `out_link_id = ${item.linkId} or in_link_id = ${item.linkId}`
       beforeRouterPush()
       this.$router.push({
         query: {