feat(src/packages): 图表地图支持下钻 修改地图注册方式为服务端接口请求

@@ -13,7 +13,8 @@ enum Api {
   VIDEO = '/video/list',
   VIDEO = '/video/list',
   DEVICE_PROFILE = '/device_profile/me/list',
   DEVICE_PROFILE = '/device_profile/me/list',
   DEVICE = '/device',
   DEVICE = '/device',
-  VIDEOURL = '/video/url/'
+  VIDEOURL = '/video/url/',
+  GEOJSONURL = '/map/geo_json/'
 }
 }
 
 
 export const getDictItemByCode = (value: string) => {
 export const getDictItemByCode = (value: string) => {
@@ -106,3 +107,9 @@ export const getVideoUrl = (id: string) =>
   defHttp.get({
   defHttp.get({
     url: `${Api.VIDEOURL}${id}`
     url: `${Api.VIDEOURL}${id}`
   })
   })
+
+//获取行政区域
+export const getGeoJsonMap = (code: number, level: string) =>
+  defHttp.get({
+    url: `${Api.GEOJSONURL}${code}/${level}`
+  })

@@ -24,7 +24,8 @@ const selectOptions = reactive({
 const selectValues = reactive({
 const selectValues = reactive({
   provinceValue: 'china',
   provinceValue: 'china',
   cityValue: null,
   cityValue: null,
-  countyValue: null
+  countyValue: null,
+  levelStr: areaEnum.COUNTRY
 })
 })
 
 
 const getAreaLists = async (level = areaEnum.PROVINCE, parentId = 1) => {
 const getAreaLists = async (level = areaEnum.PROVINCE, parentId = 1) => {
@@ -49,13 +50,15 @@ onMounted(async () => {
 const onHandleSelectProvince = async (value: number | string) => {
 const onHandleSelectProvince = async (value: number | string) => {
   selectValues.cityValue = null
   selectValues.cityValue = null
   selectValues.countyValue = null
   selectValues.countyValue = null
-  if (value === 'china') return
+  if (value === 'china') return (selectValues.levelStr = areaEnum.COUNTRY)
   selectOptions.cityOptions = await getAreaLists(areaEnum.CITY, value as any)
   selectOptions.cityOptions = await getAreaLists(areaEnum.CITY, value as any)
+  selectValues.levelStr = areaEnum.PROVINCE
 }
 }
 
 
 const onHandleSelectCity = async (value: number) => {
 const onHandleSelectCity = async (value: number) => {
   selectValues.countyValue = null
   selectValues.countyValue = null
   selectOptions.countryOptions = await getAreaLists(areaEnum.COUNTY, value)
   selectOptions.countryOptions = await getAreaLists(areaEnum.COUNTY, value)
+  selectValues.levelStr = areaEnum.CITY
 }
 }
 
 
 const onHandleSubmit = () => {
 const onHandleSubmit = () => {

@@ -7,23 +7,27 @@ import dataJson from './data.json'
 
 
 //省市区枚举
 //省市区枚举
 export const enum areaEnum {
 export const enum areaEnum {
-  PROVINCE = 'PROVINCE',
-  CITY = 'CITY',
-  COUNTY = 'COUNTY'
+  PROVINCE = 'PROVINCE',//省份
+  CITY = 'CITY',//城市
+  COUNTY = 'COUNTY',//县
+  COUNTRY = 'COUNTRY',//国家
+  TOWN = 'TOWN'//镇
 }
 }
 export const includes = []
 export const includes = []
 
 
 export const option = {
 export const option = {
-  iconColor:'black',
-  showIcon:false,
-  iconDistanceRight:20,
-  iconDistanceTop:20,
+  iconColor: 'black',
+  showIcon: false,
+  iconDistanceRight: 20,
+  iconDistanceTop: 20,
   drillingIn: false,
   drillingIn: false,
   dataset: dataJson,
   dataset: dataJson,
   mapRegion: {
   mapRegion: {
     adcode: 'china',
     adcode: 'china',
     showHainanIsLands: true,
     showHainanIsLands: true,
-    saveSelect:{}
+    saveSelect: {
+      levelStr: areaEnum.COUNTRY
+    }
   },
   },
   tooltip: {
   tooltip: {
     show: true,
     show: true,
@@ -157,7 +161,7 @@ export const option = {
         shadowOffsetY: 2,
         shadowOffsetY: 2,
         shadowBlur: 10
         shadowBlur: 10
       }
       }
-    },
+    }
   ]
   ]
 }
 }
 export const MapDefaultConfig = { ...option }
 export const MapDefaultConfig = { ...option }

@@ -6,6 +6,7 @@
     :theme="themeColor"
     :theme="themeColor"
     :option="option.value"
     :option="option.value"
     :manual-update="isPreview()"
     :manual-update="isPreview()"
+    :loading="loading"
     autoresize
     autoresize
   >
   >
   </v-chart>
   </v-chart>
@@ -13,7 +14,7 @@
 
 
 <script setup lang="ts">
 <script setup lang="ts">
 import { PropType, reactive, watch, ref, nextTick } from 'vue'
 import { PropType, reactive, watch, ref, nextTick } from 'vue'
-import config, { includes } from './config'
+import config, { includes, areaEnum } from './config'
 import VChart from 'vue-echarts'
 import VChart from 'vue-echarts'
 import { useCanvasInitOptions } from '@/hooks/useCanvasInitOptions.hook'
 import { useCanvasInitOptions } from '@/hooks/useCanvasInitOptions.hook'
 import { use, registerMap } from 'echarts/core'
 import { use, registerMap } from 'echarts/core'
@@ -25,9 +26,7 @@ import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore
 import { isPreview } from '@/utils'
 import { isPreview } from '@/utils'
 import mapJsonWithoutHainanIsLands from './mapWithoutHainanIsLands.json'
 import mapJsonWithoutHainanIsLands from './mapWithoutHainanIsLands.json'
 import { DatasetComponent, GridComponent, TooltipComponent, GeoComponent, VisualMapComponent } from 'echarts/components'
 import { DatasetComponent, GridComponent, TooltipComponent, GeoComponent, VisualMapComponent } from 'echarts/components'
-import cityMap from './mapGeojson/china-main-city-map.json'
-
-type historyDataType = { name: string; code: string }
+import { getGeoJsonMap } from '@/api/external/common'
 
 
 const props = defineProps({
 const props = defineProps({
   themeSetting: {
   themeSetting: {
@@ -57,14 +56,12 @@ use([
   VisualMapComponent
   VisualMapComponent
 ])
 ])
 
 
-const saveSelectValue = ref('')
+const loading = ref(true)
 
 
 const iconStr = ref(
 const iconStr = ref(
   'path://M853.333333 245.333333H245.333333l93.866667-93.866666c12.8-12.8 12.8-34.133333 0-46.933334-12.8-12.8-34.133333-12.8-46.933333 0l-145.066667 145.066667c-12.8 12.8-12.8 34.133333 0 46.933333l145.066667 145.066667c6.4 6.4 14.933333 10.666667 23.466666 10.666667s17.066667-4.266667 23.466667-10.666667c12.8-12.8 12.8-34.133333 0-46.933333L256 311.466667h597.333333c6.4 0 10.666667 4.266667 10.666667 10.666666v426.666667c0 6.4-4.266667 10.666667-10.666667 10.666667H170.666667c-17.066667 0-32 14.933333-32 32s14.933333 32 32 32h682.666666c40.533333 0 74.666667-34.133333 74.666667-74.666667V320c0-40.533333-34.133333-74.666667-74.666667-74.666667z'
   'path://M853.333333 245.333333H245.333333l93.866667-93.866666c12.8-12.8 12.8-34.133333 0-46.933334-12.8-12.8-34.133333-12.8-46.933333 0l-145.066667 145.066667c-12.8 12.8-12.8 34.133333 0 46.933333l145.066667 145.066667c6.4 6.4 14.933333 10.666667 23.466666 10.666667s17.066667-4.266667 23.466667-10.666667c12.8-12.8 12.8-34.133333 0-46.933333L256 311.466667h597.333333c6.4 0 10.666667 4.266667 10.666667 10.666666v426.666667c0 6.4-4.266667 10.666667-10.666667 10.666667H170.666667c-17.066667 0-32 14.933333-32 32s14.933333 32 32 32h682.666666c40.533333 0 74.666667-34.133333 74.666667-74.666667V320c0-40.533333-34.133333-74.666667-74.666667-74.666667z'
 )
 )
 
 
-const historyData = ref<historyDataType[]>([])
-
 const option = reactive({
 const option = reactive({
   value: mergeTheme(props.chartConfig.option, props.themeSetting, includes)
   value: mergeTheme(props.chartConfig.option, props.themeSetting, includes)
 })
 })
@@ -105,28 +102,52 @@ props.chartConfig.option = {
   ...{ toolbox: toolBoxOption.value }
   ...{ toolbox: toolBoxOption.value }
 }
 }
 
 
-//地图点击返回
-const watchAdcode = () => {
+//地图点击返回 adcode=100000,名字必须是china
+const watchAdcode = async () => {
   if (props.chartConfig.option.drillingIn) {
   if (props.chartConfig.option.drillingIn) {
-    const code = historyData.value.at(-2)?.code
-    props.chartConfig.option.mapRegion.adcode = code ? code : 'china'
-    historyData.value.pop()
+    saveLevelStr.level = saveLevelStr.parentInfo.level
+    await getGeojson(saveLevelStr.parentInfo.adcode)
+    props.chartConfig.option.geo.map =
+      saveLevelStr.parentInfo.adcode === 100000 ? 'china' : saveLevelStr.parentInfo.adcode
+    props.chartConfig.option.series.forEach((item: any) => {
+      if (item.type === 'map')
+        item.map = saveLevelStr.parentInfo.adcode === 100000 ? 'china' : saveLevelStr.parentInfo.adcode
+    })
+    vEchartsSetOption()
   }
   }
 }
 }
 
 
 const vChartRef = ref<typeof VChart>()
 const vChartRef = ref<typeof VChart>()
 
 
-//动态获取json注册地图
-const getGeojson = (regionId: string) => {
+const saveGeojson: any = ref({}) // 保存geojson
+
+const chinaDefaultRegionId = ref(100000) //如果是china则adcode为100000
+
+const saveLevelStr = reactive({
+  // 保存行政级别和上一级的adcode和level
+  level: '',
+  parentInfo: {
+    adcode: 0,
+    level: ''
+  }
+})
+
+//动态注册地图
+const getGeojson = async (regionId: any) => {
   try {
   try {
-    return new Promise<boolean>(resolve => {
-      import(`./mapGeojson/${regionId}.json`).then(data => {
-        registerMap(regionId, { geoJSON: data.default as any, specialAreas: {} })
-        resolve(true)
-      })
-    })
-  } finally {
-    console.log
+    const { levelStr } = props.chartConfig.option.mapRegion.saveSelect //右侧配置项获取的行政级别
+    const { data } = await getGeoJsonMap(
+      regionId === 'china' ? chinaDefaultRegionId.value : regionId,
+      !saveLevelStr.level ? levelStr : saveLevelStr.level
+    )
+    const { geoJson, name, code, level } = data
+    const geoJsonFile = JSON.parse(geoJson)
+    saveGeojson.value = geoJsonFile
+    registerMap(level === areaEnum.COUNTRY ? name : code, { geoJSON: geoJsonFile as any, specialAreas: {} })
+    loading.value = false
+  } catch (error) {
+    loading.value = false
+    console.error('动态注册地图出错', error)
   }
   }
 }
 }
 
 
@@ -136,7 +157,7 @@ registerMap(`${props.chartConfig.option.mapRegion.adcode}`, { geoJSON: {} as any
 // 进行更换初始化地图 如果为china 单独处理
 // 进行更换初始化地图 如果为china 单独处理
 const registerMapInitAsync = async () => {
 const registerMapInitAsync = async () => {
   await nextTick()
   await nextTick()
-  const adCode = `${props.chartConfig.option.mapRegion.adcode}`
+  const adCode = props.chartConfig.option.mapRegion.adcode
   if (adCode !== 'china') {
   if (adCode !== 'china') {
     await getGeojson(adCode)
     await getGeojson(adCode)
   } else {
   } else {
@@ -147,9 +168,13 @@ const registerMapInitAsync = async () => {
 registerMapInitAsync()
 registerMapInitAsync()
 
 
 // 手动触发渲染
 // 手动触发渲染
-const vEchartsSetOption = () => {
-  option.value = props.chartConfig.option
-  setOption(vChartRef.value, props.chartConfig.option)
+const vEchartsSetOption = async () => {
+  try {
+    option.value = props.chartConfig.option
+    setOption(vChartRef.value, props.chartConfig.option)
+  } catch (error) {
+    console.error('触发渲染出错', error)
+  }
 }
 }
 
 
 // 更新数据处理
 // 更新数据处理
@@ -159,7 +184,6 @@ const dataSetHandle = async (dataset: any) => {
     else if (item.type === 'map' && dataset.map) item.data = dataset.map
     else if (item.type === 'map' && dataset.map) item.data = dataset.map
   })
   })
   if (dataset.pieces) props.chartConfig.option.visualMap.pieces = dataset.pieces
   if (dataset.pieces) props.chartConfig.option.visualMap.pieces = dataset.pieces
-
   isPreview() && vEchartsSetOption()
   isPreview() && vEchartsSetOption()
 }
 }
 
 
@@ -202,7 +226,7 @@ watch(
 
 
 //监听地图展示区域发生变化
 //监听地图展示区域发生变化
 watch(
 watch(
-  () => `${props.chartConfig.option.mapRegion.adcode}`,
+  () => props.chartConfig.option.mapRegion.adcode,
   async newData => {
   async newData => {
     try {
     try {
       await getGeojson(newData)
       await getGeojson(newData)
@@ -225,17 +249,26 @@ useChartDataFetch(props.chartConfig, useChartEditStore, (newData: any) => {
   dataSetHandle(newData)
   dataSetHandle(newData)
 })
 })
 
 
-//地图点击
+const regionMapParentArea = {
+  [areaEnum.PROVINCE]: areaEnum.COUNTRY, //省份的上一级 中国
+  [areaEnum.CITY]: areaEnum.PROVINCE, //城市的上一级 省份
+  [areaEnum.COUNTY]: areaEnum.CITY, //县或者区的上一级 城市
+  [areaEnum.TOWN]: areaEnum.COUNTY //镇的上一级 县或者区
+}
+
+//地图点击下钻
 const handleVChartClick = async (params: any) => {
 const handleVChartClick = async (params: any) => {
   if (props.chartConfig.option.drillingIn) {
   if (props.chartConfig.option.drillingIn) {
     const { name } = params
     const { name } = params
-    saveSelectValue.value = name
-    const findAdcode = (cityMap as any)[name]
-    if (!findAdcode) return
-    props.chartConfig.option.mapRegion.adcode = findAdcode
-    historyData.value.push({
-      name,
-      code: findAdcode
+    saveGeojson.value?.features.forEach((item: any) => {
+      if (item.properties.name === name) {
+        const level = item.properties.level.toUpperCase()
+        const adcode = item.properties.adcode
+        props.chartConfig.option.mapRegion.adcode = adcode
+        saveLevelStr.level = level
+        saveLevelStr.parentInfo.adcode = item.properties.parent.adcode //保存上一级的地区编码
+        saveLevelStr.parentInfo.level = (regionMapParentArea as any)[level] //保存上一级的行政级别
+      }
     })
     })
   }
   }
 }
 }