diff --git a/src/packages/components/Charts/Maps/MapChine/config.ts b/src/packages/components/Charts/Maps/MapChine/config.ts
index 7f056db6..1354b99d 100644
--- a/src/packages/components/Charts/Maps/MapChine/config.ts
+++ b/src/packages/components/Charts/Maps/MapChine/config.ts
@@ -2,10 +2,11 @@ import { echartOptionProfixHandle, publicConfig } from '@/packages/public'
import { MapChineConfig } from './index'
import { CreateComponentType } from '@/packages/index.d'
import { defaultTheme, chartColorsSearch } from '@/settings/chartThemes/index'
-
+import dataJson from './points.json'
export const includes = ['geo']
export const option = {
+ dataset: dataJson,
geo: {
show: true,
type: 'map',
@@ -80,6 +81,33 @@ export const option = {
type: 'effectScatter',
coordinateSystem: 'geo',
symbolSize: 12,
+ // data: [
+ // {
+ // // 数据映射
+ // name: '苏尼特左旗', // 对应地图中的name
+ // value: [113.653412, 43.854108, 4500] // value值,前面两个是X轴,Y轴坐标, 后面的数据自定义,可以设置多个
+ // },
+ // {
+ // name: '二连浩特市',
+ // value: [111.97981, 43.652895, 3560]
+ // },
+ // {
+ // name: '阿巴嘎旗',
+ // value: [114.970618, 44.022728, 3300]
+ // },
+ // {
+ // name: '苏尼特右旗',
+ // value: [112.65539, 42.746662, 2800]
+ // },
+ // {
+ // name: '正镶白旗',
+ // value: [115.031423, 42.286807, 2100]
+ // },
+ // {
+ // name: '太仆寺旗',
+ // value: [115.28728, 41.895199, 1900]
+ // }
+ // ],
label: {
normal: {
show: false
diff --git a/src/packages/components/Charts/Maps/MapChine/config.vue b/src/packages/components/Charts/Maps/MapChine/config.vue
index 6584a02e..6692179a 100644
--- a/src/packages/components/Charts/Maps/MapChine/config.vue
+++ b/src/packages/components/Charts/Maps/MapChine/config.vue
@@ -2,11 +2,16 @@
-
+
@@ -15,7 +20,7 @@
@@ -32,7 +37,7 @@ import {
} from "@/components/Pages/ChartItemSetting";
import { lineConf } from "@/packages/chartConfiguration/echarts/index";
import { GlobalThemeJsonType } from "@/settings/chartThemes/index";
-import { GlobalSetting } from '@/components/Pages/ChartItemSetting'
+import { GlobalSetting } from "@/components/Pages/ChartItemSetting";
const props = defineProps({
optionData: {
@@ -40,8 +45,7 @@ const props = defineProps({
required: true,
},
});
-console.log('optionData',props.optionData)
-const series = computed(() => {
- return props.optionData.series[0];
+const seriesList = computed(() => {
+ return props.optionData.series;
});
diff --git a/src/packages/components/Charts/Maps/MapChine/index.vue b/src/packages/components/Charts/Maps/MapChine/index.vue
index 0ba4935a..b27d4f80 100644
--- a/src/packages/components/Charts/Maps/MapChine/index.vue
+++ b/src/packages/components/Charts/Maps/MapChine/index.vue
@@ -2,7 +2,7 @@
@@ -10,7 +10,7 @@
diff --git a/src/packages/components/Charts/Maps/MapChine/points.json b/src/packages/components/Charts/Maps/MapChine/points.json
new file mode 100644
index 00000000..4abe8de3
--- /dev/null
+++ b/src/packages/components/Charts/Maps/MapChine/points.json
@@ -0,0 +1,26 @@
+{
+ "data": [{
+ "name": "苏尼特左旗",
+ "value": [113.653412, 43.854108, 4500]
+ }, {
+ "name": "二连浩特市",
+ "value": [111.97981, 43.652895, 3560]
+ },
+ {
+ "name": "阿巴嘎旗",
+ "value": [114.970618, 44.022728, 3300]
+ },
+ {
+ "name": "苏尼特右旗",
+ "value": [112.65539, 42.746662, 2800]
+ },
+ {
+ "name": "正镶白旗",
+ "value": [115.031423, 42.286807, 2100]
+ },
+ {
+ "name": "太仆寺旗",
+ "value": [115.28728, 41.895199, 1900]
+ }
+ ]
+}
\ No newline at end of file