feat(src/packages): 修改地图从中国地图,点击省会下钻,再点击市区,返回只能返回到省会,再返回到中国地图无效

fengwotao
1 parent ca773a06
Showing 2 changed files with 67 additions and 22 deletions
src/packages/components/external/Charts/Maps/AddThreeDimensionalMap/index.vue
src/packages/components/external/Charts/Maps/OverrideMapBase/index.vue
--- a/src/packages/components/external/Charts/Maps/AddThreeDimensionalMap/index.vue
View file @bc14452
+++ b/src/packages/components/external/Charts/Maps/AddThreeDimensionalMap/index.vue
View file @bc14452
@@ -74,10 +74,15 @@ props.chartConfig.option = {
 //地图点击返回
 const watchAdcode = async () => {
   if (props.chartConfig.option.drillingIn) {
-    let saveAdcode: any = saveLevelStr.parentInfo.adcode
-    saveLevelStr.level = saveLevelStr.parentInfo.level
+    //如果是从右边配置里设置的，比如点击四川省，然后点击返回
+    const savePopParent = saveHistoryParent.value.pop()
+    let saveAdcode: any = savePopParent?.adcode
+    saveLevelStr.level = savePopParent?.level as string
+    if (!savePopParent) {
+      saveAdcode = getParentAdcode(props.chartConfig.option.mapRegion.adcode)
+      saveLevelStr.level = (regionMapParentArea as any)[props.chartConfig.option.mapRegion.saveSelect.levelStr]
+    }
     if (saveAdcode === 0) {
-      //
       saveAdcode = 'china'
       saveLevelStr.level = 'COUNTRY'
     }
@@ -110,9 +115,11 @@ const handleMap3DClick = async (params: any) => {
         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] //保存上一级的行政级别
         handleDataPoint(adcode)
+        saveHistoryParent.value.push({
+          adcode: item.properties.parent.adcode,
+          level: (regionMapParentArea as any)[level]
+        })
       }
     })
   }
@@ -123,14 +130,18 @@ const saveGeojson: any = ref({}) // 保存geojson
 const chinaDefaultRegionId = ref(100000) //如果是china则adcode为100000
 const saveLevelStr = reactive({
-  // 保存行政级别和上一级的adcode和level
-  level: '',
-  parentInfo: {
-    adcode: 0,
-    level: ''
-  }
+   // 地区级别
+   level: ''
 })
+//父级地区编码和级别接口
+interface HistoryParentType {
+  adcode: number
+  level: string
+}
+
+const saveHistoryParent = ref<HistoryParentType[]>([])
+
 //动态注册地图
 const getGeojson = (regionId: any) => {
   try {
@@ -158,6 +169,18 @@ const getGeojson = (regionId: any) => {
   }
 }
+
+//传adcode 获取上级
+const getParentAdcode = (adcode: number) => {
+  let adcodeNum = 100000
+  saveGeojson.value?.features.forEach((item: any) => {
+    if (item.properties.adcode === adcode) {
+      adcodeNum = item.properties.parent.adcode
+    }
+  })
+  return adcodeNum
+}
+
 watch(
   () => w.value,
   (value: number) => {
--- a/src/packages/components/external/Charts/Maps/OverrideMapBase/index.vue
View file @bc14452
+++ b/src/packages/components/external/Charts/Maps/OverrideMapBase/index.vue
View file @bc14452
@@ -107,10 +107,15 @@ props.chartConfig.option = {
 //地图点击返回 adcode=100000,名字必须是china
 const watchAdcode = async () => {
   if (props.chartConfig.option.drillingIn) {
-    let saveAdcode: any = saveLevelStr.parentInfo.adcode
-    saveLevelStr.level = saveLevelStr.parentInfo.level
+    //如果是从右边配置里设置的，比如点击四川省，然后点击返回
+    const savePopParent = saveHistoryParent.value.pop()
+    let saveAdcode: any = savePopParent?.adcode
+    saveLevelStr.level = savePopParent?.level as string
+    if (!savePopParent) {
+      saveAdcode = getParentAdcode(props.chartConfig.option.mapRegion.adcode)
+      saveLevelStr.level = (regionMapParentArea as any)[props.chartConfig.option.mapRegion.saveSelect.levelStr]
+    }
     if (saveAdcode === 0) {
-      //
       saveAdcode = 'china'
       saveLevelStr.level = 'COUNTRY'
     }
@@ -132,14 +137,18 @@ const saveGeojson: any = ref({}) // 保存geojson
 const chinaDefaultRegionId = ref(100000) //如果是china则adcode为100000
 const saveLevelStr = reactive({
-  // 保存行政级别和上一级的adcode和level
-  level: '',
-  parentInfo: {
-    adcode: 0,
-    level: ''
-  }
+  // 地区级别
+  level: ''
 })
+//父级地区编码和级别接口
+interface HistoryParentType {
+  adcode: number
+  level: string
+}
+
+const saveHistoryParent = ref<HistoryParentType[]>([])
+
 //动态注册地图
 const getGeojson = async (regionId: any) => {
   try {
@@ -281,6 +290,17 @@ const regionMapParentArea = {
   [areaEnum.TOWN]: areaEnum.COUNTY //镇的上一级 县或者区
 }
+//传adcode 获取上级
+const getParentAdcode = (adcode: number) => {
+  let adcodeNum = 100000
+  saveGeojson.value?.features.forEach((item: any) => {
+    if (item.properties.adcode === adcode) {
+      adcodeNum = item.properties.parent.adcode
+    }
+  })
+  return adcodeNum
+}
+
 //地图点击下钻
 const handleVChartClick = async (params: any) => {
   if (props.chartConfig.option.drillingIn) {
@@ -291,9 +311,11 @@ const handleVChartClick = async (params: any) => {
         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] //保存上一级的行政级别
         handleDataPoint(adcode)
+        saveHistoryParent.value.push({
+          adcode: item.properties.parent.adcode,
+          level: (regionMapParentArea as any)[level]
+        })
       }
     })
   }