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

fix: 地图字段更改

Browse Source
This commit is contained in:
chenjinsong
2023-08-29 18:23:15 +08:00
parent 605d9f5067
commit 778dd21b3a
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/views/charts/charts/ChartMap.vue
View File

@@ -223,10 +223,10 @@ export default {
this.countrySeries = shallowRef(this.polygonSeriesFactory()) this.countrySeries = shallowRef(this.polygonSeriesFactory())
this.countrySeries.geodata = geoData this.countrySeries.geodata = geoData
this.polygonSeries.hide() this.polygonSeries.hide()
const country = ev.target.dataItem.dataContext.serverCountry const countryRegion = ev.target.dataItem.dataContext.serverCountryRegion
const queryParams = { ...this.queryParams, country } const queryParams = { ...this.queryParams, countryRegion }
const chartData = await getData(replaceUrlPlaceholder(this.chartInfo.params.url, queryParams)) const chartData = await getData(replaceUrlPlaceholder(this.chartInfo.params.url, queryParams))
this.loadAm4ChartMap(this.countrySeries, null, country, chartData) this.loadAm4ChartMap(this.countrySeries, null, countryRegion, chartData)
} }
} }
}, },
@@ -291,7 +291,7 @@ export default {
return imageSeries return imageSeries
}, },
loadAm4ChartMap (polygonSeries, imageSeries, country, chartData) { loadAm4ChartMap (polygonSeries, imageSeries, countryRegion, chartData) {
// chartData不为空是下钻 // chartData不为空是下钻
if (chartData) { if (chartData) {
this.$emit('showLoading', true) this.$emit('showLoading', true)
@@ -307,7 +307,7 @@ export default {
} }
}) })
this.showMapBackButton = !!country this.showMapBackButton = !!countryRegion
const chartParams = this.chartInfo.params const chartParams = this.chartInfo.params
const data = chartData || this.chartData const data = chartData || this.chartData
if (data && this.isMapBlock) { if (data && this.isMapBlock) {
@@ -315,7 +315,7 @@ export default {
return { return {
...this.convertMapData(r), ...this.convertMapData(r),
id: r.serverId, id: r.serverId,
serverCountry: r.serverCountry, serverCountryRegion: r.serverCountryRegion,
value: r[chartParams.valueColumn] value: r[chartParams.valueColumn]
} }
}) })

5
src/views/charts2/charts/npm/NpmIpMap.vue
View File

@@ -132,8 +132,7 @@ export default {
pktRetransPercent: t.packetRetransScore ? t.packetRetransScore.pktRetransPercent : null pktRetransPercent: t.packetRetransScore ? t.packetRetransScore.pktRetransPercent : null
} }
t.tooltip = {} t.tooltip = {}
t.tooltip.width = t.superAdminArea ? 0 : 18 t.tooltip.display = t.superAdminArea ? 'none' : ''
t.tooltip.marginRight = t.superAdminArea ? 0 : 6
t.tooltip.data = { t.tooltip.data = {
establishLatencyMs: valueToRangeValue(data.establishLatencyMs, unitTypes.time).join(' '), establishLatencyMs: valueToRangeValue(data.establishLatencyMs, unitTypes.time).join(' '),
httpResponseLatency: valueToRangeValue(data.httpResponseLatency, unitTypes.time).join(' '), httpResponseLatency: valueToRangeValue(data.httpResponseLatency, unitTypes.time).join(' '),
@@ -203,7 +202,7 @@ export default {
generatePolygonTooltipHTML () { generatePolygonTooltipHTML () {
const html = ` const html = `
<div class="map-tooltip" style="padding-bottom: 10px;"> <div class="map-tooltip" style="padding-bottom: 10px;">
<div class="map-tooltip__title"><img src="/images/flag/{id}.png" style="width: {tooltip.width}px;height: 12px;margin-right: {tooltip.marginRight}px;border: 1px solid #E8E8E8;"/>{name}</div> <div class="map-tooltip__title"><img src="/images/flag/{id}.png" style="width: 18px;display: {tooltip.display};height: 12px;margin-right: 6px;border: 1px solid #E8E8E8;"/>{name}</div>
<div class="map-tooltip__content"> <div class="map-tooltip__content">
<div class="content-title">{tooltip.text.traffic}</div> <div class="content-title">{tooltip.text.traffic}</div>
<div class="content-row"> <div class="content-row">

5
src/views/charts2/charts/npm/NpmMap.vue
View File

@@ -164,8 +164,7 @@ export default {
pktRetransPercent: t.packetRetransScore ? t.packetRetransScore.pktRetransPercent : null pktRetransPercent: t.packetRetransScore ? t.packetRetransScore.pktRetransPercent : null
} }
t.tooltip = {} t.tooltip = {}
t.tooltip.width = t.superAdminArea ? 0 : 18 t.tooltip.display = t.superAdminArea ? 'none' : ''
t.tooltip.marginRight = t.superAdminArea ? 0 : 6
t.tooltip.data = { t.tooltip.data = {
establishLatencyMs: valueToRangeValue(data.establishLatencyMs, unitTypes.time).join(' '), establishLatencyMs: valueToRangeValue(data.establishLatencyMs, unitTypes.time).join(' '),
httpResponseLatency: valueToRangeValue(data.httpResponseLatency, unitTypes.time).join(' '), httpResponseLatency: valueToRangeValue(data.httpResponseLatency, unitTypes.time).join(' '),
@@ -242,7 +241,7 @@ export default {
generatePolygonTooltipHTML () { generatePolygonTooltipHTML () {
const html = ` const html = `
<div class="map-tooltip" style="padding-bottom: 10px;"> <div class="map-tooltip" style="padding-bottom: 10px;">
<div class="map-tooltip__title"><img src="/images/flag/{id}.png" style="width: {tooltip.width}px;height: 12px;margin-right: {tooltip.marginRight}px;border: 1px solid #E8E8E8;"/>{name}</div> <div class="map-tooltip__title"><img src="/images/flag/{id}.png" style="width: 18px;display: {tooltip.display};height: 12px;margin-right: 6px;border: 1px solid #E8E8E8;"/>{name}</div>
<div class="map-tooltip__content"> <div class="map-tooltip__content">
<div class="content-title">{tooltip.text.traffic}</div> <div class="content-title">{tooltip.text.traffic}</div>
<div class="content-row"> <div class="content-row">