Merge branch 'main_dev' into dev_by_ft

@@ -72,71 +72,7 @@ export const regionMapParentArea = {
   TOWN: areaEnum.COUNTY //镇的上一级 县或者区
 }
 
-// 缩放配置文件
-export const setScale = (adcode: string | number) => {
-  switch (adcode) {
-    case 'china':
-      return { distance: 100, zoom: 1, alpha: 45 }
-    case '110000':
-      return { distance: 150, zoom: 0.8, alpha: 45 }
-    case '120000':
-      return { distance: 190, zoom: 0.8, alpha: 45 }
-    case '130000':
-      return { distance: 165, zoom: 0.8, alpha: 45 }
-    case '140000':
-      return { distance: 216, zoom: 0.8, alpha: 45 }
-    case '150000':
-      return { distance: 130, zoom: 0.8, alpha: 45 }
-    case '210000':
-      return { distance: 130, zoom: 0.8, alpha: 45 }
-    case '310000':
-      return { distance: 135, zoom: 0.8, alpha: 45 }
-    case '320000':
-      return { distance: 145, zoom: 0.8, alpha: 45 }
-    case '330000':
-      return { distance: 135, zoom: 0.8, alpha: 45 }
-    case '340000':
-      return { distance: 170, zoom: 0.8, alpha: 45 }
-    case '350000':
-     return { distance: 150, zoom: 0.8, alpha: 45 }
-    case '360000':
-      return { distance: 190, zoom: 0.8, alpha: 45 }
-    case '370000':
-      return { distance: 135, zoom: 0.8, alpha: 45 }
-    case '420000':
-      return { distance: 145, zoom: 0.8, alpha: 45 }
-    case '430000':
-      return { distance: 165, zoom: 0.8, alpha: 45 }
-    case '440000':
-      return { distance: 165, zoom: 0.8, alpha: 45 }
-    case '500000':
-      return { distance: 145, zoom: 0.8, alpha: 45 }
-    case '510000':
-      return { distance: 115, zoom: 0.8, alpha: 45 }
-    case '520000':
-      return { distance: 135, zoom: 0.8, alpha: 45 }
-    case '530000':
-      return { distance: 145, zoom: 0.8, alpha: 45 }
-    case '540000':
-      return { distance: 140, zoom: 0.8, alpha: 45 }
-    case '610000':
-      return { distance: 210, zoom: 0.8, alpha: 45 }
-    case '620000':
-      return { distance: 135, zoom: 0.8, alpha: 45 }
-    case '640000':
-      return { distance: 195, zoom: 0.8, alpha: 45 }
-    case '650000':
-      return { distance: 135, zoom: 0.8, alpha: 45 }
-    case '710000':
-      return { distance: 135, zoom: 0.8, alpha: 45 }
-    case '810000':
-      return { distance: 145, zoom: 0.8, alpha: 45 }
-    case '820000':
-      return { distance: 240, zoom: 0.8, alpha: 45 }
-    default:
-      return { distance: 125, zoom: 1, alpha: 45 }
-  }
-}
+
 
 export const includes = []
 
@@ -263,3 +199,509 @@ export default class Config extends PublicConfigClass implements CreateComponent
   public chartConfig = cloneDeep(AddThreeDimensionalMapConfig)
   public option = echartOptionProfixHandle(option, includes)
 }
+
+// 缩放配置文件
+export const setScale = (adcode: string | number) => {
+  switch (adcode) {
+    case 'china':
+      return { distance: 100 }
+    case '110000':
+      return { distance: 150 }
+    case '120000':
+      return { distance: 190 }
+    case '130000':
+      return { distance: 165 }
+    case '130200':
+      return { distance: 135 }
+    case '130300':
+      return { distance: 135 }
+    case '130400':
+      return { distance: 130 }
+    case '130500':
+      return { distance: 130 }
+    case '130700':
+      return { distance: 160 }
+    case '131000':
+      return { distance: 200 }
+    case '131100':
+      return { distance: 135 }
+    case '140000':
+      return { distance: 216 }
+    case '140200':
+      return { distance: 140 }
+    case '140300':
+      return { distance: 150 }
+    case '140400':
+      return { distance: 150 }
+    case '140600':
+      return { distance: 135 }
+    case '140700':
+      return { distance: 135 }
+    case '140800':
+      return { distance: 145 }
+    case '141000':
+      return { distance: 140 }
+    case '141100':
+      return { distance: 165 }
+    case '150000':
+      return { distance: 130 }
+    case '150100':
+      return { distance: 150 }
+    case '150300':
+      return { distance: 240 }
+    case '150400':
+      return { distance: 130 }
+    case '150500':
+      return { distance: 130 }
+    case '150600':
+      return { distance: 130 }
+    case '210000':
+      return { distance: 130 }
+    case '210100':
+      return { distance: 165 }
+    case '210200':
+      return { distance: 135 }
+    case '210300':
+      return { distance: 155 }
+    case '210600':
+      return { distance: 145 }
+    case '210800':
+      return { distance: 150 }
+    case '211200':
+      return { distance: 150 }
+    case '211300':
+      return { distance: 150 }
+    case '220100':
+      return { distance: 130 }
+    case '220200':
+      return { distance: 145 }
+    case '220400':
+      return { distance: 145 }
+    case '220500':
+      return { distance: 225 }
+    case '220600':
+      return { distance: 155 }
+    case '230600':
+      return { distance: 195 }
+    case '230700':
+      return { distance: 155 }
+    case '231000':
+      return { distance: 160 }
+    case '310000':
+      return { distance: 135 }
+    case '320000':
+      return { distance: 145 }
+    case '320100':
+      return { distance: 240 }
+    case '320200':
+      return { distance: 155 }
+    case '320400':
+      return { distance: 145 }
+    case '320500':
+      return { distance: 145 }
+    case '320600':
+      return { distance: 145 }
+    case '320800':
+      return { distance: 160 }
+    case '320900':
+      return { distance: 180 }
+    case '321000':
+      return { distance: 200 }
+    case '321100':
+      return { distance: 135 }
+    case '321200':
+      return { distance: 200 }
+    case '321300':
+      return { distance: 160 }
+    case '330000':
+      return { distance: 135 }
+    case '330100':
+      return { distance: 135 }
+    case '330200':
+      return { distance: 135 }
+    case '330300':
+      return { distance: 140 }
+    case '330400':
+      return { distance: 140 }
+    case '330500':
+      return { distance: 135 }
+    case '330600':
+      return { distance: 145 }
+    case '330800':
+      return { distance: 150 }
+    case '331100':
+      return { distance: 135 }
+    case '340000':
+      return { distance: 170 }
+    case '340100':
+      return { distance: 175 }
+    case '340300':
+      return { distance: 130 }
+    case '340400':
+      return { distance: 190 }
+    case '340600':
+      return { distance: 220 }
+    case '340800':
+      return { distance: 160 }
+    case '341200':
+      return { distance: 135 }
+    case '341300':
+      return { distance: 130 }
+    case '341500':
+      return { distance: 145 }
+    case '341600':
+      return { distance: 160 }
+    case '341700':
+      return { distance: 155 }
+    case '350000':
+     return { distance: 150}
+    case '350200':
+     return { distance: 140}
+    case '350500':
+     return { distance: 135}
+    case '350600':
+     return { distance: 190}
+    case '350900':
+     return { distance: 140}
+    case '360000':
+      return { distance: 190}
+    case '360100':
+      return { distance: 145}
+    case '360200':
+      return { distance: 225}
+    case '360300':
+      return { distance: 215}
+    case '360500':
+      return { distance: 135}
+    case '360600':
+      return { distance: 175}
+    case '360700':
+      return { distance: 175}
+    case '360800':
+      return { distance: 145}
+    case '360900':
+      return { distance: 135}
+    case '361000':
+      return { distance: 170}
+    case '361100':
+      return { distance: 140}
+    case '370000':
+      return { distance: 135 }
+    case '370100':
+      return { distance: 165 }
+    case '370200':
+      return { distance: 165 }
+    case '370300':
+      return { distance: 210 }
+    case '370400':
+      return { distance: 150 }
+    case '370500':
+      return { distance: 150 }
+    case '370800':
+      return { distance: 135 }
+    case '371100':
+      return { distance: 140 }
+    case '371300':
+      return { distance: 150 }
+    case '371400':
+      return { distance: 130 }
+    case '371500':
+      return { distance: 150 }
+    case '371600':
+      return { distance: 200 }
+    case '371700':
+      return { distance: 180 }
+    case '410100':
+      return { distance: 135 }
+    case '410200':
+      return { distance: 140 }
+    case '410300':
+      return { distance: 140 }
+    case '410400':
+      return { distance: 155 }
+    case '410500':
+      return { distance: 145 }
+    case '410800':
+      return { distance: 140 }
+    case '410900':
+      return { distance: 145 }
+    case '411000':
+      return { distance: 140 }
+    case '411100':
+      return { distance: 155 }
+    case '411200':
+      return { distance: 140 }
+    case '411300':
+      return { distance: 140 }
+    case '411400':
+      return { distance: 135 }
+    case '411700':
+      return { distance: 130 }
+    case '420000':
+      return { distance: 145 }
+    case '420100':
+      return { distance: 160 }
+    case '420300':
+      return { distance: 130 }
+    case '420500':
+      return { distance: 155 }
+    case '420700':
+      return { distance: 170 }
+    case '420900':
+      return { distance: 180 }
+    case '421100':
+      return { distance: 180 }
+    case '421200':
+      return { distance: 150 }
+    case '421300':
+      return { distance: 165 }
+    case '422800':
+      return { distance: 150 }
+    case '430000':
+      return { distance: 155 }
+    case '430200':
+      return { distance: 250 }
+    case '430600':
+      return { distance: 155 }
+    case '430700':
+      return { distance: 155 }
+    case '430900':
+      return { distance: 145 }
+    case '431000':
+      return { distance: 150 }
+    case '431100':
+      return { distance: 235 }
+    case '431200':
+      return { distance: 195 }
+    case '431300':
+      return { distance: 135 }
+    case '433100':
+      return { distance: 220 }
+    case '440000':
+      return { distance: 165 }
+    case '440100':
+      return { distance: 185 }
+    case '440300':
+      return { distance: 135 }
+    case '440400':
+      return { distance: 135 }
+    case '440500':
+      return { distance: 140 }
+    case '440600':
+      return { distance: 180 }
+    case '440700':
+      return { distance: 150 }
+    case '440800':
+      return { distance: 190 }
+    case '440900':
+      return { distance: 160 }
+    case '441200':
+      return { distance: 165 }
+    case '441400':
+      return { distance: 160 }
+    case '441600':
+      return { distance: 185 }
+    case '441700':
+      return { distance: 180 }
+    case '445100':
+      return { distance: 170 }
+    case '445200':
+      return { distance: 160 }
+    case '445300':
+      return { distance: 130 }
+    case '450100':
+      return { distance: 135 }
+    case '450200':
+      return { distance: 195 }
+    case '450300':
+      return { distance: 175 }
+    case '450400':
+      return { distance: 195 }
+    case '450600':
+      return { distance: 155 }
+    case '450800':
+      return { distance: 165 }
+    case '450900':
+      return { distance: 165 }
+    case '451000':
+      return { distance: 135 }
+    case '451100':
+      return { distance: 145 }
+    case '451400':
+      return { distance: 165 }
+    case '460100':
+      return { distance: 155 }
+    case '500000':
+      return { distance: 140 }
+    case '510000':
+      return { distance: 115 }
+    case '510100':
+      return { distance: 135 }
+    case '510300':
+      return { distance: 145 }
+    case '510400':
+      return { distance: 165 }
+    case '510500':
+      return { distance: 195 }
+    case '510600':
+      return { distance: 155 }
+    case '510700':
+      return { distance: 170 }
+    case '510800':
+      return { distance: 115 }
+    case '510900':
+      return { distance: 160 }
+    case '511000':
+      return { distance: 145 }
+    case '511100':
+      return { distance: 165 }
+    case '511300':
+      return { distance: 135 }
+    case '511400':
+      return { distance: 140 }
+    case '511500':
+      return { distance: 140 }
+    case '511700':
+      return { distance: 155 }
+    case '511800':
+      return { distance: 215 }
+    case '511900':
+      return { distance: 160 }
+    case '512000':
+      return { distance: 135 }
+    case '513200':
+      return { distance: 105 }
+    case '513300':
+      return { distance: 175 }
+    case '520000':
+      return { distance: 135 }
+    case '520100':
+      return { distance: 145 }
+    case '520200':
+      return { distance: 165 }
+    case '520300':
+      return { distance: 148 }
+    case '520400':
+      return { distance: 145 }
+    case '522300':
+      return { distance: 145 }
+    case '522600':
+      return { distance: 139 }
+    case '522700':
+      return { distance: 175 }
+    case '530000':
+      return { distance: 145 }
+    case '530100':
+      return { distance: 205 }
+    case '530300':
+      return { distance: 228 }
+    case '530500':
+      return { distance: 135 }
+    case '530600':
+      return { distance: 155 }
+    case '530700':
+      return { distance: 150 }
+    case '530800':
+      return { distance: 165 }
+    case '530900':
+      return { distance: 165 }
+    case '532300':
+      return { distance:205 }
+    case '532500':
+      return { distance: 165 }
+    case '532800':
+      return { distance: 160 }
+    case '532900':
+      return { distance: 140 }
+    case '533100':
+      return { distance: 175 }
+    case '533300':
+      return { distance: 275 }
+    case '533400':
+      return { distance: 200 }
+    case '540000':
+      return { distance: 140 }
+    case '540100':
+      return { distance: 145 }
+    case '542500':
+      return { distance: 155 }
+    case '610000':
+      return { distance: 210 }
+    case '610100':
+      return { distance: 145 }
+    case '610200':
+      return { distance: 140 }
+    case '610300':
+      return { distance: 145 }
+    case '610400':
+      return { distance: 135 }
+    case '610500':
+      return { distance: 155 }
+    case '610600':
+      return { distance: 135 }
+    case '610700':
+      return { distance: 140 }
+    case '610800':
+      return { distance: 155 }
+    case '610900':
+      return { distance: 160}
+    case '611000':
+      return { distance: 150}
+    case '620000':
+      return { distance: 135 }
+    case '620300':
+      return { distance: 140 }
+    case '620400':
+      return { distance: 165 }
+    case '620500':
+      return { distance: 135 }
+    case '620600':
+      return { distance: 175 }
+    case '620700':
+      return { distance: 135 }
+    case '620900':
+      return { distance: 135 }
+    case '621000':
+      return { distance: 155 }
+    case '621100':
+      return { distance: 145 }
+    case '622900':
+      return { distance: 165 }
+    case '623000':
+      return { distance: 145 }
+    case '630100':
+      return { distance: 185 }
+    case '632200':
+      return { distance: 130 }
+    case '632300':
+      return { distance: 180 }
+    case '632500':
+      return { distance: 135 }
+    case '632600':
+      return { distance: 135 }
+    case '632800':
+      return { distance: 150 }
+    case '640000':
+      return { distance: 195 }
+    case '640100':
+      return { distance: 175 }
+    case '640500':
+      return { distance: 135 }
+    case '650000':
+      return { distance: 135 }
+    case '650100':
+      return { distance: 155 }
+    case '652900':
+      return { distance: 135 }
+    case '653100':
+      return { distance: 138 }
+    case '710000':
+      return { distance: 135 }
+    case '810000':
+      return { distance: 145 }
+    case '820000':
+      return { distance: 240 }
+    default:
+      return { distance: 125}
+  }
+}

@@ -235,6 +235,7 @@ const handleAddRegion =async () => {
     datasetMap3DList.value.forEach((item: any) => {
       
       item.name = areaName
+      item.value = null
       item.cityOptions = cityOptions && cityOptions.length ? cityOptions : [{ adcode, label: areaName, value: areaName }]
     })
     return
@@ -280,6 +281,7 @@ const setDatasetArea = async () => {
     item.name = areaName
     item.city_name = null
     item.adcode = null,
+    item.value = null
     item.cityOptions = cityOptions && cityOptions.length ? cityOptions : [{ adcode, label: areaName, value: areaName }]
   })
 }