From 04e4371ac1023c6074b48eb0c58965f998a133df Mon Sep 17 00:00:00 2001 From: "@changcode" Date: Wed, 26 Oct 2022 18:20:31 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8A=98=E7=BA=BF=E5=9B=BE=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=20tab=20=E6=97=A0=E6=95=B0=E6=8D=AE=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=8F=AA=E4=BF=9D=E7=95=99total=E6=97=B6=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E9=80=89=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../charts/dnsInsight/DnsTrafficLine.vue | 17 ++++++++-- .../charts/linkMonitor/LinkTrafficLine.vue | 34 +++++++++++++++---- .../networkOverview/NetworkOverviewLine.vue | 34 +++++++++++++++---- 3 files changed, 70 insertions(+), 15 deletions(-) diff --git a/src/views/charts2/charts/dnsInsight/DnsTrafficLine.vue b/src/views/charts2/charts/dnsInsight/DnsTrafficLine.vue index 9f737988..4b3ee4e8 100644 --- a/src/views/charts2/charts/dnsInsight/DnsTrafficLine.vue +++ b/src/views/charts2/charts/dnsInsight/DnsTrafficLine.vue @@ -205,10 +205,12 @@ export default { mpackets[0].data = t.totalBitsRate.values ? t.totalBitsRate.values : [] mpackets[1].data = t.inboundBitsRate.values ? t.inboundBitsRate.values : [] mpackets[2].data = t.outboundBitsRate.values ? t.outboundBitsRate.values : [] + let num = 0 mpackets.forEach(e => { e.unitType = 'bps' if (e.name !== 'network.total' && e.analysis.avg == 0) { e.show = false + num += 1 } else { e.show = true if (!active && show !== this.lineRefer) { @@ -223,9 +225,18 @@ export default { } }) this.mpackets = mpackets - this.$nextTick(() => { - this.echartsInit(this.mpackets, show) - }) + if (num === 3) { + mpackets[0].invertTab = false + this.lineTab = 'total' + this.legendSelectChange(mpackets[0], 0) + this.$nextTick(() => { + this.echartsInit(this.mpackets) + }) + } else { + this.$nextTick(() => { + this.echartsInit(this.mpackets) + }) + } } else if (t.type === 'queries' && val === 'Queries/s') { const mpackets = _.cloneDeep(this.mpackets) mpackets[0].analysis = t.totalQueryRate.analysis diff --git a/src/views/charts2/charts/linkMonitor/LinkTrafficLine.vue b/src/views/charts2/charts/linkMonitor/LinkTrafficLine.vue index 533068a5..a69c07f2 100644 --- a/src/views/charts2/charts/linkMonitor/LinkTrafficLine.vue +++ b/src/views/charts2/charts/linkMonitor/LinkTrafficLine.vue @@ -186,10 +186,12 @@ export default { mpackets[0].data = t.totalBitsRate.values ? t.totalBitsRate.values : [] mpackets[1].data = t.ingressBitsRate.values ? t.ingressBitsRate.values : [] mpackets[2].data = t.egressBitsRate.values ? t.egressBitsRate.values : [] + let num = 0 mpackets.forEach(e => { e.unitType = 'bps' if (e.name !== 'network.total' && e.analysis.avg == 0) { e.show = false + num += 1 } else { e.show = true if (!active && !show) { @@ -204,9 +206,18 @@ export default { } }) this.mpackets = mpackets - this.$nextTick(() => { - this.echartsInit(this.mpackets) - }) + if (num === 3) { + mpackets[0].invertTab = false + this.lineTab = 'total' + this.legendSelectChange(mpackets[0], 0) + this.$nextTick(() => { + this.echartsInit(this.mpackets) + }) + } else { + this.$nextTick(() => { + this.echartsInit(this.mpackets) + }) + } } else if (t.type === 'packets' && val === 'Packets/s') { const mpackets = _.cloneDeep(this.mpackets) mpackets[0].analysis = t.totalPacketsRate.analysis @@ -215,10 +226,12 @@ export default { mpackets[0].data = t.totalPacketsRate.values ? t.totalPacketsRate.values : [] mpackets[1].data = t.ingressPacketsRate.values ? t.ingressPacketsRate.values : [] mpackets[2].data = t.egressPacketsRate.values ? t.egressPacketsRate.values : [] + let num = 0 mpackets.forEach(e => { e.unitType = 'packets/s' if (e.name !== 'network.total' && e.analysis.avg == 0) { e.show = false + num += 1 } else { e.show = true if (!active && !show) { @@ -233,9 +246,18 @@ export default { } }) this.mpackets = mpackets - this.$nextTick(() => { - this.echartsInit(this.mpackets) - }) + if (num === 3) { + mpackets[0].invertTab = false + this.lineTab = 'total' + this.legendSelectChange(mpackets[0], 0) + this.$nextTick(() => { + this.echartsInit(this.mpackets) + }) + } else { + this.$nextTick(() => { + this.echartsInit(this.mpackets) + }) + } } }) } diff --git a/src/views/charts2/charts/networkOverview/NetworkOverviewLine.vue b/src/views/charts2/charts/networkOverview/NetworkOverviewLine.vue index 60ea5722..c157b50d 100644 --- a/src/views/charts2/charts/networkOverview/NetworkOverviewLine.vue +++ b/src/views/charts2/charts/networkOverview/NetworkOverviewLine.vue @@ -216,10 +216,12 @@ export default { mpackets[3].data = t.internalBitsRate.values ? t.internalBitsRate.values : [] mpackets[4].data = t.throughBitsRate.values ? t.throughBitsRate.values : [] mpackets[5].data = t.other.values ? t.other.values : [] + let num = 0 mpackets.forEach(e => { e.unitType = 'bps' if (e.name !== 'network.total' && e.analysis.avg == 0) { e.show = false + num += 1 } else { e.show = true if (!active && show !== this.lineRefer) { @@ -234,9 +236,18 @@ export default { } }) this.mpackets = mpackets - this.$nextTick(() => { - this.echartsInit(this.mpackets, show) - }) + if (num === 5) { + mpackets[0].invertTab = false + this.lineTab = 'total' + this.legendSelectChange(mpackets[0], 0) + this.$nextTick(() => { + this.echartsInit(this.mpackets, true) + }) + } else { + this.$nextTick(() => { + this.echartsInit(this.mpackets, show) + }) + } } else if (t.type === 'packets' && val === 'Packets/s') { const mpackets = _.cloneDeep(this.mpackets) mpackets[0].analysis = t.totalPacketsRate.analysis @@ -251,10 +262,12 @@ export default { mpackets[3].data = t.internalPacketsRate.values ? t.internalPacketsRate.values : [] mpackets[4].data = t.throughPacketsRate.values ? t.throughPacketsRate.values : [] mpackets[5].data = t.other.values ? t.other.values : [] + let num = 0 mpackets.forEach(e => { e.unitType = 'packets/s' if (e.name !== 'network.total' && e.analysis.avg == 0) { e.show = false + num += 1 } else { e.show = true if (!active && show !== this.lineRefer) { @@ -269,9 +282,18 @@ export default { } }) this.mpackets = mpackets - this.$nextTick(() => { - this.echartsInit(this.mpackets, show) - }) + if (num === 5) { + mpackets[0].invertTab = false + this.lineTab = 'total' + this.legendSelectChange(mpackets[0], 0) + this.$nextTick(() => { + this.echartsInit(this.mpackets, true) + }) + } else { + this.$nextTick(() => { + this.echartsInit(this.mpackets, show) + }) + } } else if (t.type === 'sessions' && val === 'Sessions/s') { const mpackets = _.cloneDeep(this.mpackets) mpackets[0].analysis = t.totalSessionsRate.analysis