From 2a0f4f078f6b1dc15ea06c8aaeaa85a01d9b0b66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com>
Date: Fri, 14 Oct 2022 10:40:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3Link=20monitor?=
 =?UTF-8?q?=E7=BD=91=E6=A0=BC=E6=A8=A1=E5=9D=97=EF=BC=8C=E5=9B=A0=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=95=B0=E6=8D=AE=E4=B9=B1=E5=BA=8F=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E6=82=AC=E6=B5=AE=E6=A1=86=E6=95=B0=E6=8D=AE=E6=8C=87=E5=90=91?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../charts/linkMonitor/LinkDirectionGrid.vue  | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/views/charts2/charts/linkMonitor/LinkDirectionGrid.vue b/src/views/charts2/charts/linkMonitor/LinkDirectionGrid.vue
index d93fdf47..b204a755 100644
--- a/src/views/charts2/charts/linkMonitor/LinkDirectionGrid.vue
+++ b/src/views/charts2/charts/linkMonitor/LinkDirectionGrid.vue
@@ -4,7 +4,7 @@
     <popover-content :isNoData="isNoData" :gridData="gridData" style="width: 900px;"/>
 
     <!--右侧链路下一跳-->
-    <popover-content :isNoData="isNoData" :gridData="gridData2" />
+    <popover-content :isNoData="isNoData" :gridData="gridData2"/>
   </div>
 </template>
 
@@ -45,7 +45,7 @@ export default {
       // 链路基本信息
       let linkInfo = localStorage.getItem(storageKey.linkInfo)
       linkInfo = JSON.parse(linkInfo)
-      console.log('LinkDirectionGrid.vue---init--获取链路基本信息缓存', linkInfo)
+      // console.log('LinkDirectionGrid.vue---init--获取链路基本信息缓存', linkInfo)
 
       const params = {
         startTime: getSecond(this.timeFilter.startTime),
@@ -60,8 +60,24 @@ export default {
         if (res[0].code === 200 && res[1].code === 200) {
           // 链路流量数据
           const linkData = res[0].data.result
+          // 接口数据乱序，根据入链路id（ingressLinkId）大小排序之后，
+          // 再根据同ingressLinkId下的egressLinkId进行排序
+          linkData.sort((a, b) => {
+            if (a.ingressLinkId != b.ingressLinkId) {
+              return a.ingressLinkId - b.ingressLinkId
+            }
+            return a.egressLinkId - b.egressLinkId
+          })
+
           // 链路下一跳信息
           const nextLinkData = res[1].data.result
+          // 接口数据乱序，根据出方向排序，再根据同个出方向下的入进行排序
+          nextLinkData.sort((a, b) => {
+            if (a.ingressLinkDirection != b.ingressLinkDirection) {
+              return a.ingressLinkDirection.localeCompare(b.ingressLinkDirection)
+            }
+            return a.egressLinkDirection.localeCompare(b.egressLinkDirection)
+          })
 
           this.isNoData = linkData.length === 0 && nextLinkData.length === 0
           if (this.isNoData) {
@@ -186,12 +202,13 @@ export default {
               }
             }
           })
+
           this.gridData2 = gridData2
         } else {
           this.isNoData = true
         }
       }).catch(e => {
-        console.error('====', e)
+        console.error(e)
         this.isNoData = true
       }).finally(() => {
         this.toggleLoading(false)