Merge branch 'fix/select-province-area' into 'main_dev'

fix: 修复选择省份时和地区配置的选择省份联动

See merge request yunteng/thingskit-view!186

@@ -51,6 +51,9 @@ onMounted(async () => {
 const onHandleSelectProvince = async (value: number | string, options: Recordable) => {
 const onHandleSelectProvince = async (value: number | string, options: Recordable) => {
   selectValues.cityValue = null
   selectValues.cityValue = null
   selectValues.countyValue = null
   selectValues.countyValue = null
+  // if(props.drillingIn){
+  //   emits('handleSelectArea',{value,options})
+  // }
   if (value === 'china') return (selectValues.levelStr = areaEnum.COUNTRY)
   if (value === 'china') return (selectValues.levelStr = areaEnum.COUNTRY)
   selectOptions.cityOptions = await getAreaLists(areaEnum.CITY, value as number)
   selectOptions.cityOptions = await getAreaLists(areaEnum.CITY, value as number)
   selectValues.levelStr = areaEnum.PROVINCE
   selectValues.levelStr = areaEnum.PROVINCE

@@ -160,7 +160,7 @@
   <CollapseItem name="地区配置" :expanded="true">
   <CollapseItem name="地区配置" :expanded="true">
     <SettingItemBox name="地区配置" :alone="true">
     <SettingItemBox name="地区配置" :alone="true">
       <template v-for="(item, map3DIndex) in optionData.dataset.map3D" :key="map3DIndex">
       <template v-for="(item, map3DIndex) in optionData.dataset.map3D" :key="map3DIndex">
-        <setting-item name="省份名称">
+        <setting-item name="省份名称"  v-if="mapRegionCache.adcode=='china'">
           <n-select
           <n-select
             @change="(v:number,o:Recordable,w:Recordable,s1:number)=> onHandleSelectProvince(v,o,item, map3DIndex)"
             @change="(v:number,o:Recordable,w:Recordable,s1:number)=> onHandleSelectProvince(v,o,item, map3DIndex)"
             placeholder="请选择省份"
             placeholder="请选择省份"
@@ -233,6 +233,7 @@ import { regionInfo } from './config'
 import { cloneDeep } from 'lodash'
 import { cloneDeep } from 'lodash'
 import { getAreaList } from '@/api/external/common/index'
 import { getAreaList } from '@/api/external/common/index'
 import { areaEnum } from '../../../Decorates/Mores/Weather/config'
 import { areaEnum } from '../../../Decorates/Mores/Weather/config'
+import { unref } from 'vue'
 
 
 const props = defineProps({
 const props = defineProps({
   optionData: {
   optionData: {
@@ -298,7 +299,7 @@ const mapRegionCache = computed(() => {
   return props.optionData.mapRegion
   return props.optionData.mapRegion
 })
 })
 
 
-const onHandleSelectValues = (values: regionInfo) => {
+const onHandleSelectValues = async (values: regionInfo) => {
   const { cityValue, countyValue, provinceValue, areaName } = values
   const { cityValue, countyValue, provinceValue, areaName } = values
   mapRegionCache.value.areaName = areaName
   mapRegionCache.value.areaName = areaName
   mapRegionCache.value.saveSelect = values
   mapRegionCache.value.saveSelect = values
@@ -310,6 +311,17 @@ const onHandleSelectValues = (values: regionInfo) => {
     ? 'china'
     ? 'china'
     : provinceValue
     : provinceValue
   props.optionData.mapRegion = mapRegionCache.value
   props.optionData.mapRegion = mapRegionCache.value
+  if(mapRegionCache.value.adcode!=='china'){
+    const {adcode,areaName} = unref(mapRegionCache) || {}
+    const cityOptions =  await getAreaLists(areaEnum.CITY, adcode)
+    console.log(cityOptions,'cityOptions')
+    datasetMap3DList.value.forEach((item:any)=>{
+      item.name=areaName
+      item.city_name=areaName?areaName:null
+      item.adcode=adcode,
+      item.cityOptions = cityOptions && cityOptions.length?cityOptions:[{adcode,label:areaName,value:areaName}]
+    })
+  }
 }
 }
 
 
 const handleChangeDrillingIn = () => {
 const handleChangeDrillingIn = () => {