Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/recruitment/card/LaborSystemTwo.vue

src/views/recruitment/card/LaborSystemTwo.vue

@@ -19,99 +19,21 @@ let map = ref();
 // 注册崇州地图
 echarts.registerMap("sichuan", sichuanJSON);
 const initialPoints = [
-  {
+  { name: "攀枝花", value: [101.718, 26.582, 0], count: 0 },
-    name: "绵阳",
+  { name: "雅安",   value: [103.009, 29.988, 0], count: 0 },
-    value: [104.684185, 31.473263, 0],
+  { name: "眉山",   value: [103.848, 30.082, 0], count: 0 },
-    count: 0
+  { name: "自贡",   value: [104.777, 29.350, 0], count: 0 },
-  },
+  { name: "泸州",   value: [105.442, 28.871, 0], count: 0 },
-  {
+  { name: "资阳",   value: [104.628, 30.122, 0], count: 0 },
-    name: "崇州",
+  { name: "遂宁",   value: [105.576, 30.523, 0], count: 0 },
-    value: [103.68055, 30.634619, 0],
+  { name: "广安",   value: [106.636, 30.463, 0], count: 0 },
-    count: 0
+  { name: "德阳",   value: [104.399, 31.130, 0], count: 0 },
-  },
+  { name: "绵阳",   value: [104.684185, 31.473263, 0], count: 0 },
-  {
+  { name: "广元",   value: [105.834, 32.435, 0], count: 0 },
-    name: "武侯",
+  { name: "巴中",   value: [106.753, 31.857, 0], count: 0 },
-    value: [104.04777, 30.648289, 0],
+  { name: "达州",   value: [107.467, 31.209, 0], count: 0 },
-    count: 0
+  { name: "南充",   value: [106.110, 30.837, 0], count: 0 }
-  },
-  {
-    name: "成华",
-    value: [104.108719, 30.665854, 0],
-    count: 0
-  },
-  {
-    name: "攀枝花",
-    value: [101.716007,26.580446, 0],
-    count: 0
-  },
-  {
-    name: "雅安",
-    value: [103.001033,29.987722, 0],
-    count: 0
-  },
-  {
-    name: "眉山",
-    value: [103.831788,30.048318, 0],
-    count: 0
-  },
-  {
-    name: "自贡",
-    value: [104.773447,29.352765, 0],
-    count: 0
-  },
-  {
-    name: "资阳",
-    value: [104.641917,30.122211, 0],
-    count: 0
-  },
-  {
-    name: "泸州",
-    value: [105.443348,28.889138, 0],
-    count: 0
-  },
-  {
-    name: "遂宁",
-    value: [105.571331,30.513311, 0],
-    count: 0
-  },
-  {
-    name: "广安",
-    value: [106.633369,30.456398, 0],
-    count: 0
-  },
-  {
-    name: "德阳",
-    value: [104.398651,31.127991, 0],
-    count: 0
-  },
-  {
-    name: "绵阳",
-    value: [104.741722,31.46402, 0],
-    count: 0
-  },
-  {
-    name: "广元",
-    value: [105.829757,32.433668, 0],
-    count: 0
-  },
-  {
-    name: "达州",
-    value: [107.502262,31.209484, 0],
-    count: 0
-  },
-  {
-    name: "南充",
-    value: [106.082974,30.795281, 0],
-    count: 0
-  },
-  {
-    name: "巴中",
-    value: [106.753669,31.858809, 0],
-    count: 0
-  }
 ];
-
-
 // 地图参数设置
 let option = {
   tooltip: {
@@ -136,21 +58,21 @@ let option = {
       fontWeight: "bold"
     },
     itemStyle: {
-      color: "rgba(5,75,189,0.85)",
+        color: "rgba(27, 129, 150, 0.4)",
-      borderColor: "#61CFF8",
+        borderColor: "#61cfff",
-      borderWidth: 2,
+        borderWidth: 2,
-      opacity: 0.95
+        opacity: 0.75
-    },
+      },
-    emphasis: {
+      emphasis: {
-      itemStyle: { color: "rgba(60,140,255,0.9)" },
+          itemStyle: { color: "rgba(27, 129, 150, 0.65)", opacity: 0.85 },
-      label: { color: "#ffff00" }
+          label: { color: "#ffff00" }
-    },
+        },
     light: {
-      main: { intensity: 1.6, shadow: true, shadowQuality: "high" },
+      main: { intensity: 1.6, shadow: true, shadowQuality: "high", alpha: 35, beta: 15 },
       ambient: { intensity: 0.35 }
     },
     shading: "lambert",
-    viewControl: { distance: 110, alpha: 45, beta: 15 },
+    viewControl: { distance: 110, alpha: 45, beta: 10 },
     groundPlane: { show: false },
     postEffect: { enable: true, bloom: { enable: true, bloomIntensity: 0.25 } }
   },