Merge branch 'main' of http://42.192.7.176:3000/suojin/physical_distribution into main

src/views/components/showmap.vue

@@ -125,30 +125,34 @@ export default {
       chardata1: [
         { name: "夏庄镇", value: 120057.34 },
         { name: "库山乡", value: 15477.48 },
-        { name: "棋山镇", value: 131686.1 },
+        { name: "碁山镇", value: 131686.1 },
         { name: "安庄镇", value: 6992.6 },
-        { name: "果庄乡", value: 44045.49 },
+        { name: "果庄镇", value: 44045.49 },
         { name: "洛河镇", value: 40689.64 },
         { name: "招贤镇", value: 37659.78 },
         { name: "桑园镇", value: 45180.97 },
-        { name: "阎庄镇", value: 5204.26 },
-        { name: "城阳街道", value: 21900.9 },
-        { name: "莒县经济开发区", value: 4918.26 },
+        { name: "阎庄街道", value: 0 },
+        { name: "城阳街道", value: 0 },
+        { name: "经济开发区", value: 0 },
         { name: "峤山镇", value: 5881.84 },
-        { name: "浮来山镇", value: 4178.01 },
-        { name: "店子集镇", value: 2227.92 },
+        { name: "浮来山街道", value: 0 },
+        { name: "店子集街道", value: 0 },
         { name: "龙山镇", value: 2180.98 },
         { name: "刘官庄镇", value: 9172.94 },
-        { name: "陵阳镇", value: 3368 },
+        { name: "陵阳街道", value: 0 },
         { name: "长岭镇", value: 306.98 },
         { name: "寨里河镇", value: 810.66 },
         { name: "东莞镇", value: 542.2 },
         { name: "小店镇", value: 256.38 },
       ],
       myChart1: null,
+      newArr:[]
     };
   },
   mounted() {
+    this.newArr = this.chardata1 .filter((item) => {
+          return  !this.mapData .some(ele=>ele.name===item.name)
+      });
     this.createCharts1();
   },
   created() {
@@ -170,6 +174,7 @@ export default {
       return res*fontSize;
     },
     createCharts1() {
+      this.mapData = this.mapData.concat(this.newArr)
       var convertData = (data) => {
         var res = [];
         for (var i = 0; i < data.length; i++) {
@@ -421,7 +426,7 @@ export default {
         },
         series,
       };
-
+      console.log(series)
       this.myChart1.setOption(option);
       // this.myCharts1.setOption(option);
     },