diff --git a/src/utils/constants.js b/src/utils/constants.js index 2ab9bd51..db738260 100644 --- a/src/utils/constants.js +++ b/src/utils/constants.js @@ -1957,7 +1957,7 @@ export const iso36112 = { MN: 'mongoliaLow' } -export const countryNameIdMapping = { Afghanistan: 'AF', Albania: 'AL', Algeria: 'DZ', 'American Samoa': 'AS', Andorra: 'AD', Angola: 'AO', Anguilla: 'AI', Antarctica: 'AQ', 'Antigua and Barbuda': 'AG', Argentina: 'AR', Armenia: 'AM', Aruba: 'AW', Australia: 'AU', Austria: 'AT', Azerbaijan: 'AZ', 'Bahamas (the)': 'BS', Bahrain: 'BH', Bangladesh: 'BD', Barbados: 'BB', Belarus: 'BY', Belgium: 'BE', Belize: 'BZ', Benin: 'BJ', Bermuda: 'BM', 'Åland Islands': 'AX', Bhutan: 'BT', 'Bolivia (Plurinational State of)': 'BO', 'Bonaire, Sint Eustatius and Saba': 'BQ', 'Bosnia and Herzegovina': 'BA', Botswana: 'BW', 'Bouvet Island': 'BV', Brazil: 'BR', 'British Indian Ocean Territory (the)': 'IO', 'Brunei Darussalam': 'BN', Bulgaria: 'BG', 'Burkina Faso': 'BF', Burundi: 'BI', 'Cabo Verde': 'CV', Cambodia: 'KH', Cameroon: 'CM', Canada: 'CA', 'Cayman Islands (the)': 'KY', 'Central African Republic (the)': 'CF', Chad: 'TD', Chile: 'CL', China: 'CN', 'Christmas Island': 'CX', 'Cocos (Keeling) Islands (the)': 'CC', Colombia: 'CO', 'Comoros (the)': 'KM', 'Congo (the Democratic Republic of the)': 'CD', 'Congo (the)': 'CG', 'Cook Islands (the)': 'CK', 'Costa Rica': 'CR', Croatia: 'HR', Cuba: 'CU', Curaçao: 'CW', Cyprus: 'CY', Czechia: 'CZ', "Côte d'Ivoire": 'CI', Denmark: 'DK', Djibouti: 'DJ', Dominica: 'DM', 'Dominican Republic (the)': 'DO', Ecuador: 'EC', Egypt: 'EG', 'El Salvador': 'SV', 'Equatorial Guinea': 'GQ', Eritrea: 'ER', Estonia: 'EE', Eswatini: 'SZ', Ethiopia: 'ET', 'Falkland Islands (the) [Malvinas]': 'FK', 'Faroe Islands (the)': 'FO', Fiji: 'FJ', Finland: 'FI', France: 'FR', 'French Guiana': 'GF', 'French Polynesia': 'PF', 'French Southern Territories (the)': 'TF', Gabon: 'GA', 'Gambia (the)': 'GM', Georgia: 'GE', Germany: 'DE', Ghana: 'GH', Gibraltar: 'GI', Greece: 'GR', Greenland: 'GL', Grenada: 'GD', Guadeloupe: 'GP', Guam: 'GU', Guatemala: 'GT', Guernsey: 'GG', Guinea: 'GN', 'Guinea-Bissau': 'GW', Guyana: 'GY', Haiti: 'HT', 'Heard Island and McDonald Islands': 'HM', 'Holy See (the)': 'VA', Honduras: 'HN', 'Hong Kong': 'HK', Hungary: 'HU', Iceland: 'IS', India: 'IN', Indonesia: 'ID', 'Iran (Islamic Republic of)': 'IR', Iraq: 'IQ', Ireland: 'IE', 'Isle of Man': 'IM', Israel: 'IL', Italy: 'IT', Jamaica: 'JM', Japan: 'JP', Jersey: 'JE', Jordan: 'JO', Kazakhstan: 'KZ', Kenya: 'KE', Kiribati: 'KI', "Korea (the Democratic People's Republic of)": 'KP', 'Korea (the Republic of)': 'KR', Kuwait: 'KW', Kyrgyzstan: 'KG', "Lao People's Democratic Republic (the)": 'LA', Latvia: 'LV', Lebanon: 'LB', Lesotho: 'LS', Liberia: 'LR', Libya: 'LY', Liechtenstein: 'LI', Lithuania: 'LT', Luxembourg: 'LU', Macao: 'MO', Madagascar: 'MG', Malawi: 'MW', Malaysia: 'MY', Maldives: 'MV', Mali: 'ML', Malta: 'MT', 'Marshall Islands (the)': 'MH', Martinique: 'MQ', Mauritania: 'MR', Mauritius: 'MU', Mayotte: 'YT', Mexico: 'MX', 'Micronesia (Federated States of)': 'FM', 'Moldova (the Republic of)': 'MD', Monaco: 'MC', Mongolia: 'MN', Montenegro: 'ME', Montserrat: 'MS', Morocco: 'MA', Mozambique: 'MZ', Myanmar: 'MM', Namibia: 'NA', Nauru: 'NR', Nepal: 'NP', 'Netherlands (the)': 'NL', 'New Caledonia': 'NC', 'New Zealand': 'NZ', Nicaragua: 'NI', 'Niger (the)': 'NE', Nigeria: 'NG', Niue: 'NU', 'Norfolk Island': 'NF', 'North Macedonia': 'MK', 'Northern Mariana Islands (the)': 'MP', Norway: 'NO', Oman: 'OM', Pakistan: 'PK', Palau: 'PW', 'Palestine, State of': 'PS', Panama: 'PA', 'Papua New Guinea': 'PG', Paraguay: 'PY', Peru: 'PE', 'Philippines (the)': 'PH', Pitcairn: 'PN', Poland: 'PL', Portugal: 'PT', 'Puerto Rico': 'PR', Qatar: 'QA', Romania: 'RO', 'Russian Federation (the)': 'RU', Rwanda: 'RW', Réunion: 'RE', 'Saint Barthélemy': 'BL', 'Saint Helena, Ascension and Tristan da Cunha': 'SH', 'Saint Kitts and Nevis': 'KN', 'Saint Lucia': 'LC', 'Saint Martin (French part)': 'MF', 'Saint Pierre and Miquelon': 'PM', 'Saint Vincent and the Grenadines': 'VC', Samoa: 'WS', 'San Marino': 'SM', 'Sao Tome and Principe': 'ST', 'Saudi Arabia': 'SA', Senegal: 'SN', Serbia: 'RS', Seychelles: 'SC', 'Sierra Leone': 'SL', Singapore: 'SG', 'Sint Maarten (Dutch part)': 'SX', Slovakia: 'SK', Slovenia: 'SI', 'Solomon Islands': 'SB', Somalia: 'SO', 'South Africa': 'ZA', 'South Georgia and the South Sandwich Islands': 'GS', 'South Sudan': 'SS', Spain: 'ES', 'Sri Lanka': 'LK', 'Sudan (the)': 'SD', Suriname: 'SR', 'Svalbard and Jan Mayen': 'SJ', Sweden: 'SE', Switzerland: 'CH', 'Syrian Arab Republic (the)': 'SY', 'Taiwan (Province of China)': 'TW', Tajikistan: 'TJ', 'Tanzania, the United Republic of': 'TZ', Thailand: 'TH', 'Timor-Leste': 'TL', Togo: 'TG', Tokelau: 'TK', Tonga: 'TO', 'Trinidad and Tobago': 'TT', Tunisia: 'TN', Turkey: 'TR', Turkmenistan: 'TM', 'Turks and Caicos Islands (the)': 'TC', Tuvalu: 'TV', Uganda: 'UG', Ukraine: 'UA', 'United Arab Emirates (the)': 'AE', 'United Kingdom of Great Britain and Northern Ireland (the)': 'GB', 'United States Minor Outlying Islands (the)': 'UM', 'United States of America (the)': 'US', Uruguay: 'UY', Uzbekistan: 'UZ', Vanuatu: 'VU', 'Venezuela (Bolivarian Republic of)': 'VE', 'Viet Nam': 'VN', 'Virgin Islands (British)': 'VG', 'Virgin Islands (U.S.)': 'VI', 'Wallis and Futuna': 'WF', 'Western Sahara*': 'EH', Yemen: 'YE', Zambia: 'ZM', Zimbabwe: 'ZW' } +export const countryNameIdMapping = { Afghanistan: 'AF', Albania: 'AL', Algeria: 'DZ', 'American Samoa': 'AS', Andorra: 'AD', Angola: 'AO', Anguilla: 'AI', Antarctica: 'AQ', 'Antigua and Barbuda': 'AG', Argentina: 'AR', Armenia: 'AM', Aruba: 'AW', Australia: 'AU', Austria: 'AT', Azerbaijan: 'AZ', 'Bahamas (the)': 'BS', Bahrain: 'BH', Bangladesh: 'BD', Barbados: 'BB', Belarus: 'BY', Belgium: 'BE', Belize: 'BZ', Benin: 'BJ', Bermuda: 'BM', 'Åland Islands': 'AX', Bhutan: 'BT', 'Bolivia (Plurinational State of)': 'BO', 'Bonaire, Sint Eustatius and Saba': 'BQ', 'Bosnia and Herzegovina': 'BA', Botswana: 'BW', 'Bouvet Island': 'BV', Brazil: 'BR', 'British Indian Ocean Territory (the)': 'IO', 'Brunei Darussalam': 'BN', Bulgaria: 'BG', 'Burkina Faso': 'BF', Burundi: 'BI', 'Cabo Verde': 'CV', Cambodia: 'KH', Cameroon: 'CM', Canada: 'CA', 'Cayman Islands (the)': 'KY', 'Central African Republic (the)': 'CF', Chad: 'TD', Chile: 'CL', China: 'CN', 'Christmas Island': 'CX', 'Cocos (Keeling) Islands (the)': 'CC', Colombia: 'CO', 'Comoros (the)': 'KM', 'Congo (the Democratic Republic of the)': 'CD', 'Congo (the)': 'CG', 'Cook Islands (the)': 'CK', 'Costa Rica': 'CR', Croatia: 'HR', Cuba: 'CU', Curaçao: 'CW', Cyprus: 'CY', Czechia: 'CZ', "Côte d'Ivoire": 'CI', Denmark: 'DK', Djibouti: 'DJ', Dominica: 'DM', 'Dominican Republic (the)': 'DO', Ecuador: 'EC', Egypt: 'EG', 'El Salvador': 'SV', 'Equatorial Guinea': 'GQ', Eritrea: 'ER', Estonia: 'EE', Eswatini: 'SZ', Ethiopia: 'ET', 'Falkland Islands (the) [Malvinas]': 'FK', 'Faroe Islands (the)': 'FO', Fiji: 'FJ', Finland: 'FI', France: 'FR', 'French Guiana': 'GF', 'French Polynesia': 'PF', 'French Southern Territories (the)': 'TF', Gabon: 'GA', 'Gambia (the)': 'GM', Georgia: 'GE', Germany: 'DE', Ghana: 'GH', Gibraltar: 'GI', Greece: 'GR', Greenland: 'GL', Grenada: 'GD', Guadeloupe: 'GP', Guam: 'GU', Guatemala: 'GT', Guernsey: 'GG', Guinea: 'GN', 'Guinea-Bissau': 'GW', Guyana: 'GY', Haiti: 'HT', 'Heard Island and McDonald Islands': 'HM', 'Holy See (the)': 'VA', Honduras: 'HN', 'Hong Kong': 'HK', Hungary: 'HU', Iceland: 'IS', India: 'IN', Indonesia: 'ID', 'Iran (Islamic Republic of)': 'IR', Iraq: 'IQ', Ireland: 'IE', 'Isle of Man': 'IM', Israel: 'IL', Italy: 'IT', Jamaica: 'JM', Japan: 'JP', Jersey: 'JE', Jordan: 'JO', Kazakhstan: 'KZ', Kenya: 'KE', Kiribati: 'KI', "Korea (the Democratic People's Republic of)": 'KP', 'Korea (the Republic of)': 'KR', Kuwait: 'KW', Kyrgyzstan: 'KG', "Lao People's Democratic Republic (the)": 'LA', Latvia: 'LV', Lebanon: 'LB', Lesotho: 'LS', Liberia: 'LR', Libya: 'LY', Liechtenstein: 'LI', Lithuania: 'LT', Luxembourg: 'LU', Macao: 'MO', Madagascar: 'MG', Malawi: 'MW', Malaysia: 'MY', Maldives: 'MV', Mali: 'ML', Malta: 'MT', 'Marshall Islands (the)': 'MH', Martinique: 'MQ', Mauritania: 'MR', Mauritius: 'MU', Mayotte: 'YT', Mexico: 'MX', 'Micronesia (Federated States of)': 'FM', 'Moldova (the Republic of)': 'MD', Monaco: 'MC', Mongolia: 'MN', Montenegro: 'ME', Montserrat: 'MS', Morocco: 'MA', Mozambique: 'MZ', Myanmar: 'MM', Namibia: 'NA', Nauru: 'NR', Nepal: 'NP', Netherlands: 'NL', 'New Caledonia': 'NC', 'New Zealand': 'NZ', Nicaragua: 'NI', 'Niger (the)': 'NE', Nigeria: 'NG', Niue: 'NU', 'Norfolk Island': 'NF', 'North Macedonia': 'MK', 'Northern Mariana Islands (the)': 'MP', Norway: 'NO', Oman: 'OM', Pakistan: 'PK', Palau: 'PW', 'Palestine, State of': 'PS', Panama: 'PA', 'Papua New Guinea': 'PG', Paraguay: 'PY', Peru: 'PE', 'Philippines (the)': 'PH', Pitcairn: 'PN', Poland: 'PL', Portugal: 'PT', 'Puerto Rico': 'PR', Qatar: 'QA', Romania: 'RO', 'Russian Federation (the)': 'RU', Rwanda: 'RW', Réunion: 'RE', 'Saint Barthélemy': 'BL', 'Saint Helena, Ascension and Tristan da Cunha': 'SH', 'Saint Kitts and Nevis': 'KN', 'Saint Lucia': 'LC', 'Saint Martin (French part)': 'MF', 'Saint Pierre and Miquelon': 'PM', 'Saint Vincent and the Grenadines': 'VC', Samoa: 'WS', 'San Marino': 'SM', 'Sao Tome and Principe': 'ST', 'Saudi Arabia': 'SA', Senegal: 'SN', Serbia: 'RS', Seychelles: 'SC', 'Sierra Leone': 'SL', Singapore: 'SG', 'Sint Maarten (Dutch part)': 'SX', Slovakia: 'SK', Slovenia: 'SI', 'Solomon Islands': 'SB', Somalia: 'SO', 'South Africa': 'ZA', 'South Georgia and the South Sandwich Islands': 'GS', 'South Sudan': 'SS', Spain: 'ES', 'Sri Lanka': 'LK', 'Sudan (the)': 'SD', Suriname: 'SR', 'Svalbard and Jan Mayen': 'SJ', Sweden: 'SE', Switzerland: 'CH', 'Syrian Arab Republic (the)': 'SY', 'Taiwan (Province of China)': 'TW', Tajikistan: 'TJ', 'Tanzania, the United Republic of': 'TZ', Thailand: 'TH', 'Timor-Leste': 'TL', Togo: 'TG', Tokelau: 'TK', Tonga: 'TO', 'Trinidad and Tobago': 'TT', Tunisia: 'TN', Turkey: 'TR', Turkmenistan: 'TM', 'Turks and Caicos Islands (the)': 'TC', Tuvalu: 'TV', Uganda: 'UG', Ukraine: 'UA', 'United Arab Emirates (the)': 'AE', 'United Kingdom of Great Britain and Northern Ireland (the)': 'GB', 'United States Minor Outlying Islands (the)': 'UM', 'United States': 'US', Uruguay: 'UY', Uzbekistan: 'UZ', Vanuatu: 'VU', 'Venezuela (Bolivarian Republic of)': 'VE', 'Viet Nam': 'VN', 'Virgin Islands (British)': 'VG', 'Virgin Islands (U.S.)': 'VI', 'Wallis and Futuna': 'WF', 'Western Sahara*': 'EH', Yemen: 'YE', Zambia: 'ZM', Zimbabwe: 'ZW' } export const reg = { // 不严格ipv4 diff --git a/src/views/charts2/charts/npm/NpmMap.vue b/src/views/charts2/charts/npm/NpmMap.vue index 0b23fb32..9fd6c7aa 100644 --- a/src/views/charts2/charts/npm/NpmMap.vue +++ b/src/views/charts2/charts/npm/NpmMap.vue @@ -195,8 +195,8 @@ export default { } }, loadMarkerData (imageSeries, data) { - data = data.filter(d => d.score || d.score === 0) - imageSeries.data = data.map(r => ({ + const _data = data.filter(d => d.score || d.score === 0) + imageSeries.data = _data.map(r => ({ score: r.score, name: r.province || r.country, throughput: valueToRangeValue(r.throughBitsRate, unitTypes.bps).join(' '), @@ -304,14 +304,17 @@ export default { if (!this.countryImageSeries) { this.countryImageSeries = this.imageSeriesFactory('score', this.countrySeries) } - this.countrySeries.show() - this.countryImageSeries.show() this.countrySeries.geodata = geoData this.polygonSeries.hide() this.worldImageSeries.hide() - this.$nextTick(() => { + this.countrySeries.show() + this.countryImageSeries.show() + + await this.$nextTick(() => { this.loadAm4ChartMap(this.countrySeries, this.countryImageSeries) }) + } else { + this.$message.warning(this.$t('tip.noDetailMap')) } } } @@ -327,10 +330,8 @@ export default { }, async location (n) { this.$store.commit('setNpmLocationCountry', n) - if (n) { - const countryId = countryNameIdMapping[n] - await this.drill(countryId) - } else { + if (!n) { + this.countryImageSeries.data = [{}] this.polygonSeries.show() this.worldImageSeries.show() this.countrySeries.hide()