diff --git a/src/packages/components/Charts/Maps/MapChina/config.ts b/src/packages/components/Charts/Maps/MapChina/config.ts index 832a0b86..1d23a843 100644 --- a/src/packages/components/Charts/Maps/MapChina/config.ts +++ b/src/packages/components/Charts/Maps/MapChina/config.ts @@ -36,7 +36,7 @@ export const option = { { name: '地图', type: 'map', - map: 'chinaWithoutHainanIsLands', + map: 'china', zoom: 1, //缩放 itemStyle: { // 背景色 @@ -50,7 +50,7 @@ export const option = { color: '#ffffff', borderColor: '#75ecaa', borderWidth: 1, - showHainanIsLands: true // 是否显示海南群岛 + showHainanIsLands: true // 是否显示南海群岛 }, label: { show: true, diff --git a/src/packages/components/Charts/Maps/MapChina/config.vue b/src/packages/components/Charts/Maps/MapChina/config.vue index 010bcab0..a56dc962 100644 --- a/src/packages/components/Charts/Maps/MapChina/config.vue +++ b/src/packages/components/Charts/Maps/MapChina/config.vue @@ -45,7 +45,7 @@ - 显示海南群岛 + 显示南海群岛 diff --git a/src/packages/components/Charts/Maps/MapChina/index.vue b/src/packages/components/Charts/Maps/MapChina/index.vue index cb12cece..39fe0c59 100644 --- a/src/packages/components/Charts/Maps/MapChina/index.vue +++ b/src/packages/components/Charts/Maps/MapChina/index.vue @@ -45,7 +45,6 @@ use([ ]) registerMap('china', { geoJSON: mapJson as any, specialAreas: {} }) -registerMap('chinaWithoutHainanIsLands', { geoJSON: mapJsonWithoutHainanIsLands as any, specialAreas: {} }) const option = reactive({ value: mergeTheme(props.chartConfig.option, props.themeSetting, includes) @@ -59,13 +58,10 @@ const dataSetHandle = (dataset: any) => { }) } -const mapTypeHandle = (config: boolean) => { - // props.chartConfig.option.series.forEach((item: any) => { - // if (item.type === 'effectScatter' && dataset.point) item.data = dataset.point - // else if (item.type === 'map' && dataset.point) item.data = dataset.map - // option.value = props.chartConfig.option - // }) - props.chartConfig.option.series[1].map = config ? 'china' : 'chinaWithoutHainanIsLands' +const mapTypeHandle = (show: boolean) => { + show + ? registerMap('china', { geoJSON: mapJson as any, specialAreas: {} }) + : registerMap('china', { geoJSON: mapJsonWithoutHainanIsLands as any, specialAreas: {} }) option.value = props.chartConfig.option }