diff --git a/data-room-ui/packages/BasicComponents/Map/index.vue b/data-room-ui/packages/BasicComponents/Map/index.vue index 824b31c3..3f99d56b 100644 --- a/data-room-ui/packages/BasicComponents/Map/index.vue +++ b/data-room-ui/packages/BasicComponents/Map/index.vue @@ -326,11 +326,21 @@ export default { }) return } + let geoJsonObj + try { + geoJsonObj = JSON.parse(downMap.geoJson) + } catch (error) { + this.$message({ + message: params.name + '地图数据格式错误', + type: 'warning' + }) + return + } this.currentDeep++ this.mapList.push(downMap) this.changeData({...config, customize: {...config.customize, scope: params.name}}) this.option.geo.map = params.name - echarts.registerMap(params.name, JSON.parse(downMap.geoJson)); + echarts.registerMap(params.name, geoJsonObj); this.charts.setOption(this.option, true); }); } diff --git a/data-room-ui/packages/BasicComponents/Map/setting.vue b/data-room-ui/packages/BasicComponents/Map/setting.vue index 0cbfad50..36dd1604 100644 --- a/data-room-ui/packages/BasicComponents/Map/setting.vue +++ b/data-room-ui/packages/BasicComponents/Map/setting.vue @@ -73,7 +73,6 @@ :options="mapTree" :props="{ value: 'id', label: 'name', children: 'children', emitPath: false }" @change="mapSelect"> -