From df0e29c3ade8a0606efeebc9228e65795510b892 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com> Date: Thu, 21 Sep 2023 15:42:19 +0800 Subject: [PATCH] =?UTF-8?q?CN-1335=20fix:=20Link=20Monitor=E7=9A=84?= =?UTF-8?q?=E4=B8=8B=E9=92=BB=E9=A1=B5=E4=B8=ADTotal=E3=80=81Ingress?= =?UTF-8?q?=E3=80=81Egress=E5=8F=96=E5=80=BC=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/static-data.js | 6 ++--- .../charts/linkMonitor/LinkTrafficLine.vue | 14 +++++++---- .../linkMonitor/LinkTrafficLine.test.js | 24 +++++++++---------- 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/src/utils/static-data.js b/src/utils/static-data.js index 5ed5a958..b1425d81 100644 --- a/src/utils/static-data.js +++ b/src/utils/static-data.js @@ -167,9 +167,9 @@ export const dataForLinkTrafficLine = { } ], tabs: [ - { analysis: {}, name: 'network.total', class: 'total', show: true, invertTab: true, positioning: 0, data: [], unitType: '' }, - { analysis: {}, name: 'linkMonitor.ingress', class: 'ingress', show: true, invertTab: true, positioning: 1, data: [], unitType: '' }, - { analysis: {}, name: 'linkMonitor.egress', class: 'egress', show: true, invertTab: true, positioning: 2, data: [], unitType: '' } + { analysis: {}, name: 'network.total', class: 'total', label: 'total', show: true, invertTab: true, positioning: 0, data: [], unitType: '' }, + { analysis: {}, name: 'linkMonitor.ingress', class: 'ingress', label: 'in', show: true, invertTab: true, positioning: 1, data: [], unitType: '' }, + { analysis: {}, name: 'linkMonitor.egress', class: 'egress', label: 'out', show: true, invertTab: true, positioning: 2, data: [], unitType: '' } ] } diff --git a/src/views/charts2/charts/linkMonitor/LinkTrafficLine.vue b/src/views/charts2/charts/linkMonitor/LinkTrafficLine.vue index 4b04e198..05613f4d 100644 --- a/src/views/charts2/charts/linkMonitor/LinkTrafficLine.vue +++ b/src/views/charts2/charts/linkMonitor/LinkTrafficLine.vue @@ -364,7 +364,8 @@ export default { if (item.type === val) { lineData = Object.keys(item).map(t => { return { - ...item[t] + ...item[t], + label: t } }) } @@ -376,14 +377,17 @@ export default { this.legendInit(lineData, active, show, unit, tabs) }, legendInit (data, active, show, type, linkData) { - data.forEach((d, i) => { - linkData[i].data = d.values - linkData[i].analysis = d.analysis + data.forEach(d => { + const obj = linkData.find(item => d.label.includes(item.label)) + if (obj) { + obj.data = d.values + obj.analysis = d.analysis + } }) let num = 0 linkData.forEach(e => { e.unitType = type - if (e.name !== 'network.total' && parseFloat(e.analysis.avg) === 0) { + if (parseFloat(e.analysis.avg) === 0 || isNaN(parseFloat(e.analysis.avg))) { e.show = false num += 1 } else { diff --git a/test/views/charts2/charts/linkMonitor/LinkTrafficLine.test.js b/test/views/charts2/charts/linkMonitor/LinkTrafficLine.test.js index 353286de..0a90e2a4 100644 --- a/test/views/charts2/charts/linkMonitor/LinkTrafficLine.test.js +++ b/test/views/charts2/charts/linkMonitor/LinkTrafficLine.test.js @@ -72,8 +72,8 @@ describe('views/charts2/charts/linkMonitor/LinkTrafficLine.vue测试', () => { const textNode6 = wrapper.get('[test-id="line-packetLoss"]') const textNode7 = wrapper.get('[test-id="line-packetRetrans"]') - expect(textNode0.text()).toEqual('756.87Kbps') - expect(textNode1.text()).toEqual('<0.01%') + expect(textNode0.text()).toEqual('10.58Mbps') + expect(textNode1.text()).toEqual('0.01%') expect(textNode2.text()).toEqual('5') expect(textNode3.text()).toEqual('92ms') expect(textNode4.text()).toEqual('154ms') @@ -95,8 +95,8 @@ describe('views/charts2/charts/linkMonitor/LinkTrafficLine.vue测试', () => { const textNode2 = await wrapper.get('[test-id="tabContent2"]') await new Promise(resolve => setTimeout(() => { - expect(textNode0.text()).toEqual('756.87Kbps') - expect(textNode1.text()).toEqual('10.58Mbps') + expect(textNode0.text()).toEqual('10.58Mbps') + expect(textNode1.text()).toEqual('756.87Kbps') expect(textNode2.text()).toEqual('9.82Mbps') resolve() }, 200)) @@ -108,9 +108,9 @@ describe('views/charts2/charts/linkMonitor/LinkTrafficLine.vue测试', () => { const textNode2 = await wrapper.get('[test-id="tabContent2"]') await new Promise(resolve => setTimeout(() => { - expect(textNode0.text()).toEqual('72.72packets/s') - expect(textNode1.text()).toEqual('904.03packets/s') - expect(textNode2.text()).toEqual('976.75packets/s') + expect(textNode0.text()).toEqual('976.75packets/s') + expect(textNode1.text()).toEqual('72.72packets/s') + expect(textNode2.text()).toEqual('904.03packets/s') resolve() }, 200)) }) @@ -129,8 +129,8 @@ describe('views/charts2/charts/linkMonitor/LinkTrafficLine.vue测试', () => { const textNode6 = wrapper.get('[test-id="line-packetLoss"]') const textNode7 = wrapper.get('[test-id="line-packetRetrans"]') - expect(textNode0.text()).toEqual('75.69Tbps') - expect(textNode1.text()).toEqual('37843.52%') + expect(textNode0.text()).toEqual('10.58Mbps') + expect(textNode1.text()).toEqual('0.01%') expect(textNode2.text()).toEqual('1') expect(textNode3.text()).toEqual('9.29s') expect(textNode4.text()).toEqual('154ms') @@ -159,9 +159,9 @@ describe('views/charts2/charts/linkMonitor/LinkTrafficLine.vue测试', () => { const textNode2 = await wrapper.get('[test-id="tabContent2"]') await new Promise(resolve => setTimeout(() => { - expect(textNode0.text()).toEqual('727.20Mpackets/s') - expect(textNode1.text()).toEqual('904.03Gpackets/s') - expect(textNode2.text()).toEqual('976.75Gpackets/s') + expect(textNode0.text()).toEqual('976.75Gpackets/s') + expect(textNode1.text()).toEqual('727.20Mpackets/s') + expect(textNode2.text()).toEqual('904.03Gpackets/s') resolve() }, 200)) })