gfwleak/cyber-narrator-cn-ui
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CN-1335 fix: Link Monitor的下钻页中Total、Ingress、Egress取值不正确

Browse Source
This commit is contained in:
刘洪洪
2023-09-21 15:42:19 +08:00
parent ea6bd122ef
commit df0e29c3ad
3 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/utils/static-data.js
View File

@@ -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: '' }
]
}

14
src/views/charts2/charts/linkMonitor/LinkTrafficLine.vue
View File

@@ -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 {

24
test/views/charts2/charts/linkMonitor/LinkTrafficLine.test.js
View File

@@ -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))
})