fix: 修改链路部分字段名

This commit is contained in:
chenjinsong
2023-08-29 15:35:22 +08:00
parent c53cecad93
commit db13ef65e8
6 changed files with 2004 additions and 2004 deletions

File diff suppressed because one or more lines are too long

View File

@@ -733,7 +733,7 @@ export const networkOverviewTabList = [
checked: true, checked: true,
disabled: false, disabled: false,
panelId: drillDownPanelTypeMapping.networkOverview panelId: drillDownPanelTypeMapping.networkOverview
},{ }, {
label: 'network.protocols', label: 'network.protocols',
prop: 'l7Protocol', prop: 'l7Protocol',
queryCycleTotalProp: 'protocols', queryCycleTotalProp: 'protocols',
@@ -741,7 +741,7 @@ export const networkOverviewTabList = [
checked: true, checked: true,
disabled: false, disabled: false,
panelId: drillDownPanelTypeMapping.networkOverview panelId: drillDownPanelTypeMapping.networkOverview
},{ }, {
label: 'network.regions', label: 'network.regions',
prop: 'superAdminArea', prop: 'superAdminArea',
queryCycleTotalProp: 'regions', queryCycleTotalProp: 'regions',
@@ -945,7 +945,7 @@ export const networkAppPerformanceTabList = [
checked: true, checked: true,
disabled: false, disabled: false,
panelId: drillDownPanelTypeMapping.npmOverviewDomain panelId: drillDownPanelTypeMapping.npmOverviewDomain
},{ }, {
label: 'network.secondLevelDomains', label: 'network.secondLevelDomains',
prop: 'domainSld', prop: 'domainSld',
queryCycleTotalProp: 'domainSld', queryCycleTotalProp: 'domainSld',
@@ -1164,7 +1164,7 @@ export const linkMonitorTabList = [
checked: true, checked: true,
disabled: false, disabled: false,
panelId: drillDownPanelTypeMapping.linkMonitor panelId: drillDownPanelTypeMapping.linkMonitor
},{ }, {
label: 'network.secondLevelDomains', label: 'network.secondLevelDomains',
prop: 'domainSld', prop: 'domainSld',
queryCycleTotalProp: 'domainSld', queryCycleTotalProp: 'domainSld',
@@ -1172,7 +1172,7 @@ export const linkMonitorTabList = [
checked: true, checked: true,
disabled: false, disabled: false,
panelId: drillDownPanelTypeMapping.linkMonitor panelId: drillDownPanelTypeMapping.linkMonitor
}, { }, {
label: 'network.protocols', label: 'network.protocols',
prop: 'l7Protocol', prop: 'l7Protocol',
queryCycleTotalProp: 'protocols', queryCycleTotalProp: 'protocols',
@@ -1228,7 +1228,7 @@ export const linkMonitorTabList = [
checked: false, checked: false,
disabled: false, disabled: false,
panelId: drillDownPanelTypeMapping.linkMonitor panelId: drillDownPanelTypeMapping.linkMonitor
},{ }, {
label: 'network.protocolPorts', label: 'network.protocolPorts',
prop: 'protocolPort', prop: 'protocolPort',
queryCycleTotalProp: 'protocolports', queryCycleTotalProp: 'protocolports',

View File

@@ -205,8 +205,8 @@ export default {
if (info) { if (info) {
const hit = data.find(d => d.linkId === info.linkId) const hit = data.find(d => d.linkId === info.linkId)
if (hit) { if (hit) {
hit.egressBitsRate += d.egressBitsRate hit.outBitsRate += d.outBitsRate
hit.ingressBitsRate += d.ingressBitsRate hit.inBitsRate += d.inBitsRate
if (info.direction === 'egress') { if (info.direction === 'egress') {
hit.egressBandwidth = info.bandwidth hit.egressBandwidth = info.bandwidth
hit.egressLinkId = d.linkId hit.egressLinkId = d.linkId
@@ -217,8 +217,8 @@ export default {
} else { } else {
const hit = { const hit = {
linkId: info.linkId, linkId: info.linkId,
egressBitsRate: d.egressBitsRate, outBitsRate: d.outBitsRate,
ingressBitsRate: d.ingressBitsRate inBitsRate: d.inBitsRate
} }
if (info.direction === 'egress') { if (info.direction === 'egress') {
hit.egressBandwidth = info.bandwidth hit.egressBandwidth = info.bandwidth
@@ -232,16 +232,16 @@ export default {
} }
}) })
this.linkNoData = data.length === 0 this.linkNoData = data.length === 0
data.forEach((item) => { data.forEach(item => {
item.totalBitsRate = item.egressBitsRate + item.ingressBitsRate item.totalBitsRate = item.outBitsRate + item.inBitsRate
}) })
const sorted = data.sort((a, b) => b.totalBitsRate - a.totalBitsRate) const sorted = data.sort((a, b) => b.totalBitsRate - a.totalBitsRate)
const linkColors = colorGradientCalculation(this.gradientColor[0], this.gradientColor[1], sorted.map(s => s.totalBitsRate)) const linkColors = colorGradientCalculation(this.gradientColor[0], this.gradientColor[1], sorted.map(s => s.totalBitsRate))
sorted.forEach((s, i) => { sorted.forEach((s, i) => {
s.color = linkColors[i] s.color = linkColors[i]
s.egressUsage = this.computeUsage(s.egressBitsRate, s.egressBandwidth) s.egressUsage = this.computeUsage(s.outBitsRate, s.egressBandwidth)
s.ingressUsage = this.computeUsage(s.ingressBitsRate, s.ingressBandwidth) s.ingressUsage = this.computeUsage(s.inBitsRate, s.ingressBandwidth)
s.popoverWidth = this.computePopoverWidth(s.egressUsage, s.ingressUsage) s.popoverWidth = this.computePopoverWidth(s.egressUsage, s.ingressUsage)
}) })
this.linkData = sorted this.linkData = sorted
@@ -260,9 +260,9 @@ export default {
if (!this.nextHopNoData) { if (!this.nextHopNoData) {
let directionArr = [] let directionArr = []
nextHopData.forEach((item) => { nextHopData.forEach((item) => {
if (item.egressLinkDirection !== '' && item.ingressLinkDirection !== '') { if (item.outLinkDirection !== '' && item.inLinkDirection !== '') {
directionArr.push(item.egressLinkDirection) directionArr.push(item.outLinkDirection)
directionArr.push(item.ingressLinkDirection) directionArr.push(item.inLinkDirection)
} }
}) })
directionArr = Array.from(new Set(directionArr)) directionArr = Array.from(new Set(directionArr))
@@ -270,15 +270,15 @@ export default {
const newNextHopData = [] const newNextHopData = []
this.nextHopNoData = directionArr.length === 0 this.nextHopNoData = directionArr.length === 0
directionArr.forEach((item1) => { directionArr.forEach((item1) => {
const newObj = { egressBitsRate: 0, ingressBitsRate: 0, totalBitsRate: 0, linkDirection: item1 } const newObj = { outBitsRate: 0, inBitsRate: 0, totalBitsRate: 0, linkDirection: item1 }
nextHopData.forEach((item2) => { nextHopData.forEach((item2) => {
if (item1 === item2.egressLinkDirection) { if (item1 === item2.outLinkDirection) {
newObj.egressBitsRate += item2.egressBitsRate newObj.outBitsRate += item2.outBitsRate
newObj.totalBitsRate += item2.egressBitsRate newObj.totalBitsRate += item2.outBitsRate
} }
if (item1 === item2.ingressLinkDirection) { if (item1 === item2.inLinkDirection) {
newObj.ingressBitsRate += item2.ingressBitsRate newObj.inBitsRate += item2.inBitsRate
newObj.totalBitsRate += item2.ingressBitsRate newObj.totalBitsRate += item2.inBitsRate
} }
}) })
newNextHopData.push(newObj) newNextHopData.push(newObj)
@@ -298,9 +298,9 @@ export default {
}) })
// 上行使用情况计算 // 上行使用情况计算
const egressUsage = this.computeUsage(s.egressBitsRate, sum) const egressUsage = this.computeUsage(s.outBitsRate, sum)
// 下行使用情况计算 // 下行使用情况计算
const ingressUsage = this.computeUsage(s.ingressBitsRate, sum) const ingressUsage = this.computeUsage(s.inBitsRate, sum)
s.egressUsage = egressUsage s.egressUsage = egressUsage
s.ingressUsage = ingressUsage s.ingressUsage = ingressUsage
s.popoverWidth = this.computePopoverWidth(egressUsage, ingressUsage) s.popoverWidth = this.computePopoverWidth(egressUsage, ingressUsage)

View File

@@ -756,9 +756,9 @@ export default {
} }
const rootNode = new Node(nodeType.rootNode, this.entity.entityName, { const rootNode = new Node(nodeType.rootNode, this.entity.entityName, {
entityType: this.entity.entityType, entityType: this.entity.entityType,
entityName: this.entity.entityName, entityName: this.entity.entityName
/*x: coordinate.rootNode.fx, /* x: coordinate.rootNode.fx,
y: coordinate.rootNode.fy*/ y: coordinate.rootNode.fy */
}) })
await rootNode.queryDetailData() await rootNode.queryDetailData()
nodes.push(rootNode) nodes.push(rootNode)
@@ -774,9 +774,9 @@ export default {
nodeType.listNode, nodeType.listNode,
`${rootNode.id}__${k}-list`, `${rootNode.id}__${k}-list`,
{ {
entityType: k, entityType: k
/*x: coordinate[`${k}ListNode`].fx, /* x: coordinate[`${k}ListNode`].fx,
y: coordinate[`${k}ListNode`].fy*/ y: coordinate[`${k}ListNode`].fy */
}, },
rootNode rootNode
) )

File diff suppressed because it is too large Load Diff

View File

@@ -278,7 +278,7 @@ export default {
} }
}) })
this.pageObj.total = response.data.data.total this.pageObj.total = response.data.data.total
this.isNoData = !this.tableData || this.tableData.length === 0; this.isNoData = !this.tableData || this.tableData.length === 0
}) })
// TODO 回到顶部 // TODO 回到顶部
} else { } else {