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

fix: Link monitor网格模块，部分字段名改为新字段名

Browse Source
This commit is contained in:
刘洪洪
2022-10-14 11:03:31 +08:00
parent 2a0f4f078f
commit cb67ddd333
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/views/charts2/charts/linkMonitor/LinkDirectionGrid.vue
View File

@@ -95,9 +95,9 @@ export default {
const data = gridData.find(g => g.linkId === ingressLink.linkId) const data = gridData.find(g => g.linkId === ingressLink.linkId)
// 上行使用情况计算 // 上行使用情况计算
const egressUsage = this.computeUsage(d.egressBytes, egressLink.bandwidth) const egressUsage = this.computeUsage(d.egressBitsRate, egressLink.bandwidth)
// 下行使用情况计算 // 下行使用情况计算
const ingressUsage = this.computeUsage(d.ingressBytes, ingressLink.bandwidth) const ingressUsage = this.computeUsage(d.ingressBitsRate, ingressLink.bandwidth)
// 宽带使用超过90%，赋红点 // 宽带使用超过90%，赋红点
d.usageMore90 = false d.usageMore90 = false
if (egressUsage >= 0.9 || ingressUsage >= 0.9) { if (egressUsage >= 0.9 || ingressUsage >= 0.9) {
@@ -118,7 +118,7 @@ export default {
linkId: egressLink.linkId, linkId: egressLink.linkId,
egressUsage: egressUsage, egressUsage: egressUsage,
ingressUsage: ingressUsage, ingressUsage: ingressUsage,
totalBytes: d.totalBytes, totalBitsRate: d.totalBitsRate,
...d ...d
}) })
} }
@@ -129,7 +129,7 @@ export default {
linkId: egressLink.linkId, linkId: egressLink.linkId,
egressUsage: egressUsage, egressUsage: egressUsage,
ingressUsage: ingressUsage, ingressUsage: ingressUsage,
totalBytes: d.totalBytes, totalBitsRate: d.totalBitsRate,
...d ...d
}] }]
}) })
@@ -158,9 +158,9 @@ export default {
}) })
// 上行使用情况计算 // 上行使用情况计算
const egressUsage = this.computeUsage(d.egressBytes, egressBanwidth) const egressUsage = this.computeUsage(d.egressBitsRate, egressBanwidth)
// 下行使用情况计算 // 下行使用情况计算
const ingressUsage = this.computeUsage(d.ingressBytes, ingressBanwidth) const ingressUsage = this.computeUsage(d.ingressBitsRate, ingressBanwidth)
// 宽带使用超过90%，赋红点 // 宽带使用超过90%，赋红点
d.usageMore90 = false d.usageMore90 = false
if (egressUsage >= 0.9 || ingressUsage >= 0.9) { if (egressUsage >= 0.9 || ingressUsage >= 0.9) {
@@ -182,7 +182,7 @@ export default {
nextHop: egressLink.nextHop, nextHop: egressLink.nextHop,
egressUsage: egressUsage, egressUsage: egressUsage,
ingressUsage: ingressUsage, ingressUsage: ingressUsage,
totalBytes: d.totalBytes, totalBitsRate: d.totalBitsRate,
...d ...d
}) })
} }
@@ -195,7 +195,7 @@ export default {
nextHop: ingressLink.nextHop, nextHop: ingressLink.nextHop,
egressUsage: egressUsage, egressUsage: egressUsage,
ingressUsage: ingressUsage, ingressUsage: ingressUsage,
totalBytes: d.totalBytes, totalBitsRate: d.totalBitsRate,
...d ...d
}] }]
}) })
@@ -204,6 +204,7 @@ export default {
}) })
this.gridData2 = gridData2 this.gridData2 = gridData2
console.log('打印下一跳数据', gridData2)
} else { } else {
this.isNoData = true this.isNoData = true
} }

2
src/views/charts2/charts/linkMonitor/LinkDirectionGrid/PopoverContent.vue
View File

@@ -73,7 +73,7 @@
<div class="block-content-item-name">{{ $t('linkMonitor.linkBlock.total') }}</div> <div class="block-content-item-name">{{ $t('linkMonitor.linkBlock.total') }}</div>
<div class="block-content-item-value"> <div class="block-content-item-value">
{{unitConvert(row.egress[index2].totalBytes, unitTypes.bps).join('')}} {{unitConvert(row.egress[index2].totalBitsRate, unitTypes.bps).join('')}}
</div> </div>
</div> </div>
</div> </div>