diff --git a/src/views/charts2/charts/linkMonitor/LinkTrafficSankey.vue b/src/views/charts2/charts/linkMonitor/LinkTrafficSankey.vue index ef50bb22..84cd5cf1 100644 --- a/src/views/charts2/charts/linkMonitor/LinkTrafficSankey.vue +++ b/src/views/charts2/charts/linkMonitor/LinkTrafficSankey.vue @@ -94,9 +94,9 @@ export default { const condition = this.queryCondition.toLowerCase().split(' or ') if (condition.length > 1) { if (n == 0) { - params.q = condition.find(c => c.indexOf('common_ingress_link_id') > -1) + params.q = condition.find(c => c.indexOf('common_ingress_link_id') > -1 || c.indexOf('ingress_link_direction') > -1) } else { - params.q = condition.find(c => c.indexOf('common_egress_link_id') > -1) + params.q = condition.find(c => c.indexOf('common_egress_link_id') > -1 || c.indexOf('egress_link_direction') > -1) } } if (n == 0) { diff --git a/src/views/charts2/charts/linkMonitor/localComponents/LinkTrafficDrillDownList.vue b/src/views/charts2/charts/linkMonitor/localComponents/LinkTrafficDrillDownList.vue index 2e4b3c3d..b1c99af5 100644 --- a/src/views/charts2/charts/linkMonitor/localComponents/LinkTrafficDrillDownList.vue +++ b/src/views/charts2/charts/linkMonitor/localComponents/LinkTrafficDrillDownList.vue @@ -103,19 +103,18 @@ export default { const condition1 = condition[1].split('=') let ingressLinkId = null let egressLinkId = null - if (condition0[0] && condition0[0].trim() === 'common_egress_link_id') { + if (condition0[0] && (condition0[0].trim() === 'common_egress_link_id' || condition0[0].trim() === 'egress_link_direction')) { egressLinkId = condition0[1].trim() } - if (condition0[0] && condition0[0].trim() === 'common_ingress_link_id') { + if (condition0[0] && (condition0[0].trim() === 'common_ingress_link_id' || condition0[0].trim() === 'ingress_link_direction')) { ingressLinkId = condition0[1].trim() } - if (condition1[0] && condition1[0].trim() === 'common_egress_link_id') { + if (condition1[0] && (condition1[0].trim() === 'common_egress_link_id' || condition1[0].trim() === 'egress_link_direction')) { egressLinkId = condition1[1].trim() } - if (condition1[0] && condition1[0].trim() === 'common_ingress_link_id') { + if (condition1[0] && (condition1[0].trim() === 'common_ingress_link_id' || condition1[0].trim() === 'ingress_link_direction')) { ingressLinkId = condition1[1].trim() } - console.info(condition0, condition1, ingressLinkId, egressLinkId) this.cnLinkInfo.forEach(e => { if (ingressLinkId === e.originalLinkId) { bandwidthAll += e.bandwidth