Commit ac726fa2d56afae8fa55a89d3d33b3e617a18d1f
Merge branch 'ft' into 'main_dev'
feat(src/packages): 修改地图从中国地图,点击省会下钻,再点击市区,返回只能返回到省会,再返回到中国地图无效 See merge request yunteng/thingskit-view!127
Showing
2 changed files
with
2 additions
and
0 deletions
| @@ -112,6 +112,7 @@ const handleMap3DClick = async (params: any) => { | @@ -112,6 +112,7 @@ 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 | ||
| 115 | const adcode = item.properties.adcode | 116 | const adcode = item.properties.adcode |
| 116 | props.chartConfig.option.mapRegion.adcode = adcode | 117 | props.chartConfig.option.mapRegion.adcode = adcode |
| 117 | saveLevelStr.level = level | 118 | saveLevelStr.level = level |
| @@ -308,6 +308,7 @@ const handleVChartClick = async (params: any) => { | @@ -308,6 +308,7 @@ 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 | ||
| 311 | const adcode = item.properties.adcode | 312 | const adcode = item.properties.adcode |
| 312 | props.chartConfig.option.mapRegion.adcode = adcode | 313 | props.chartConfig.option.mapRegion.adcode = adcode |
| 313 | saveLevelStr.level = level | 314 | saveLevelStr.level = level |