From 90ee54c3ad28a20cbc93cbb5016ea68b97769aee Mon Sep 17 00:00:00 2001 From: "@changcode" Date: Fri, 18 Nov 2022 15:18:12 +0800 Subject: [PATCH] =?UTF-8?q?fix:=201.npm=20tab=E4=B8=BAlocation=E6=8A=98?= =?UTF-8?q?=E7=BA=BF=E5=9B=BE=E6=95=B0=E6=8D=AE=E4=B8=BA=E7=A9=BA=E6=97=B6?= =?UTF-8?q?ecahrts=E5=9B=BE=E5=8A=A0=E8=BD=BD=E6=8A=A5=E9=94=992.npm=20?= =?UTF-8?q?=E4=B8=8B=E9=92=BB=E4=B8=96=E7=95=8C=E5=9C=B0=E5=9B=BE=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=8F=82=E6=95=B0=E9=94=99=E8=AF=AF=E5=92=8Ctab?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=9C=AA=E6=AD=A3=E5=B8=B8=E7=A6=81=E7=94=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/charts2/charts/npm/NpmIpMap.vue | 6 +++- src/views/charts2/charts/npm/NpmLine.vue | 30 ++++++++++--------- .../charts2/charts/npm/NpmRecentEvents.vue | 5 +--- src/views/charts2/charts/npm/NpmTabs.vue | 7 +---- 4 files changed, 23 insertions(+), 25 deletions(-) diff --git a/src/views/charts2/charts/npm/NpmIpMap.vue b/src/views/charts2/charts/npm/NpmIpMap.vue index 23e794ee..1cc407af 100644 --- a/src/views/charts2/charts/npm/NpmIpMap.vue +++ b/src/views/charts2/charts/npm/NpmIpMap.vue @@ -90,6 +90,7 @@ export default { // typeVal: this.$store.getters.getBreadcrumbColumnValue typeVal: this.getUrlParam(this.curTabState.fourthMenu, '') } + if (params.type === 'serverIp' || params.type === 'clientIp') params.type = 'ip' getData(api.npm.overview.map, params).then(res => { const subParams = { ...params, @@ -121,6 +122,9 @@ export default { pktRetransPercent: t.packetRetransScore ? t.packetRetransScore.pktRetransPercent : null } t.score = computeScore(data) + if (t.score === '-') { + t.score = '' + } }) this.loadMarkerData(imageSeries, mapData) }) @@ -133,7 +137,7 @@ export default { }, loadMarkerData (imageSeries, data) { imageSeries.data = data.map(r => ({ - score: r.score, + score: r.score || '–', name: r.province || r.country, throughput: valueToRangeValue(r.throughBitsRate, unitTypes.bps).join(' '), id: r.serverId, diff --git a/src/views/charts2/charts/npm/NpmLine.vue b/src/views/charts2/charts/npm/NpmLine.vue index 4754849e..7fe2ee53 100644 --- a/src/views/charts2/charts/npm/NpmLine.vue +++ b/src/views/charts2/charts/npm/NpmLine.vue @@ -135,20 +135,22 @@ export default { get(url, params).then(res => { if (res.code === 200) { this.isNoData = res.data.result.length === 0 - if (this.chart.params.index === 0) { - res.data.result.forEach((t, i) => { - if (t.type === 'totalBitsRate') { - this.chartOptionLineData[i].values = t.values - } else if (t.type === 'inboundBitsRate') { - this.chartOptionLineData[i].values = t.values - } else if (t.type === 'outboundBitsRate') { - this.chartOptionLineData[i].values = t.values - } - }) - const result = this.chartOptionLineData.filter(t => this.chartData.params.color.indexOf(t.color) > -1) - this.echartsInit(result, this.chartData, this.chartData.params.unitType) - } else { - this.echartsInit(res.data.result, this.chartData, this.chartData.params.unitType) + if (!this.isNoData) { + if (this.chart.params.index === 0) { + res.data.result.forEach((t, i) => { + if (t.type === 'totalBitsRate') { + this.chartOptionLineData[i].values = t.values + } else if (t.type === 'inboundBitsRate') { + this.chartOptionLineData[i].values = t.values + } else if (t.type === 'outboundBitsRate') { + this.chartOptionLineData[i].values = t.values + } + }) + const result = this.chartOptionLineData.filter(t => this.chartData.params.color.indexOf(t.color) > -1) + this.echartsInit(result, this.chartData, this.chartData.params.unitType) + } else { + this.echartsInit(res.data.result, this.chartData, this.chartData.params.unitType) + } } } }).finally(() => { diff --git a/src/views/charts2/charts/npm/NpmRecentEvents.vue b/src/views/charts2/charts/npm/NpmRecentEvents.vue index 2c6b03a4..a7403cae 100644 --- a/src/views/charts2/charts/npm/NpmRecentEvents.vue +++ b/src/views/charts2/charts/npm/NpmRecentEvents.vue @@ -83,11 +83,7 @@ export default { }, methods: { recentEventsListData () { - // const condition = this.$store.getters.getQueryCondition.split(/["|'](.*?)["|']/) - // const conditionStr = this.$route.query.queryCondition ? this.$route.query.queryCondition : '' const condition = this.queryCondition.split(/["|'](.*?)["|']/) - // const type = this.$store.getters.getDimensionType - // const type = this.$route.query.dimensionType ? this.$route.query.dimensionType : '' let url = '' const params = { startTime: getSecond(this.timeFilter.startTime), @@ -97,6 +93,7 @@ export default { if (condition.length > 1 && this.dimensionType) { params.param = condition[1] params.type = this.dimensionType + if (params.type === 'serverIp' || params.type === 'clientIp') params.type = 'ip' params.limit = 10 url = api.npm.events.recentEventsD this.customTableTitles = [ diff --git a/src/views/charts2/charts/npm/NpmTabs.vue b/src/views/charts2/charts/npm/NpmTabs.vue index 4cdd9336..3a5a9f39 100644 --- a/src/views/charts2/charts/npm/NpmTabs.vue +++ b/src/views/charts2/charts/npm/NpmTabs.vue @@ -93,15 +93,10 @@ export default { self.serverSessions = self.sessionData.serverSessions / (self.sessionData.clientSessions * 1 + self.sessionData.serverSessions * 1) } }).finally(() => { - let thirdMenu = this.$route.query['thirdMenu'] let currentTab = 0 self.tabs[0].disable = false self.tabs[1].disable = false - if(thirdMenu === 'network.clientIps'){ - currentTab = 0 - }else if(thirdMenu === 'network.serverIps'){ - currentTab = 1 - }else if (self.clientSessions === 0) { + if (self.clientSessions === 0) { currentTab = 1 self.tabs[0].disable = true self.tabs[1].disable = false