From 8e7cf6e9dfff01f29aeb0b02dbff417d6c31e3eb Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Wed, 28 Sep 2022 14:20:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20link-monitor=20=E6=8A=98=E7=BA=BF?=
 =?UTF-8?q?=E5=9B=BE=EF=BC=8C=E6=A1=91=E5=9F=BA=E5=9B=BE=E4=B8=8B=E9=92=BB?=
 =?UTF-8?q?=20=E6=A0=B9=E6=8D=AE=E6=96=87=E6=A1=A3=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8B=E9=92=BB=E5=8F=82=E6=95=B0=E6=8E=A5=E6=94=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../charts/linkMonitor/LinkTrafficSankey.vue  |  1 +
 .../LinkTrafficDrillDownLine.vue              | 12 +++++------
 .../LinkTrafficDrillDownList.vue              | 21 ++++++++++++-------
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/views/charts2/charts/linkMonitor/LinkTrafficSankey.vue b/src/views/charts2/charts/linkMonitor/LinkTrafficSankey.vue
index 3d518e2a..bbb74324 100644
--- a/src/views/charts2/charts/linkMonitor/LinkTrafficSankey.vue
+++ b/src/views/charts2/charts/linkMonitor/LinkTrafficSankey.vue
@@ -48,6 +48,7 @@ export default {
   setup () {
     const { query } = useRoute()
     const tab = ref(query.tabIndex || 0)
+    // const d = `egress_link_direction='${256}' AND ingress_link_direction='${256}' `
     const queryCondition = ref(query.queryCondition || '')
     return {
       tab,
diff --git a/src/views/charts2/charts/linkMonitor/localComponents/LinkTrafficDrillDownLine.vue b/src/views/charts2/charts/linkMonitor/localComponents/LinkTrafficDrillDownLine.vue
index f603ddf6..758db909 100644
--- a/src/views/charts2/charts/linkMonitor/localComponents/LinkTrafficDrillDownLine.vue
+++ b/src/views/charts2/charts/linkMonitor/localComponents/LinkTrafficDrillDownLine.vue
@@ -73,12 +73,12 @@ export default {
     const { query } = useRoute()
     const lineMetric = ref(query.lineMetric || 'Bits/s')
     const lineTab = ref(query.lineTab || '')
-    const d = `common_egress_link_id='${246}' AND common_ingress_link_id='${246}'`
-    const linkId = ref(query.linkId || d)
+    // const d = `common_egress_link_id='${246}' AND common_ingress_link_id='${246}'`
+    const queryCondition = ref(query.queryCondition || '')
     return {
       lineMetric,
       lineTab,
-      linkId,
+      queryCondition,
       myChart: shallowRef(null)
     }
   },
@@ -154,9 +154,9 @@ export default {
         endTime: getSecond(this.timeFilter.endTime)
       }
       // const condition = this.$store.getters.getQueryCondition
-      // if (this.linkId) {
-      //   params.q = this.linkId
-      // }
+      if (this.queryCondition) {
+        params.q = this.queryCondition
+      }
       this.toggleLoading(true)
       get(api.linkMonitor.totalTrafficAnalysis, params).then((res) => {
         if (res.code === 200) {
diff --git a/src/views/charts2/charts/linkMonitor/localComponents/LinkTrafficDrillDownList.vue b/src/views/charts2/charts/linkMonitor/localComponents/LinkTrafficDrillDownList.vue
index 3ec8fffc..04e2d2f5 100644
--- a/src/views/charts2/charts/linkMonitor/localComponents/LinkTrafficDrillDownList.vue
+++ b/src/views/charts2/charts/linkMonitor/localComponents/LinkTrafficDrillDownList.vue
@@ -46,16 +46,17 @@ import { ref } from 'vue'
 import { useRoute } from 'vue-router'
 import { getSecond } from '@/utils/date-util'
 import { computeScore } from '@/utils/tools'
+import Login from '@/Login'
 
 export default {
   name: 'linkTrafficList',
   mixins: [chartMixin],
   setup () {
     const { query } = useRoute()
-    const d = `common_egress_link_id='${246}' AND common_ingress_link_id='${246}'`
-    const linkId = ref(query.linkId || '256')
+    // const d = `common_egress_link_id='${256}' AND common_ingress_link_id='${256}'`
+    const queryCondition = ref(query.queryCondition || '')
     return {
-      linkId
+      queryCondition
     }
   },
   data () {
@@ -74,9 +75,9 @@ export default {
         startTime: getSecond(this.timeFilter.startTime),
         endTime: getSecond(this.timeFilter.endTime)
       }
-      // if (this.linkId) {
-      //   params.q = this.linkId
-      // }
+      if (this.queryCondition) {
+        params.q = this.queryCondition
+      }
       this.toggleLoading(true)
       get(api.linkMonitor.networkAnalysis, params).then(res => {
         if (res.code === 200) {
@@ -92,8 +93,14 @@ export default {
           if (this.linkTrafficListData.npmScore > 6) {
             this.linkTrafficListData.npmScore = 6
           }
+          let condition = ''
+          if (this.queryCondition.indexOf('AND') > -1) {
+            condition = this.queryCondition.split(/["|'](.*?)["|']/)
+          } else {
+            condition = this.queryCondition
+          }
           this.cnLinkInfo.forEach(e => {
-            if (this.linkId === e.originalLinkId) {
+            if (condition.length > 1 && condition[1] === e.originalLinkId) {
               this.bandWidth = e.bandwidth
             }
           })