Browse Source

需求--气泡地图调整

qianming 3 years ago
parent
commit
39538ef583

+ 32 - 32
report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-airbubble-map.js

@@ -296,38 +296,38 @@ export const widgetAirbubbleMap =   {
           relactiveDomValue: 'staticData',
           relactiveDomValue: 'staticData',
           value: [
           value: [
             {"name":"南海诸岛","value":1},
             {"name":"南海诸岛","value":1},
-            {"name":"北京","value":524},
-            {"name":"天津","value":14},
-            {"name":"上海","value":150},
-            {"name":"重庆","value":75},
-            {"name":"河北","value":13},
-            {"name":"河南","value":83},
-            {"name":"云南","value":11},
-            {"name":"辽宁","value":19},
-            {"name":"黑龙江","value":15},
-            {"name":"湖南","value":69},
-            {"name":"安徽","value":260},
-            {"name":"山东","value":39},
-            {"name":"新疆","value":4},
-            {"name":"江苏","value":31},
-            {"name":"浙江","value":104},
-            {"name":"江西","value":36},
-            {"name":"湖北","value":1052},
-            {"name":"广西","value":33},
-            {"name":"甘肃","value":347},
-            {"name":"山西","value":8},
-            {"name":"内蒙古","value":157},
-            {"name":"陕西","value":22},
-            {"name":"吉林","value":4},
-            {"name":"福建","value":36},
-            {"name":"贵州","value":39},
-            {"name":"广东","value":996},
-            {"name":"青海","value":27},
-            {"name":"西藏","value":31},
-            {"name":"四川","value":46},
-            {"name":"宁夏","value":16},
-            {"name":"海南","value":22},
-            {"name":"台湾","value":6},
+            {"name":"北京","value":524},
+            {"name":"天津","value":14},
+            {"name":"上海","value":150},
+            {"name":"重庆","value":75},
+            {"name":"河北","value":13},
+            {"name":"河南","value":83},
+            {"name":"云南","value":11},
+            {"name":"辽宁","value":19},
+            {"name":"黑龙江","value":15},
+            {"name":"湖南","value":69},
+            {"name":"安徽","value":260},
+            {"name":"山东","value":39},
+            {"name":"新疆维吾尔自治区","value":4},
+            {"name":"江苏","value":31},
+            {"name":"浙江","value":104},
+            {"name":"江西","value":36},
+            {"name":"湖北","value":1052},
+            {"name":"广西壮族自治区","value":33},
+            {"name":"甘肃","value":347},
+            {"name":"山西","value":8},
+            {"name":"内蒙古自治区","value":157},
+            {"name":"陕西","value":22},
+            {"name":"吉林","value":4},
+            {"name":"福建","value":36},
+            {"name":"贵州","value":39},
+            {"name":"广东","value":996},
+            {"name":"青海","value":27},
+            {"name":"西藏自治区","value":31},
+            {"name":"四川","value":46},
+            {"name":"宁夏回族自治区","value":16},
+            {"name":"海南","value":22},
+            {"name":"台湾","value":6},
             {"name":"香港","value":2},
             {"name":"香港","value":2},
             {"name":"澳门","value":9}],
             {"name":"澳门","value":9}],
         },
         },

+ 34 - 32
report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetAirBubbleMap.vue

@@ -9,38 +9,40 @@ import "../../../../../../node_modules/echarts/map/js/china.js";
 //https://www.makeapie.com/editor.html?c=x2yaz6dfRw
 //https://www.makeapie.com/editor.html?c=x2yaz6dfRw
 //https://www.makeapie.com/editor.html?c=xMpGBbTEKU
 //https://www.makeapie.com/editor.html?c=xMpGBbTEKU
 let geoCoordMap = {
 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]
+  台湾省: [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]
 };
 };
 let data = [
 let data = [
   {
   {