From 5714e3b97a20260fa46a3ac93a6b28274d4adf80 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Thu, 29 Dec 2022 21:43:13 +0800
Subject: [PATCH] =?UTF-8?q?CN-834=20fix:=20=E4=BF=AE=E5=A4=8Dnpm=E4=B8=8B?=
 =?UTF-8?q?=E9=92=BBip=E8=BF=87=E6=BB=A4=E6=9C=AA=E7=94=9F=E6=95=88?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../networkOverview/NetworkOverviewTabs.vue   | 31 +++++++++++++++++--
 .../charts2/charts/npm/NpmNetworkQuantity.vue | 13 +++++---
 .../charts2/charts/npm/NpmTrafficLine.vue     | 16 +++++++---
 3 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue b/src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue
index 14457424..82608083 100644
--- a/src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue
+++ b/src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue
@@ -198,7 +198,18 @@
 </template>
 <script>
 import { ref } from 'vue'
-import { operationType, unitTypes, networkTable, tableColumnType, networkDefaultLimit, curTabState, storageKey, dbDrilldownTableConfig, fromRoute } from '@/utils/constants'
+import {
+  operationType,
+  unitTypes,
+  networkTable,
+  tableColumnType,
+  networkDefaultLimit,
+  curTabState,
+  storageKey,
+  dbDrilldownTableConfig,
+  fromRoute,
+  drillDownPanelTypeMapping
+} from '@/utils/constants'
 import { get } from '@/utils/http'
 import unitConvert from '@/utils/unit-convert'
 import { getChainRatio, computeScore, urlParamsHandler, overwriteUrl, readDrilldownTableConfigByUser, combineDrilldownTableWithUserConfig, getDnsMapData, handleSpecialValue, getConfigVersion } from '@/utils/tools'
@@ -1462,7 +1473,23 @@ export default {
       }
     },
     getQueryCondition () {
-      return this.$route.query.queryCondition ? this.$route.query.queryCondition : ''
+      const queryCondition = this.getUrlParam('queryCondition')
+      const fourthPanel = this.getUrlParam('fourthPanel', -1, true)
+      const dimensionType = this.getUrlParam('dimensionType', '')
+      const fourthMenu = this.getUrlParam('fourthMenu', '')
+      const tabIndex = this.getUrlParam('tabIndex', 0, true)
+
+      if (fourthPanel === drillDownPanelTypeMapping.npmOverviewIp) {
+        if (dimensionType === 'clientIp' || dimensionType === 'serverIp' || dimensionType === 'ip') {
+          if (tabIndex === 0) {
+            return `common_client_ip='${fourthMenu}'`
+          } else if (tabIndex === 1) {
+            return `common_server_ip='${fourthMenu}'`
+          }
+        }
+      }
+
+      return queryCondition
     },
     getUrlParam (param, defaultValue, isNumber) {
       if (isNumber) {
diff --git a/src/views/charts2/charts/npm/NpmNetworkQuantity.vue b/src/views/charts2/charts/npm/NpmNetworkQuantity.vue
index 644e819b..5021c032 100644
--- a/src/views/charts2/charts/npm/NpmNetworkQuantity.vue
+++ b/src/views/charts2/charts/npm/NpmNetworkQuantity.vue
@@ -73,7 +73,7 @@ export default {
       } else {
         condition = this.queryCondition
       }
-      const type = this.dimensionType || this.networkOverviewBeforeTab
+      let type = this.dimensionType || this.networkOverviewBeforeTab
       const params = {
         startTime: getSecond(this.timeFilter.startTime),
         endTime: getSecond(this.timeFilter.endTime),
@@ -85,10 +85,13 @@ export default {
         this.side = 'server'
       }
       if (condition && (typeof condition !== 'object') && type) {
-        if (type === 'clientIp') {
-          params.q = `ip='${condition.split(/'(.*?)'/)[1]}' and side='client'`
-        } else if (type === 'serverIp') {
-          params.q = `ip='${condition.split(/'(.*?)'/)[1]}' and side='server'`
+        if (type === 'clientIp' || type === 'serverIp') {
+          if (parseFloat(this.tabIndex) === 0) {
+            type = 'clientIp'
+          } else if (parseFloat(this.tabIndex) === 1) {
+            type = 'serverIp'
+          }
+          params.q = `ip='${condition.split(/'(.*?)'/)[1]}'`
         } else if (type === 'clientCity') {
           params.q = `client_city='${condition.split(/'(.*?)'/)[1]}'`
         } else if (type === 'serverCity') {
diff --git a/src/views/charts2/charts/npm/NpmTrafficLine.vue b/src/views/charts2/charts/npm/NpmTrafficLine.vue
index 5905e529..4b52d33e 100644
--- a/src/views/charts2/charts/npm/NpmTrafficLine.vue
+++ b/src/views/charts2/charts/npm/NpmTrafficLine.vue
@@ -145,7 +145,7 @@ export default {
       }
       // const conditionStr = this.$route.query.queryCondition ? this.$route.query.queryCondition : ''
       let condition = ''
-      const type = this.dimensionType
+      let type = this.dimensionType
       if (this.queryCondition.indexOf(' OR ') > -1) {
         condition = this.queryCondition.split(/["|'](.*?)["|']/)
       } else {
@@ -161,13 +161,19 @@ export default {
         endTime: getSecond(this.timeFilter.endTime)
       }
       if (type) {
+        if (type === 'clientIp' || type === 'serverIp') {
+          if (parseFloat(this.tabIndex) === 0) {
+            type = 'clientIp'
+          } else if (parseFloat(this.tabIndex) === 1) {
+            type = 'serverIp'
+          }
+          params.q = `ip='${condition.split(/'(.*?)'/)[1]}'`
+        }
         params.type = type
       }
       if (condition && (typeof condition !== 'object') && type) {
-        if (type === 'clientIp') {
-          params.q = `ip='${condition.split(/'(.*?)'/)[1]}' and side='client'`
-        } else if (type === 'serverIp') {
-          params.q = `ip='${condition.split(/'(.*?)'/)[1]}' and side='server'`
+        if (type === 'clientIp' || type === 'serverIp') {
+          params.q = `ip='${condition.split(/'(.*?)'/)[1]}'`
         } else if (type === 'clientCity') {
           params.q = `client_city='${condition.split(/'(.*?)'/)[1]}'`
         } else if (type === 'serverCity') {