Commit f388682370004fd3e2f10d22cf5e5d2b40585c20
Merge branch 'ft' into 'main_dev'
fix(src/packages): 修改地图 针对内蒙古自治区特殊处理 See merge request yunteng/thingskit-view!128
Showing
2 changed files
with
4 additions
and
2 deletions
| @@ -112,8 +112,9 @@ const handleMap3DClick = async (params: any) => { | @@ -112,8 +112,9 @@ const handleMap3DClick = async (params: any) => { | ||
| 112 | saveGeojson.value?.features.forEach((item: any) => { | 112 | saveGeojson.value?.features.forEach((item: any) => { |
| 113 | if (item.properties.name === name) { | 113 | if (item.properties.name === name) { |
| 114 | const level = item.properties.level.toUpperCase() | 114 | const level = item.properties.level.toUpperCase() |
| 115 | - if (level === 'DISTRICT') return | ||
| 116 | const adcode = item.properties.adcode | 115 | const adcode = item.properties.adcode |
| 116 | + if (level === 'DISTRICT') return | ||
| 117 | + if(String(adcode).startsWith('15') && level===areaEnum.CITY) return | ||
| 117 | props.chartConfig.option.mapRegion.adcode = adcode | 118 | props.chartConfig.option.mapRegion.adcode = adcode |
| 118 | saveLevelStr.level = level | 119 | saveLevelStr.level = level |
| 119 | handleDataPoint(adcode) | 120 | handleDataPoint(adcode) |
| @@ -308,8 +308,9 @@ const handleVChartClick = async (params: any) => { | @@ -308,8 +308,9 @@ const handleVChartClick = async (params: any) => { | ||
| 308 | saveGeojson.value?.features.forEach((item: any) => { | 308 | saveGeojson.value?.features.forEach((item: any) => { |
| 309 | if (item.properties.name === name) { | 309 | if (item.properties.name === name) { |
| 310 | const level = item.properties.level.toUpperCase() | 310 | const level = item.properties.level.toUpperCase() |
| 311 | - if (level === 'DISTRICT') return | ||
| 312 | const adcode = item.properties.adcode | 311 | const adcode = item.properties.adcode |
| 312 | + if (level === 'DISTRICT') return | ||
| 313 | + if(String(adcode).startsWith('15') && level===areaEnum.CITY) return | ||
| 313 | props.chartConfig.option.mapRegion.adcode = adcode | 314 | props.chartConfig.option.mapRegion.adcode = adcode |
| 314 | saveLevelStr.level = level | 315 | saveLevelStr.level = level |
| 315 | handleDataPoint(adcode) | 316 | handleDataPoint(adcode) |