Commit 0fdf801b132fc303bfcf4c6890b1b28b6b647ce1
Merge branch 'fix/3D-map-select-city' into 'main_dev'
fix: 修改选择省份地图城市的时候地图显示不完整 See merge request yunteng/thingskit-view!190
Showing
2 changed files
with
509 additions
and
65 deletions
... | ... | @@ -72,71 +72,7 @@ export const regionMapParentArea = { |
72 | 72 | TOWN: areaEnum.COUNTY //镇的上一级 县或者区 |
73 | 73 | } |
74 | 74 | |
75 | -// 缩放配置文件 | |
76 | -export const setScale = (adcode: string | number) => { | |
77 | - switch (adcode) { | |
78 | - case 'china': | |
79 | - return { distance: 100, zoom: 1, alpha: 45 } | |
80 | - case '110000': | |
81 | - return { distance: 150, zoom: 0.8, alpha: 45 } | |
82 | - case '120000': | |
83 | - return { distance: 190, zoom: 0.8, alpha: 45 } | |
84 | - case '130000': | |
85 | - return { distance: 165, zoom: 0.8, alpha: 45 } | |
86 | - case '140000': | |
87 | - return { distance: 216, zoom: 0.8, alpha: 45 } | |
88 | - case '150000': | |
89 | - return { distance: 130, zoom: 0.8, alpha: 45 } | |
90 | - case '210000': | |
91 | - return { distance: 130, zoom: 0.8, alpha: 45 } | |
92 | - case '310000': | |
93 | - return { distance: 135, zoom: 0.8, alpha: 45 } | |
94 | - case '320000': | |
95 | - return { distance: 145, zoom: 0.8, alpha: 45 } | |
96 | - case '330000': | |
97 | - return { distance: 135, zoom: 0.8, alpha: 45 } | |
98 | - case '340000': | |
99 | - return { distance: 170, zoom: 0.8, alpha: 45 } | |
100 | - case '350000': | |
101 | - return { distance: 150, zoom: 0.8, alpha: 45 } | |
102 | - case '360000': | |
103 | - return { distance: 190, zoom: 0.8, alpha: 45 } | |
104 | - case '370000': | |
105 | - return { distance: 135, zoom: 0.8, alpha: 45 } | |
106 | - case '420000': | |
107 | - return { distance: 145, zoom: 0.8, alpha: 45 } | |
108 | - case '430000': | |
109 | - return { distance: 165, zoom: 0.8, alpha: 45 } | |
110 | - case '440000': | |
111 | - return { distance: 165, zoom: 0.8, alpha: 45 } | |
112 | - case '500000': | |
113 | - return { distance: 145, zoom: 0.8, alpha: 45 } | |
114 | - case '510000': | |
115 | - return { distance: 115, zoom: 0.8, alpha: 45 } | |
116 | - case '520000': | |
117 | - return { distance: 135, zoom: 0.8, alpha: 45 } | |
118 | - case '530000': | |
119 | - return { distance: 145, zoom: 0.8, alpha: 45 } | |
120 | - case '540000': | |
121 | - return { distance: 140, zoom: 0.8, alpha: 45 } | |
122 | - case '610000': | |
123 | - return { distance: 210, zoom: 0.8, alpha: 45 } | |
124 | - case '620000': | |
125 | - return { distance: 135, zoom: 0.8, alpha: 45 } | |
126 | - case '640000': | |
127 | - return { distance: 195, zoom: 0.8, alpha: 45 } | |
128 | - case '650000': | |
129 | - return { distance: 135, zoom: 0.8, alpha: 45 } | |
130 | - case '710000': | |
131 | - return { distance: 135, zoom: 0.8, alpha: 45 } | |
132 | - case '810000': | |
133 | - return { distance: 145, zoom: 0.8, alpha: 45 } | |
134 | - case '820000': | |
135 | - return { distance: 240, zoom: 0.8, alpha: 45 } | |
136 | - default: | |
137 | - return { distance: 125, zoom: 1, alpha: 45 } | |
138 | - } | |
139 | -} | |
75 | + | |
140 | 76 | |
141 | 77 | export const includes = [] |
142 | 78 | |
... | ... | @@ -263,3 +199,509 @@ export default class Config extends PublicConfigClass implements CreateComponent |
263 | 199 | public chartConfig = cloneDeep(AddThreeDimensionalMapConfig) |
264 | 200 | public option = echartOptionProfixHandle(option, includes) |
265 | 201 | } |
202 | + | |
203 | +// 缩放配置文件 | |
204 | +export const setScale = (adcode: string | number) => { | |
205 | + switch (adcode) { | |
206 | + case 'china': | |
207 | + return { distance: 100 } | |
208 | + case '110000': | |
209 | + return { distance: 150 } | |
210 | + case '120000': | |
211 | + return { distance: 190 } | |
212 | + case '130000': | |
213 | + return { distance: 165 } | |
214 | + case '130200': | |
215 | + return { distance: 135 } | |
216 | + case '130300': | |
217 | + return { distance: 135 } | |
218 | + case '130400': | |
219 | + return { distance: 130 } | |
220 | + case '130500': | |
221 | + return { distance: 130 } | |
222 | + case '130700': | |
223 | + return { distance: 160 } | |
224 | + case '131000': | |
225 | + return { distance: 200 } | |
226 | + case '131100': | |
227 | + return { distance: 135 } | |
228 | + case '140000': | |
229 | + return { distance: 216 } | |
230 | + case '140200': | |
231 | + return { distance: 140 } | |
232 | + case '140300': | |
233 | + return { distance: 150 } | |
234 | + case '140400': | |
235 | + return { distance: 150 } | |
236 | + case '140600': | |
237 | + return { distance: 135 } | |
238 | + case '140700': | |
239 | + return { distance: 135 } | |
240 | + case '140800': | |
241 | + return { distance: 145 } | |
242 | + case '141000': | |
243 | + return { distance: 140 } | |
244 | + case '141100': | |
245 | + return { distance: 165 } | |
246 | + case '150000': | |
247 | + return { distance: 130 } | |
248 | + case '150100': | |
249 | + return { distance: 150 } | |
250 | + case '150300': | |
251 | + return { distance: 240 } | |
252 | + case '150400': | |
253 | + return { distance: 130 } | |
254 | + case '150500': | |
255 | + return { distance: 130 } | |
256 | + case '150600': | |
257 | + return { distance: 130 } | |
258 | + case '210000': | |
259 | + return { distance: 130 } | |
260 | + case '210100': | |
261 | + return { distance: 165 } | |
262 | + case '210200': | |
263 | + return { distance: 135 } | |
264 | + case '210300': | |
265 | + return { distance: 155 } | |
266 | + case '210600': | |
267 | + return { distance: 145 } | |
268 | + case '210800': | |
269 | + return { distance: 150 } | |
270 | + case '211200': | |
271 | + return { distance: 150 } | |
272 | + case '211300': | |
273 | + return { distance: 150 } | |
274 | + case '220100': | |
275 | + return { distance: 130 } | |
276 | + case '220200': | |
277 | + return { distance: 145 } | |
278 | + case '220400': | |
279 | + return { distance: 145 } | |
280 | + case '220500': | |
281 | + return { distance: 225 } | |
282 | + case '220600': | |
283 | + return { distance: 155 } | |
284 | + case '230600': | |
285 | + return { distance: 195 } | |
286 | + case '230700': | |
287 | + return { distance: 155 } | |
288 | + case '231000': | |
289 | + return { distance: 160 } | |
290 | + case '310000': | |
291 | + return { distance: 135 } | |
292 | + case '320000': | |
293 | + return { distance: 145 } | |
294 | + case '320100': | |
295 | + return { distance: 240 } | |
296 | + case '320200': | |
297 | + return { distance: 155 } | |
298 | + case '320400': | |
299 | + return { distance: 145 } | |
300 | + case '320500': | |
301 | + return { distance: 145 } | |
302 | + case '320600': | |
303 | + return { distance: 145 } | |
304 | + case '320800': | |
305 | + return { distance: 160 } | |
306 | + case '320900': | |
307 | + return { distance: 180 } | |
308 | + case '321000': | |
309 | + return { distance: 200 } | |
310 | + case '321100': | |
311 | + return { distance: 135 } | |
312 | + case '321200': | |
313 | + return { distance: 200 } | |
314 | + case '321300': | |
315 | + return { distance: 160 } | |
316 | + case '330000': | |
317 | + return { distance: 135 } | |
318 | + case '330100': | |
319 | + return { distance: 135 } | |
320 | + case '330200': | |
321 | + return { distance: 135 } | |
322 | + case '330300': | |
323 | + return { distance: 140 } | |
324 | + case '330400': | |
325 | + return { distance: 140 } | |
326 | + case '330500': | |
327 | + return { distance: 135 } | |
328 | + case '330600': | |
329 | + return { distance: 145 } | |
330 | + case '330800': | |
331 | + return { distance: 150 } | |
332 | + case '331100': | |
333 | + return { distance: 135 } | |
334 | + case '340000': | |
335 | + return { distance: 170 } | |
336 | + case '340100': | |
337 | + return { distance: 175 } | |
338 | + case '340300': | |
339 | + return { distance: 130 } | |
340 | + case '340400': | |
341 | + return { distance: 190 } | |
342 | + case '340600': | |
343 | + return { distance: 220 } | |
344 | + case '340800': | |
345 | + return { distance: 160 } | |
346 | + case '341200': | |
347 | + return { distance: 135 } | |
348 | + case '341300': | |
349 | + return { distance: 130 } | |
350 | + case '341500': | |
351 | + return { distance: 145 } | |
352 | + case '341600': | |
353 | + return { distance: 160 } | |
354 | + case '341700': | |
355 | + return { distance: 155 } | |
356 | + case '350000': | |
357 | + return { distance: 150} | |
358 | + case '350200': | |
359 | + return { distance: 140} | |
360 | + case '350500': | |
361 | + return { distance: 135} | |
362 | + case '350600': | |
363 | + return { distance: 190} | |
364 | + case '350900': | |
365 | + return { distance: 140} | |
366 | + case '360000': | |
367 | + return { distance: 190} | |
368 | + case '360100': | |
369 | + return { distance: 145} | |
370 | + case '360200': | |
371 | + return { distance: 225} | |
372 | + case '360300': | |
373 | + return { distance: 215} | |
374 | + case '360500': | |
375 | + return { distance: 135} | |
376 | + case '360600': | |
377 | + return { distance: 175} | |
378 | + case '360700': | |
379 | + return { distance: 175} | |
380 | + case '360800': | |
381 | + return { distance: 145} | |
382 | + case '360900': | |
383 | + return { distance: 135} | |
384 | + case '361000': | |
385 | + return { distance: 170} | |
386 | + case '361100': | |
387 | + return { distance: 140} | |
388 | + case '370000': | |
389 | + return { distance: 135 } | |
390 | + case '370100': | |
391 | + return { distance: 165 } | |
392 | + case '370200': | |
393 | + return { distance: 165 } | |
394 | + case '370300': | |
395 | + return { distance: 210 } | |
396 | + case '370400': | |
397 | + return { distance: 150 } | |
398 | + case '370500': | |
399 | + return { distance: 150 } | |
400 | + case '370800': | |
401 | + return { distance: 135 } | |
402 | + case '371100': | |
403 | + return { distance: 140 } | |
404 | + case '371300': | |
405 | + return { distance: 150 } | |
406 | + case '371400': | |
407 | + return { distance: 130 } | |
408 | + case '371500': | |
409 | + return { distance: 150 } | |
410 | + case '371600': | |
411 | + return { distance: 200 } | |
412 | + case '371700': | |
413 | + return { distance: 180 } | |
414 | + case '410100': | |
415 | + return { distance: 135 } | |
416 | + case '410200': | |
417 | + return { distance: 140 } | |
418 | + case '410300': | |
419 | + return { distance: 140 } | |
420 | + case '410400': | |
421 | + return { distance: 155 } | |
422 | + case '410500': | |
423 | + return { distance: 145 } | |
424 | + case '410800': | |
425 | + return { distance: 140 } | |
426 | + case '410900': | |
427 | + return { distance: 145 } | |
428 | + case '411000': | |
429 | + return { distance: 140 } | |
430 | + case '411100': | |
431 | + return { distance: 155 } | |
432 | + case '411200': | |
433 | + return { distance: 140 } | |
434 | + case '411300': | |
435 | + return { distance: 140 } | |
436 | + case '411400': | |
437 | + return { distance: 135 } | |
438 | + case '411700': | |
439 | + return { distance: 130 } | |
440 | + case '420000': | |
441 | + return { distance: 145 } | |
442 | + case '420100': | |
443 | + return { distance: 160 } | |
444 | + case '420300': | |
445 | + return { distance: 130 } | |
446 | + case '420500': | |
447 | + return { distance: 155 } | |
448 | + case '420700': | |
449 | + return { distance: 170 } | |
450 | + case '420900': | |
451 | + return { distance: 180 } | |
452 | + case '421100': | |
453 | + return { distance: 180 } | |
454 | + case '421200': | |
455 | + return { distance: 150 } | |
456 | + case '421300': | |
457 | + return { distance: 165 } | |
458 | + case '422800': | |
459 | + return { distance: 150 } | |
460 | + case '430000': | |
461 | + return { distance: 155 } | |
462 | + case '430200': | |
463 | + return { distance: 250 } | |
464 | + case '430600': | |
465 | + return { distance: 155 } | |
466 | + case '430700': | |
467 | + return { distance: 155 } | |
468 | + case '430900': | |
469 | + return { distance: 145 } | |
470 | + case '431000': | |
471 | + return { distance: 150 } | |
472 | + case '431100': | |
473 | + return { distance: 235 } | |
474 | + case '431200': | |
475 | + return { distance: 195 } | |
476 | + case '431300': | |
477 | + return { distance: 135 } | |
478 | + case '433100': | |
479 | + return { distance: 220 } | |
480 | + case '440000': | |
481 | + return { distance: 165 } | |
482 | + case '440100': | |
483 | + return { distance: 185 } | |
484 | + case '440300': | |
485 | + return { distance: 135 } | |
486 | + case '440400': | |
487 | + return { distance: 135 } | |
488 | + case '440500': | |
489 | + return { distance: 140 } | |
490 | + case '440600': | |
491 | + return { distance: 180 } | |
492 | + case '440700': | |
493 | + return { distance: 150 } | |
494 | + case '440800': | |
495 | + return { distance: 190 } | |
496 | + case '440900': | |
497 | + return { distance: 160 } | |
498 | + case '441200': | |
499 | + return { distance: 165 } | |
500 | + case '441400': | |
501 | + return { distance: 160 } | |
502 | + case '441600': | |
503 | + return { distance: 185 } | |
504 | + case '441700': | |
505 | + return { distance: 180 } | |
506 | + case '445100': | |
507 | + return { distance: 170 } | |
508 | + case '445200': | |
509 | + return { distance: 160 } | |
510 | + case '445300': | |
511 | + return { distance: 130 } | |
512 | + case '450100': | |
513 | + return { distance: 135 } | |
514 | + case '450200': | |
515 | + return { distance: 195 } | |
516 | + case '450300': | |
517 | + return { distance: 175 } | |
518 | + case '450400': | |
519 | + return { distance: 195 } | |
520 | + case '450600': | |
521 | + return { distance: 155 } | |
522 | + case '450800': | |
523 | + return { distance: 165 } | |
524 | + case '450900': | |
525 | + return { distance: 165 } | |
526 | + case '451000': | |
527 | + return { distance: 135 } | |
528 | + case '451100': | |
529 | + return { distance: 145 } | |
530 | + case '451400': | |
531 | + return { distance: 165 } | |
532 | + case '460100': | |
533 | + return { distance: 155 } | |
534 | + case '500000': | |
535 | + return { distance: 140 } | |
536 | + case '510000': | |
537 | + return { distance: 115 } | |
538 | + case '510100': | |
539 | + return { distance: 135 } | |
540 | + case '510300': | |
541 | + return { distance: 145 } | |
542 | + case '510400': | |
543 | + return { distance: 165 } | |
544 | + case '510500': | |
545 | + return { distance: 195 } | |
546 | + case '510600': | |
547 | + return { distance: 155 } | |
548 | + case '510700': | |
549 | + return { distance: 170 } | |
550 | + case '510800': | |
551 | + return { distance: 115 } | |
552 | + case '510900': | |
553 | + return { distance: 160 } | |
554 | + case '511000': | |
555 | + return { distance: 145 } | |
556 | + case '511100': | |
557 | + return { distance: 165 } | |
558 | + case '511300': | |
559 | + return { distance: 135 } | |
560 | + case '511400': | |
561 | + return { distance: 140 } | |
562 | + case '511500': | |
563 | + return { distance: 140 } | |
564 | + case '511700': | |
565 | + return { distance: 155 } | |
566 | + case '511800': | |
567 | + return { distance: 215 } | |
568 | + case '511900': | |
569 | + return { distance: 160 } | |
570 | + case '512000': | |
571 | + return { distance: 135 } | |
572 | + case '513200': | |
573 | + return { distance: 105 } | |
574 | + case '513300': | |
575 | + return { distance: 175 } | |
576 | + case '520000': | |
577 | + return { distance: 135 } | |
578 | + case '520100': | |
579 | + return { distance: 145 } | |
580 | + case '520200': | |
581 | + return { distance: 165 } | |
582 | + case '520300': | |
583 | + return { distance: 148 } | |
584 | + case '520400': | |
585 | + return { distance: 145 } | |
586 | + case '522300': | |
587 | + return { distance: 145 } | |
588 | + case '522600': | |
589 | + return { distance: 139 } | |
590 | + case '522700': | |
591 | + return { distance: 175 } | |
592 | + case '530000': | |
593 | + return { distance: 145 } | |
594 | + case '530100': | |
595 | + return { distance: 205 } | |
596 | + case '530300': | |
597 | + return { distance: 228 } | |
598 | + case '530500': | |
599 | + return { distance: 135 } | |
600 | + case '530600': | |
601 | + return { distance: 155 } | |
602 | + case '530700': | |
603 | + return { distance: 150 } | |
604 | + case '530800': | |
605 | + return { distance: 165 } | |
606 | + case '530900': | |
607 | + return { distance: 165 } | |
608 | + case '532300': | |
609 | + return { distance:205 } | |
610 | + case '532500': | |
611 | + return { distance: 165 } | |
612 | + case '532800': | |
613 | + return { distance: 160 } | |
614 | + case '532900': | |
615 | + return { distance: 140 } | |
616 | + case '533100': | |
617 | + return { distance: 175 } | |
618 | + case '533300': | |
619 | + return { distance: 275 } | |
620 | + case '533400': | |
621 | + return { distance: 200 } | |
622 | + case '540000': | |
623 | + return { distance: 140 } | |
624 | + case '540100': | |
625 | + return { distance: 145 } | |
626 | + case '542500': | |
627 | + return { distance: 155 } | |
628 | + case '610000': | |
629 | + return { distance: 210 } | |
630 | + case '610100': | |
631 | + return { distance: 145 } | |
632 | + case '610200': | |
633 | + return { distance: 140 } | |
634 | + case '610300': | |
635 | + return { distance: 145 } | |
636 | + case '610400': | |
637 | + return { distance: 135 } | |
638 | + case '610500': | |
639 | + return { distance: 155 } | |
640 | + case '610600': | |
641 | + return { distance: 135 } | |
642 | + case '610700': | |
643 | + return { distance: 140 } | |
644 | + case '610800': | |
645 | + return { distance: 155 } | |
646 | + case '610900': | |
647 | + return { distance: 160} | |
648 | + case '611000': | |
649 | + return { distance: 150} | |
650 | + case '620000': | |
651 | + return { distance: 135 } | |
652 | + case '620300': | |
653 | + return { distance: 140 } | |
654 | + case '620400': | |
655 | + return { distance: 165 } | |
656 | + case '620500': | |
657 | + return { distance: 135 } | |
658 | + case '620600': | |
659 | + return { distance: 175 } | |
660 | + case '620700': | |
661 | + return { distance: 135 } | |
662 | + case '620900': | |
663 | + return { distance: 135 } | |
664 | + case '621000': | |
665 | + return { distance: 155 } | |
666 | + case '621100': | |
667 | + return { distance: 145 } | |
668 | + case '622900': | |
669 | + return { distance: 165 } | |
670 | + case '623000': | |
671 | + return { distance: 145 } | |
672 | + case '630100': | |
673 | + return { distance: 185 } | |
674 | + case '632200': | |
675 | + return { distance: 130 } | |
676 | + case '632300': | |
677 | + return { distance: 180 } | |
678 | + case '632500': | |
679 | + return { distance: 135 } | |
680 | + case '632600': | |
681 | + return { distance: 135 } | |
682 | + case '632800': | |
683 | + return { distance: 150 } | |
684 | + case '640000': | |
685 | + return { distance: 195 } | |
686 | + case '640100': | |
687 | + return { distance: 175 } | |
688 | + case '640500': | |
689 | + return { distance: 135 } | |
690 | + case '650000': | |
691 | + return { distance: 135 } | |
692 | + case '650100': | |
693 | + return { distance: 155 } | |
694 | + case '652900': | |
695 | + return { distance: 135 } | |
696 | + case '653100': | |
697 | + return { distance: 138 } | |
698 | + case '710000': | |
699 | + return { distance: 135 } | |
700 | + case '810000': | |
701 | + return { distance: 145 } | |
702 | + case '820000': | |
703 | + return { distance: 240 } | |
704 | + default: | |
705 | + return { distance: 125} | |
706 | + } | |
707 | +} | ... | ... |
... | ... | @@ -235,6 +235,7 @@ const handleAddRegion =async () => { |
235 | 235 | datasetMap3DList.value.forEach((item: any) => { |
236 | 236 | |
237 | 237 | item.name = areaName |
238 | + item.value = null | |
238 | 239 | item.cityOptions = cityOptions && cityOptions.length ? cityOptions : [{ adcode, label: areaName, value: areaName }] |
239 | 240 | }) |
240 | 241 | return |
... | ... | @@ -280,6 +281,7 @@ const setDatasetArea = async () => { |
280 | 281 | item.name = areaName |
281 | 282 | item.city_name = null |
282 | 283 | item.adcode = null, |
284 | + item.value = null | |
283 | 285 | item.cityOptions = cityOptions && cityOptions.length ? cityOptions : [{ adcode, label: areaName, value: areaName }] |
284 | 286 | }) |
285 | 287 | } | ... | ... |