fix(src/packages): 修改设备分布地图和3d地图，返回图标问题

@@ -43,6 +43,9 @@ export const option = {
   iconDistanceTop: 20,
   drillingIn: false,
   dataset: dataMaps,
+  saveClickRegion: {
+    level: ''
+  },
   mapRegion: {
     adcode: 'china',
     showHainanIsLands: true,

@@ -41,7 +41,7 @@ const toolBoxOption = ref({
   top: 20,
   feature: {
     myFullButton: {
-      show: true,
+      show: false,
       title: '返回',
       icon: iconStr.value,
       iconStyle: {
@@ -55,8 +55,34 @@ const toolBoxOption = ref({
 watch(
   () => props.chartConfig.option,
   newData => {
-    const { iconColor, drillingIn, iconDistanceRight, iconDistanceTop } = newData
-    toolBoxOption.value.feature.myFullButton.show = drillingIn
+    const { iconColor, drillingIn, iconDistanceRight, iconDistanceTop, mapRegion } = newData
+    if (drillingIn && !newData.saveClickRegion.level) {
+      toolBoxOption.value.feature.myFullButton.show = !drillingIn
+    } else if (
+      drillingIn &&
+      newData.saveClickRegion.level === areaEnum.PROVINCE &&
+      mapRegion.saveSelect.levelStr === areaEnum.COUNTRY
+    ) {
+      toolBoxOption.value.feature.myFullButton.show = drillingIn
+    } else if (
+      drillingIn &&
+      newData.saveClickRegion.level === areaEnum.COUNTRY &&
+      mapRegion.saveSelect.levelStr === areaEnum.COUNTRY
+    ) {
+      toolBoxOption.value.feature.myFullButton.show = !drillingIn
+    } else if (
+      drillingIn &&
+      newData.saveClickRegion.level === areaEnum.CITY &&
+      mapRegion.saveSelect.levelStr === areaEnum.PROVINCE
+    ) {
+      toolBoxOption.value.feature.myFullButton.show = drillingIn
+    } else if (
+      drillingIn &&
+      newData.saveClickRegion.level === areaEnum.PROVINCE &&
+      mapRegion.saveSelect.levelStr === areaEnum.PROVINCE
+    ) {
+      toolBoxOption.value.feature.myFullButton.show = !drillingIn
+    }
     toolBoxOption.value.feature.myFullButton.iconStyle.color = iconColor
     toolBoxOption.value.right = iconDistanceRight
     toolBoxOption.value.top = iconDistanceTop
@@ -89,6 +115,7 @@ const watchAdcode = async () => {
     }
     const exist = await getGeojson(saveAdcode)
     const adcode = saveAdcode === 100000 ? 'china' : saveAdcode
+    props.chartConfig.option.saveClickRegion.level = saveLevelStr.level
     if (exist) {
       //fix解决点击下钻返回后页面为空问题
       props.chartConfig.option.mapRegion.adcode = adcode
@@ -114,6 +141,7 @@ const handleMap3DClick = async (params: Recordable) => {
         if (level === 'DISTRICT') return
         if (String(adcode).startsWith('15') && level === areaEnum.CITY) return
         props.chartConfig.option.mapRegion.adcode = adcode
+        props.chartConfig.option.saveClickRegion.level = level
         saveLevelStr.level = level
         handleDataPoint(adcode)
         saveHistoryParent.value.push({
@@ -215,8 +243,18 @@ onMounted(() => {
 const handleDataPoint = (newData: string | number) => {
   if (newData === 'china') {
     props.chartConfig.option.dataset = dataMaps
+    props.chartConfig.option.series.forEach((item: Recordable) => {
+      if (item.type === 'scatter3D') {
+        item.data = dataMaps
+      }
+    })
   } else {
     props.chartConfig.option.dataset = dataMaps.filter((item: dataPointI) => item.adcode === newData)
+    props.chartConfig.option.series.forEach((item: Recordable) => {
+      if (item.type === 'scatter3D') {
+        item.data = dataMaps.filter((item: dataPointI) => item.adcode === newData)
+      }
+    })
   }
 }
 

@@ -7,11 +7,11 @@ import dataJson from './data.json'
 
 //省市区枚举
 export const enum areaEnum {
-  PROVINCE = 'PROVINCE',//省份
-  CITY = 'CITY',//城市
-  COUNTY = 'COUNTY',//县
-  COUNTRY = 'COUNTRY',//国家
-  TOWN = 'TOWN'//镇
+  PROVINCE = 'PROVINCE', //省份
+  CITY = 'CITY', //城市
+  COUNTY = 'COUNTY', //县
+  COUNTRY = 'COUNTRY', //国家
+  TOWN = 'TOWN' //镇
 }
 export const includes = []
 
@@ -22,6 +22,9 @@ export const option = {
   iconDistanceTop: 20,
   drillingIn: false,
   dataset: dataJson,
+  saveClickRegion: {
+    level: ''
+  },
   mapRegion: {
     adcode: 'china',
     showHainanIsLands: true,

@@ -74,7 +74,7 @@ const toolBoxOption = ref({
   top: 20,
   feature: {
     myFullButton: {
-      show: true,
+      show: false,
       title: '返回',
       icon: iconStr.value,
       iconStyle: {
@@ -88,22 +88,49 @@ const toolBoxOption = ref({
 watch(
   () => props.chartConfig.option,
   newData => {
-    const { iconColor, drillingIn, iconDistanceRight, iconDistanceTop } = newData
-    toolBoxOption.value.feature.myFullButton.show = drillingIn
+    const { iconColor, drillingIn, iconDistanceRight, iconDistanceTop, mapRegion } = newData
+    if (drillingIn && !newData.saveClickRegion.level) {
+      toolBoxOption.value.feature.myFullButton.show = !drillingIn
+    } else if (
+      drillingIn &&
+      newData.saveClickRegion.level === areaEnum.PROVINCE &&
+      mapRegion.saveSelect.levelStr === areaEnum.COUNTRY
+    ) {
+      toolBoxOption.value.feature.myFullButton.show = drillingIn
+    } else if (
+      drillingIn &&
+      newData.saveClickRegion.level === areaEnum.COUNTRY &&
+      mapRegion.saveSelect.levelStr === areaEnum.COUNTRY
+    ) {
+      toolBoxOption.value.feature.myFullButton.show = !drillingIn
+    } else if (
+      drillingIn &&
+      newData.saveClickRegion.level === areaEnum.CITY &&
+      mapRegion.saveSelect.levelStr === areaEnum.PROVINCE
+    ) {
+      toolBoxOption.value.feature.myFullButton.show = drillingIn
+    } else if (
+      drillingIn &&
+      newData.saveClickRegion.level === areaEnum.PROVINCE &&
+      mapRegion.saveSelect.levelStr === areaEnum.PROVINCE
+    ) {
+      toolBoxOption.value.feature.myFullButton.show = !drillingIn
+    }
     toolBoxOption.value.feature.myFullButton.iconStyle.color = iconColor
     toolBoxOption.value.right = iconDistanceRight
     toolBoxOption.value.top = iconDistanceTop
+    vEchartsSetOption()
   },
   {
-    deep: true
+    deep: true,
   }
 )
-
 props.chartConfig.option = {
   ...props.chartConfig.option,
   ...{ toolbox: toolBoxOption.value }
 }
 
+
 //地图点击返回 adcode=100000,名字必须是china
 const watchAdcode = async () => {
   if (props.chartConfig.option.drillingIn) {
@@ -121,6 +148,7 @@ const watchAdcode = async () => {
     }
     await getGeojson(saveAdcode)
     const adcode = saveAdcode === 100000 ? 'china' : saveAdcode
+    props.chartConfig.option.saveClickRegion.level = saveLevelStr.level
     props.chartConfig.option.geo.map = adcode
     props.chartConfig.option.series.forEach((item: any) => {
       if (item.type === 'map') item.map = adcode
@@ -324,6 +352,7 @@ const handleVChartClick = async (params: any) => {
         if (level === 'DISTRICT') return
         if (String(adcode).startsWith('15') && level === areaEnum.CITY) return
         props.chartConfig.option.mapRegion.adcode = adcode
+        props.chartConfig.option.saveClickRegion.level = level
         saveLevelStr.level = level
         handleDataPoint(adcode)
         saveHistoryParent.value.push({