fix: CN-1514 表结构变更后前端代码中字段更改(下钻表格)；表格下钻后，切换顶部的下拉列表，表格报错；

src/components/layout/Header.vue

@@ -591,21 +591,28 @@ export default {
         if (curTab.prop === 'protocolPort') {
           const valueGroup = value.split(':')
           if (valueGroup) {
-            queryCondition.push('common_l7_protocol=\'' + valueGroup[0] + '\'')
+            queryCondition.push('l7_protocol=\'' + valueGroup[0] + '\'')
-            queryCondition.push('common_server_port=' + valueGroup[1])
+            queryCondition.push('server_port=' + valueGroup[1])
           }
           // console.log(queryCondition.join(' AND '))
           this.urlChangeParams[this.curTabState.queryCondition] = queryCondition.join(' AND ')
           this.urlChangeParams[this.curTabState.lineQueryCondition] = queryCondition.join(' AND ')
         } else {
-          searchProps.forEach(item => {
+          if (curTab.queryCondition) {
-            queryCondition.push(item + '=\'' + handleSpecialValue(value) + '\'')
+            curTab.queryCondition.forEach(item => {
-          })
+              queryCondition.push(item.replaceAll('$param', value))
+            })
+          } else if (searchProps) {
+            searchProps.forEach(item => {
+              queryCondition.push(item + '=\'' + handleSpecialValue(value) + '\'')
+            })
+          }
+
           this.urlChangeParams[this.curTabState.queryCondition] = queryCondition.join(' OR ')
           const lineQueryCondition = []
           if (curTab.lineQueryCondition) {
             curTab.lineQueryCondition.forEach(item => {
-              lineQueryCondition.push(item.replaceAll('$param', value))
+              lineQueryCondition.push(item.replaceAll('$param', handleSpecialValue(value)))
             })
             this.urlChangeParams[this.curTabState.lineQueryCondition] = lineQueryCondition.join(' OR ')
           }

src/utils/constants.js

@@ -125,8 +125,8 @@ export const entityDetailTabConfig = [
       { name: entityDetailTabsName.relatedEntity, label: 'entities.relatedEntity', icon: 'cn-icon cn-icon-domain-name-resolution', tag: 0 },
       { name: entityDetailTabsName.openPort, label: 'entities.openPort', icon: 'cn-icon cn-icon-open-port', tag: 0 },
       // { name: entityDetailTabsName.digitalCertificate, label: 'entities.digitalCertificate', icon: 'cn-icon cn-icon-digital-certificate', tag: 0 },
-      { name: entityDetailTabsName.securityEvent, label: 'overall.securityEvent', icon: 'cn-icon cn-icon-security-event', tag: 0 },
+      { name: entityDetailTabsName.securityEvent, label: 'overall.securityEvent', icon: 'cn-icon cn-icon-security-event', tag: 0 }
-      //{ name: entityDetailTabsName.performanceEvent, label: 'overall.performanceEvent', icon: 'cn-icon cn-icon-a-PerformanceEvent', tag: 0 }
+      // { name: entityDetailTabsName.performanceEvent, label: 'overall.performanceEvent', icon: 'cn-icon cn-icon-a-PerformanceEvent', tag: 0 }
     ]
   },
   {
@@ -136,8 +136,8 @@ export const entityDetailTabConfig = [
       { name: entityDetailTabsName.relatedEntity, label: 'entities.relatedEntity', icon: 'cn-icon cn-icon-domain-name-resolution', tag: 0 },
       { name: entityDetailTabsName.openPort, label: 'entities.openPort', icon: 'cn-icon cn-icon-open-port', tag: 0 },
       // { name: entityDetailTabsName.digitalCertificate, label: 'entities.digitalCertificate', icon: 'cn-icon cn-icon-digital-certificate', tag: 0 },
-      { name: entityDetailTabsName.securityEvent, label: 'overall.securityEvent', icon: 'cn-icon cn-icon-security-event', tag: 0 },
+      { name: entityDetailTabsName.securityEvent, label: 'overall.securityEvent', icon: 'cn-icon cn-icon-security-event', tag: 0 }
-      //{ name: entityDetailTabsName.performanceEvent, label: 'overall.performanceEvent', icon: 'cn-icon cn-icon-a-PerformanceEvent', tag: 0 }
+      // { name: entityDetailTabsName.performanceEvent, label: 'overall.performanceEvent', icon: 'cn-icon cn-icon-a-PerformanceEvent', tag: 0 }
     ]
   },
   {
@@ -148,7 +148,7 @@ export const entityDetailTabConfig = [
       { name: entityDetailTabsName.openPort, label: 'entities.openPort', icon: 'cn-icon cn-icon-open-port', tag: 0 },
       // { name: entityDetailTabsName.digitalCertificate, label: 'entities.digitalCertificate', icon: 'cn-icon cn-icon-digital-certificate', tag: 0 },
       { name: entityDetailTabsName.securityEvent, label: 'overall.securityEvent', icon: 'cn-icon cn-icon-security-event', tag: 0 },
-      //{ name: entityDetailTabsName.performanceEvent, label: 'overall.performanceEvent', icon: 'cn-icon cn-icon-a-PerformanceEvent', tag: 0 },
+      // { name: entityDetailTabsName.performanceEvent, label: 'overall.performanceEvent', icon: 'cn-icon cn-icon-a-PerformanceEvent', tag: 0 },
       { name: entityDetailTabsName.behaviorPattern, label: 'entities.behaviorPattern', icon: 'cn-icon cn-icon-behavior', tag: 0 }
     ]
   },
@@ -158,8 +158,8 @@ export const entityDetailTabConfig = [
       { name: entityDetailTabsName.deviceInformation, label: 'entities.deviceInformation', icon: 'cn-icon cn-icon-device-info', tag: 0 },
       { name: entityDetailTabsName.accountInformation, label: 'entities.accountInformation', icon: 'cn-icon cn-icon-account-info', tag: 0 },
       { name: entityDetailTabsName.relatedEntity, label: 'entities.relatedEntity', icon: 'cn-icon cn-icon-domain-name-resolution', tag: 0 },
-      { name: entityDetailTabsName.securityEvent, label: 'overall.securityEvent', icon: 'cn-icon cn-icon-security-event', tag: 0 },
+      { name: entityDetailTabsName.securityEvent, label: 'overall.securityEvent', icon: 'cn-icon cn-icon-security-event', tag: 0 }
-      //{ name: entityDetailTabsName.performanceEvent, label: 'overall.performanceEvent', icon: 'cn-icon cn-icon-a-PerformanceEvent', tag: 0 }
+      // { name: entityDetailTabsName.performanceEvent, label: 'overall.performanceEvent', icon: 'cn-icon cn-icon-a-PerformanceEvent', tag: 0 }
     ]
   }
 ]
@@ -784,7 +784,7 @@ export const networkOverviewTabList = [
     label: 'network.ips',
     prop: 'ip',
     queryCycleTotalProp: 'ips',
-    dillDownProp: ['common_client_ip', 'common_server_ip'], // 下钻表格：查询条件q（dillDownProp里条件之间都是OR的关系）,或者queryCondition属性，queryCondition: ['ip = \'$param\' AND side = \'server\''],
+    dillDownProp: ['client_ip', 'server_ip'], // 下钻表格：查询条件q（dillDownProp里条件之间都是OR的关系）,或者queryCondition属性，queryCondition: ['ip = \'$param\' AND side = \'server\''],
     thirdDimensionQueryCondition: [], // 下钻表格：第三级维度查询条件q
     lineQueryCondition: ['ip = \'$param\''], // 曲线图：查询条件q
     lineThirdDimensionQueryCondition: ['side = \'server\''], // 曲线图：第三级维度查询条件q
@@ -817,10 +817,10 @@ export const networkOverviewTabList = [
     label: 'network.applications',
     prop: 'appLabel',
     queryCycleTotalProp: 'applications',
-    dillDownProp: ['common_app_label'],
+    dillDownProp: ['app'],
     thirdDimensionQueryCondition: [], // 下钻表格：第三级维度查询条件q
-    lineQueryCondition: ['common_app_label = \'$param\''], // 曲线图：查询条件q
+    lineQueryCondition: ['app = \'$param\''], // 曲线图：查询条件q
-    lineThirdDimensionQueryCondition: ['notEmpty(common_app_label)'], // 曲线图：第三级维度查询条件q
+    lineThirdDimensionQueryCondition: ['notEmpty(app)'], // 曲线图：第三级维度查询条件q
     checked: true,
     disabled: false,
     panelId: drillDownPanelTypeMapping.networkOverview
@@ -861,10 +861,10 @@ export const networkOverviewTabList = [
     label: 'network.protocols',
     prop: 'l7Protocol',
     queryCycleTotalProp: 'protocols',
-    dillDownProp: ['common_l7_protocol'],
+    dillDownProp: ['l7_protocol'],
     thirdDimensionQueryCondition: [], // 下钻表格：第三级维度查询条件q
-    lineQueryCondition: ['common_l7_protocol = \'$param\''], // 曲线图：查询条件q
+    lineQueryCondition: ['l7_protocol = \'$param\''], // 曲线图：查询条件q
-    lineThirdDimensionQueryCondition: ['notEmpty(common_l7_protocol)'], // 曲线图：第三级维度查询条件q
+    lineThirdDimensionQueryCondition: ['notEmpty(l7_protocol)'], // 曲线图：第三级维度查询条件q
     checked: true,
     disabled: false,
     panelId: drillDownPanelTypeMapping.networkOverview
@@ -938,10 +938,10 @@ export const networkOverviewTabList = [
     label: 'network.protocolPorts',
     prop: 'protocolPort',
     queryCycleTotalProp: 'protocolports',
-    dillDownProp: ['common_l7_protocol', 'common_server_port'],
+    dillDownProp: ['l7_protocol', 'server_port'],
     thirdDimensionQueryCondition: [], // 下钻表格：第三级维度查询条件q
-    lineQueryCondition: ['common_l7_protocol = \'$protocol_param\' AND common_server_port = $port_param'], // 曲线图：查询条件q
+    lineQueryCondition: ['l7_protocol = \'$protocol_param\' AND server_port = $port_param'], // 曲线图：查询条件q
-    lineThirdDimensionQueryCondition: ['notEmpty(common_l7_protocol)'], // 曲线图：第三级维度查询条件q
+    lineThirdDimensionQueryCondition: ['notEmpty(l7_protocol)'], // 曲线图：第三级维度查询条件q
     checked: false,
     disabled: false,
     panelId: drillDownPanelTypeMapping.networkOverview
@@ -949,7 +949,7 @@ export const networkOverviewTabList = [
     label: 'network.clientIps',
     prop: 'clientIp',
     queryCycleTotalProp: 'clientIps',
-    dillDownProp: ['common_client_ip'],
+    dillDownProp: ['client_ip'],
     thirdDimensionQueryCondition: [], // 下钻表格：第三级维度查询条件q
     lineQueryCondition: ['ip = \'$param\' and side = \'client\''], // 曲线图：查询条件q
     lineThirdDimensionQueryCondition: ['notEmpty(ip) and side = \'client\''], // 曲线图：第三级维度查询条件q
@@ -960,7 +960,7 @@ export const networkOverviewTabList = [
     label: 'network.serverIps',
     prop: 'serverIp',
     queryCycleTotalProp: 'serverIps',
-    dillDownProp: ['common_server_ip'],
+    dillDownProp: ['server_ip'],
     thirdDimensionQueryCondition: [], // 下钻表格：第三级维度查询条件q
     lineQueryCondition: ['ip = \'$param\' and side = \'server\''], // 曲线图：查询条件q
     lineThirdDimensionQueryCondition: ['notEmpty(ip) and side = \'server\''], // 曲线图：第三级维度查询条件q
@@ -1112,8 +1112,8 @@ export const networkAppPerformanceTabList = [
     label: 'network.applications',
     prop: 'appLabel',
     queryCycleTotalProp: 'applications',
-    dillDownProp: ['common_app_label'],
+    dillDownProp: ['app'],
-    lineQueryCondition: ['common_app_label = \'$param\''],
+    lineQueryCondition: ['app = \'$param\''],
     checked: true,
     disabled: false,
     panelId: drillDownPanelTypeMapping.npmOverviewApp
@@ -1148,7 +1148,7 @@ export const networkAppPerformanceTabList = [
     label: 'network.protocols',
     prop: 'l7Protocol',
     queryCycleTotalProp: 'protocols',
-    dillDownProp: ['common_l7_protocol'],
+    dillDownProp: ['l7_protocol'],
     lineQueryCondition: ['l7_protocol = \'$param\''],
     checked: true,
     disabled: false,
@@ -1211,8 +1211,8 @@ export const networkAppPerformanceTabList = [
     label: 'network.protocolPorts',
     prop: 'protocolPort',
     queryCycleTotalProp: 'protocolports',
-    dillDownProp: ['common_l7_protocol', 'common_server_port'],
+    dillDownProp: ['l7_protocol', 'server_port'],
-    lineQueryCondition: ['common_l7_protocol = \'$protocol_param\' AND common_server_port = $port_param'],
+    lineQueryCondition: ['l7_protocol = \'$protocol_param\' AND server_port = $port_param'],
     checked: false,
     disabled: false,
     panelId: drillDownPanelTypeMapping.npmOverviewCommon
@@ -1220,7 +1220,7 @@ export const networkAppPerformanceTabList = [
     label: 'network.clientIps',
     prop: 'clientIp',
     queryCycleTotalProp: 'clientIps',
-    dillDownProp: ['common_client_ip'],
+    dillDownProp: ['client_ip'],
     lineQueryCondition: ['ip = \'$param\' AND side = \'client\''],
     checked: false,
     disabled: false,
@@ -1229,7 +1229,7 @@ export const networkAppPerformanceTabList = [
     label: 'network.serverIps',
     prop: 'serverIp',
     queryCycleTotalProp: 'serverIps',
-    dillDownProp: ['common_server_ip'],
+    dillDownProp: ['server_ip'],
     lineQueryCondition: ['ip = \'$param\' AND side = \'server\''],
     checked: false,
     disabled: false,
@@ -1332,7 +1332,7 @@ export const linkMonitorTabList = [
     label: 'network.ips', // tab名称对应的il8n
     prop: 'ip', // 接口返回数据中，tab第一列对应的属性名
     queryCycleTotalProp: 'ips', // SQL中查询不同纬度的列名称
-    dillDownProp: ['common_client_ip', 'common_server_ip'], // 下钻时，传递的查询条件，即接口的q参数
+    dillDownProp: ['client_ip', 'server_ip'], // 下钻时，传递的查询条件，即接口的q参数
     checked: true, // 自定义设置中，是否默认选中
     disabled: false, // 自定义设置中，是否可操作（选中或取消选中）
     panelId: drillDownPanelTypeMapping.linkMonitor// 下钻后展示的panelId
@@ -1356,7 +1356,7 @@ export const linkMonitorTabList = [
     label: 'network.applications',
     prop: 'appLabel',
     queryCycleTotalProp: 'applications',
-    dillDownProp: ['common_app_label'],
+    dillDownProp: ['app'],
     checked: true,
     disabled: false,
     panelId: drillDownPanelTypeMapping.linkMonitor
@@ -1388,7 +1388,7 @@ export const linkMonitorTabList = [
     label: 'network.protocols',
     prop: 'l7Protocol',
     queryCycleTotalProp: 'protocols',
-    dillDownProp: ['common_l7_protocol'],
+    dillDownProp: ['l7_protocol'],
     checked: true,
     disabled: false,
     panelId: drillDownPanelTypeMapping.linkMonitor
@@ -1444,7 +1444,7 @@ export const linkMonitorTabList = [
     label: 'network.protocolPorts',
     prop: 'protocolPort',
     queryCycleTotalProp: 'protocolports',
-    dillDownProp: ['common_l7_protocol', 'common_server_port'],
+    dillDownProp: ['l7_protocol', 'server_port'],
     checked: false,
     disabled: false,
     panelId: drillDownPanelTypeMapping.linkMonitor
@@ -1452,7 +1452,7 @@ export const linkMonitorTabList = [
     label: 'network.clientIps',
     prop: 'clientIp',
     queryCycleTotalProp: 'clientIps',
-    dillDownProp: ['common_client_ip'],
+    dillDownProp: ['client_ip'],
     checked: false,
     disabled: false,
     panelId: drillDownPanelTypeMapping.linkMonitor
@@ -1460,7 +1460,7 @@ export const linkMonitorTabList = [
     label: 'network.serverIps',
     prop: 'serverIp',
     queryCycleTotalProp: 'serverIps',
-    dillDownProp: ['common_server_ip'],
+    dillDownProp: ['server_ip'],
     checked: false,
     disabled: false,
     panelId: drillDownPanelTypeMapping.linkMonitor
@@ -1552,7 +1552,7 @@ export const dnsServiceInsightsTabList = [
     label: 'dns.dnsServer', // tab名称对应的il8n
     prop: 'dnsServer', // 接口返回数据中，tab第一列对应的属性名
     queryCycleTotalProp: 'dnsServer', // SQL中查询不同纬度的列名称
-    dillDownProp: ['common_server_ip'], // 下钻时，传递的查询条件，即接口的q参数
+    dillDownProp: ['server_ip'], // 下钻时，传递的查询条件，即接口的q参数
     lineQueryCondition: ['server_ip = \'$param\''], // 曲线图：查询条件q
     checked: true, // 自定义设置中，是否默认选中
     disabled: false, // 自定义设置中，是否可操作（选中或取消选中）

src/views/charts2/charts/entityDetail/EntityDetailBasicInfo.vue

@@ -129,9 +129,9 @@ export default {
       this.levelTwoTags = []
       const basicInfoRequest = axios.get(`${api.entity.basicInfo}/${this.entity.entityType}?resource=${this.entity.entityName}`)
       let requestArray = []
-      if(this.entity.entityType === entityType.subscriber) {
+      if (this.entity.entityType === entityType.subscriber) {
-        requestArray = [null,basicInfoRequest]
+        requestArray = [null, basicInfoRequest]
-      }else {
+      } else {
         const tagRequest = axios.get(`${api.entity.tags}/${this.entity.entityType}?resource=${this.entity.entityName}`)
         requestArray = [tagRequest, basicInfoRequest]
       }
@@ -312,7 +312,7 @@ export default {
         networkOverviewAnalysisItemCopy.url = resolvePath({
           path: networkOverviewAnalysisItemCopy.path,
           query: {
-            queryCondition: `common_client_ip='${props.entity.entityName}' OR common_server_ip='${props.entity.entityName}'`,
+            queryCondition: `client_ip='${props.entity.entityName}' OR server_ip='${props.entity.entityName}'`,
             lineQueryCondition: `ip='${props.entity.entityName}'`,
             panelName: props.entity.entityName,
             thirdMenu: 'network.ips',
@@ -340,7 +340,7 @@ export default {
         dnsAnalysisItemCopy.url = resolvePath({
           path: dnsAnalysisItem.path,
           query: {
-            queryCondition: `common_server_ip='${props.entity.entityName}'`,
+            queryCondition: `server_ip='${props.entity.entityName}'`,
             lineQueryCondition: `server_ip='${props.entity.entityName}'`,
             panelName: props.entity.entityName,
             thirdMenu: 'dns.dnsServer',
@@ -404,7 +404,7 @@ export default {
         break
       }
       case 'app': {
-        const queryCondition = `common_app_label='${props.entity.entityName}'`
+        const queryCondition = `app='${props.entity.entityName}'`
         const networkOverviewAnalysisItemCopy = _.cloneDeep(networkOverviewAnalysisItem)
         networkOverviewAnalysisItemCopy.url = resolvePath({
           path: networkOverviewAnalysisItemCopy.path,

src/views/charts2/charts/entityDetail/lines/App.vue

@@ -481,7 +481,7 @@ export default {
           this.lineTab = 'total'
           this.legendSelectChange(tab, 0)
         })
-        /*tabs.forEach((e, i) => {
+        /* tabs.forEach((e, i) => {
           if (i !== 0) {
             e.show = false
           }
@@ -490,7 +490,7 @@ export default {
           e.invertTab = false
           this.lineTab = 'total'
           this.legendSelectChange(e, 0)
-        })*/
+        }) */
         this.tabs = tabs
         this.$nextTick(() => {
           this.echartsInit(lineData)

src/views/charts2/charts/linkMonitor/LinkBlock.vue

@@ -371,7 +371,7 @@ export default {
       return width
     },
     drillLinkId (item) {
-      const queryCondition = `common_out_link_id = ${item.outLinkId} or common_in_link_id = ${item.inLinkId}`
+      const queryCondition = `out_link_id = ${item.outLinkId} or in_link_id = ${item.inLinkId}`
       beforeRouterPush()
       this.$router.push({
         query: {

src/views/charts2/charts/linkMonitor/LinkTrafficLine.vue

@@ -159,8 +159,8 @@ export default {
       if (this.queryCondition) {
         const condition = this.queryCondition.split(' or ')
         if (condition.length > 1) {
-          params.outParam = condition.find(c => c.indexOf('common_out_link_id') > -1 || c.indexOf('out_link_direction') > -1)
+          params.outParam = condition.find(c => c.indexOf('out_link_id') > -1 || c.indexOf('out_link_direction') > -1)
-          params.inParam = condition.find(c => c.indexOf('common_in_link_id') > -1 || c.indexOf('in_link_direction') > -1)
+          params.inParam = condition.find(c => c.indexOf('in_link_id') > -1 || c.indexOf('in_link_direction') > -1)
         }
       }
       this.loading = true

src/views/charts2/charts/linkMonitor/LinkTrafficSankey.vue

@@ -103,10 +103,10 @@ export default {
         const condition = this.queryCondition.split(' or ')
         if (condition.length > 1) {
           if (n === 0) {
-            params.q = condition.find(c => c.indexOf('common_in_link_id') > -1 || c.indexOf('in_link_direction') > -1)
+            params.q = condition.find(c => c.indexOf('in_link_id') > -1 || c.indexOf('in_link_direction') > -1)
             url = api.linkMonitor.drilldownQuadrupleIngressAnalysis // 入口
           } else {
-            params.q = condition.find(c => c.indexOf('common_out_link_id') > -1 || c.indexOf('out_link_direction') > -1)
+            params.q = condition.find(c => c.indexOf('out_link_id') > -1 || c.indexOf('out_link_direction') > -1)
             url = api.linkMonitor.drilldownQquadrupleEgressAnalysis // 出口
           }
         }

src/views/charts2/charts/linkMonitor/localComponents/LinkTrafficDrillDownList.vue

@@ -127,20 +127,20 @@ export default {
         const condition = this.queryCondition.split(' or ')
         if (condition.length > 1) {
           // params.outParam = true
-          params.outParam = condition.find(c => c.indexOf('common_out_link_id') > -1 || c.indexOf('out_link_direction') > -1)
+          params.outParam = condition.find(c => c.indexOf('out_link_id') > -1 || c.indexOf('out_link_direction') > -1)
-          params.inParam = condition.find(c => c.indexOf('common_in_link_id') > -1 || c.indexOf('in_link_direction') > -1)
+          params.inParam = condition.find(c => c.indexOf('in_link_id') > -1 || c.indexOf('in_link_direction') > -1)
           let bandwidthAll = 0
           let inLinkId = null
           let outLinkId = null
           let linkDirection = null
           const outParamSplit = params.outParam.split('=')
           const inParamSplit = params.inParam.split('=')
-          if (outParamSplit[0] && (outParamSplit[0].trim() === 'common_out_link_id')) {
+          if (outParamSplit[0] && (outParamSplit[0].trim() === 'out_link_id')) {
             outLinkId = outParamSplit[1].trim()
           } else if (outParamSplit[0].trim() === 'out_link_direction') {
             linkDirection = outParamSplit[1].trim()
           }
-          if (inParamSplit[0] && (inParamSplit[0].trim() === 'common_in_link_id')) {
+          if (inParamSplit[0] && (inParamSplit[0].trim() === 'in_link_id')) {
             inLinkId = inParamSplit[1].trim()
           }
           if (outLinkId && inLinkId) {

src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue

@@ -1420,8 +1420,8 @@ export default {
       if (tab.prop === 'protocolPort') {
         const valueGroup = value.split(':')
         if (valueGroup) {
-          queryCondition.push("common_l7_protocol='" + valueGroup[0] + "'")
+          queryCondition.push("l7_protocol='" + valueGroup[0] + "'")
-          queryCondition.push('common_server_port=' + valueGroup[1])
+          queryCondition.push('server_port=' + valueGroup[1])
         }
         conditions = queryCondition.join(' AND ')
         this.urlChangeParams[this.curTabState.queryCondition] = conditions
@@ -1571,8 +1571,8 @@ export default {
       if (curTab.prop === 'protocolPort') {
         const valueGroup = columnValue.split(':')
         if (valueGroup) {
-          queryCondition.push("common_l7_protocol='" + valueGroup[0] + "'")
+          queryCondition.push("l7_protocol='" + valueGroup[0] + "'")
-          queryCondition.push('common_server_port=' + valueGroup[1])
+          queryCondition.push('server_port=' + valueGroup[1])
         }
         this.urlChangeParams[this.curTabState.queryCondition] = queryCondition.join(' AND ')
         this.urlChangeParams[this.curTabState.lineQueryCondition] = queryCondition.join(' AND ')
@@ -1835,9 +1835,9 @@ export default {
       if (fourthPanel === drillDownPanelTypeMapping.npmOverviewIp) {
         if (dimensionType === 'clientIp' || dimensionType === 'serverIp' || dimensionType === 'ip') {
           if (tabIndex === 0) {
-            return `common_client_ip='${fourthMenu}'`
+            return `client_ip='${fourthMenu}'`
           } else if (tabIndex === 1) {
-            return `common_server_ip='${fourthMenu}'`
+            return `server_ip='${fourthMenu}'`
           }
         }
       }

src/views/charts2/charts/options/echartOption.js

@@ -8,7 +8,7 @@ import {
   unitTypes,
   chartColorForSubscriberTopApp
 } from '@/utils/constants'
-import unitConvert,{valueToRangeValue} from '@/utils/unit-convert'
+import unitConvert, { valueToRangeValue } from '@/utils/unit-convert'
 import { axisFormatter } from '@/views/charts/charts/tools'
 import { xAxisTimeFormatter, xAxisTimeRich } from '@/utils/date-util'
 
@@ -739,7 +739,7 @@ export const entityDetailSubscriberTopApp = {
     show: true,
     trigger: 'axis',
     formatter: function (param) {
-      return `${param[0].name}: ${valueToRangeValue(param[0].value[0], unitTypes.percent,null,null,1).join(' ')}`
+      return `${param[0].name}: ${valueToRangeValue(param[0].value[0], unitTypes.percent, null, null, 1).join(' ')}`
     },
     className: 'nz-chart-tooltip',
     extraCssText: 'box-shadow: 0 0 3px rgba(0, 0, 0, 0.3);max-width: 400px !important'
@@ -792,7 +792,7 @@ export const entityDetailSubscriberTopApp = {
       position: 'right',
       valueAnimation: true,
       formatter: function (param, index, callback) {
-        return `${valueToRangeValue(param.value[0], unitTypes.percent,null,null,1).join(' ')}`
+        return `${valueToRangeValue(param.value[0], unitTypes.percent, null, null, 1).join(' ')}`
       }
     }
   }]