소스 검색

bugfix-地图切换省份问题

qianming 7 달 전
부모
커밋
cf140fa8b1

+ 3 - 38
report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetAirBubbleMap.vue

@@ -42,45 +42,10 @@ import "../../../../../../node_modules/echarts/map/js/province/xizang";
 import "../../../../../../node_modules/echarts/map/js/province/yunnan";
 import "../../../../../../node_modules/echarts/map/js/province/zhejiang";
 import * as echarts from "echarts";
-import "../../../../../../node_modules/echarts/map/js/china.js";
 //https://www.makeapie.com/editor.html?c=x2yaz6dfRw
 //https://www.makeapie.com/editor.html?c=xMpGBbTEKU
-let geoCoordMap = {
-  台湾省: [121.5135, 25.0308],
-  黑龙江省: [127.9688, 45.368],
-  内蒙古自治区: [110.3467, 41.4899],
-  吉林省: [125.8154, 44.2584],
-  北京市: [116.4551, 40.2539],
-  辽宁省: [123.1238, 42.1216],
-  河北省: [114.4995, 38.1006],
-  天津市: [117.4219, 39.4189],
-  山西省: [112.3352, 37.9413],
-  陕西省: [109.1162, 34.2004],
-  甘肃省: [103.5901, 36.3043],
-  宁夏回族自治区: [106.3586, 38.1775],
-  青海省: [101.4038, 36.8207],
-  新疆维吾尔自治区: [87.9236, 43.5883],
-  西藏自治区: [91.11, 29.97],
-  四川省: [103.9526, 30.7617],
-  重庆市: [108.384366, 30.439702],
-  山东省: [117.1582, 36.8701],
-  河南省: [113.4668, 34.6234],
-  江苏省: [118.8062, 31.9208],
-  安徽省: [117.29, 32.0581],
-  湖北省: [114.3896, 30.6628],
-  浙江省: [119.5313, 29.8773],
-  福建省: [119.4543, 25.9222],
-  江西省: [116.0046, 28.6633],
-  湖南省: [113.0823, 28.2568],
-  贵州省: [106.6992, 26.7682],
-  云南省: [102.9199, 25.4663],
-  广东省: [113.12244, 23.009505],
-  广西壮族自治区: [108.479, 23.1152],
-  海南省: [110.3893, 19.8516],
-  上海市: [121.4648, 31.2891],
-  香港: [114.173355, 22.320048],
-  澳门: [113.54909, 22.198951],
-};
+import {conversionProvince} from '@/utils/china';
+let geoCoordMap = conversionProvince;
 let data = [
   {
     name: "南海诸岛",
@@ -454,7 +419,7 @@ export default {
     setOptionsGeo() {
       const optionsSetup = this.optionsSetup;
       const geo = {
-        map: this.optionsSetup.mapName == '' ? "china" : this.optionsSetup.mapName,
+        map: this.optionsSetup.mapName === '' ? "china" : this.optionsSetup.mapName,
         show: true,
         roam: true,
         layoutSize: "80%",

+ 1 - 1
report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetBarMap.vue

@@ -315,7 +315,7 @@ export default {
     setOptionsGeo() {
       const optionsSetup = this.optionsSetup;
       const geo = {
-        map: this.optionsSetup.mapName == '' ? "china" : this.optionsSetup.mapName,
+        map: this.optionsSetup.mapName === '' ? "china" : this.optionsSetup.mapName,
         show: true,
         roam: true,
         layoutSize: "80%",

+ 1 - 2
report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetLineMap.vue

@@ -44,7 +44,6 @@ import "../../../../../../node_modules/echarts/map/js/province/zhejiang";
 import "echarts/map/js/china.js";
 import * as echarts from "echarts";
 import {conversionCity} from "@/utils/china";
-
 let geoCoordMap = conversionCity;
 let planePath =
   "path://M1705.06,1318.313v-89.254l-319.9-221.799l0.073-208.063c0.521-84.662-26.629-121.796-63.961-121.491c-37.332-0.305-64.482,36.829-63.961,121.491l0.073,208.063l-319.9,221.799v89.254l330.343-157.288l12.238,241.308l-134.449,92.931l0.531,42.034l175.125-42.917l175.125,42.917l0.531-42.034l-134.449-92.931l12.238-241.308L1705.06,1318.313z";
@@ -321,7 +320,7 @@ export default {
     setOptionsGeo() {
       const optionsSetup = this.optionsSetup;
       const geo = {
-        map: this.optionsSetup.mapName == '' ? "china" : this.optionsSetup.mapName,
+        map: this.optionsSetup.mapName === '' ? "china" : this.optionsSetup.mapName,
         show: true,
         roam: true,
         layoutSize: "80%",