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

Merge branch 'cherry-pick-2c703306' into 'dev-24.04'

Browse Source 
fix: 修复双向链路配置下，链路下钻后id不对的问题

See merge request cyber-narrator/cn-ui!81
This commit is contained in:
陈劲松
2024-06-18 10:16:28 +00:00
parent a29b433dc4 cb391dc416
commit 0d4bc17873
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/charts2/Panel.vue
View File

@@ -122,7 +122,7 @@ export default {
watch: { watch: {
timeFilter: { timeFilter: {
handler () { handler () {
if (this.$route.path === '/panel/networkAppPerformance') { if (this.$route.path === '/panel/networkAppPerformance' || this.$route.path === '/panel/linkMonitor') {
this.$store.commit('resetScoreBase') this.$store.commit('resetScoreBase')
this.queryScoreBase() this.queryScoreBase()
if (this.lineQueryCondition || this.networkOverviewBeforeTab) { if (this.lineQueryCondition || this.networkOverviewBeforeTab) {
@@ -227,7 +227,7 @@ export default {
this.scoreCalculation() this.scoreCalculation()
} }
} }
if (this.$route.path === '/panel/networkAppPerformance') { if (this.$route.path === '/panel/networkAppPerformance' || this.$route.path === '/panel/linkMonitor') {
this.$store.commit('resetScoreBase') this.$store.commit('resetScoreBase')
this.queryScoreBase() this.queryScoreBase()
} }

28
src/views/charts2/charts/linkMonitor/LinkBlock.vue
View File

@@ -237,12 +237,26 @@ export default {
} }
}) })
this.linkNoData = data.length === 0 this.linkNoData = data.length === 0
data.forEach(item => { if (!isTwoWay) {
item.totalBitsRate = item.outBitsRate + item.inBitsRate data.forEach(item => {
linkConfig.filter(info => info.interfaceName === item.interfaceName).forEach(info => { item.totalBitsRate = item.outBitsRate + item.inBitsRate
item.linkId = info.linkId linkConfig.filter(info => info.interfaceName === item.interfaceName).forEach(info => {
item.linkId = info.linkId
})
}) })
}) } else {
data.forEach(item => {
item.totalBitsRate = item.outBitsRate + item.inBitsRate
item.isTwoWay = true
linkConfig.filter(info => info.interfaceName === item.interfaceName).forEach(info => {
if (info.direction === 0) {
item.outLinkId = info.linkId
} else if (info.direction === 1) {
item.inLinkId = info.linkId
}
})
})
}
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))
@@ -384,7 +398,9 @@ export default {
return width return width
}, },
drillLinkId (item) { drillLinkId (item) {
const queryCondition = `out_link_id = ${item.linkId} or in_link_id = ${item.linkId}` const queryCondition = item.isTwoWay
? `out_link_id = ${item.outLinkId} or in_link_id = ${item.inLinkId}`
: `out_link_id = ${item.linkId} or in_link_id = ${item.linkId}`
beforeRouterPush() beforeRouterPush()
this.$router.push({ this.$router.push({
query: { query: {