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

src/views/components/showmap.vue

@@ -79,21 +79,21 @@ export default {
         棋山镇: [118.895378, 35.877537],
         东莞镇: [118.972146, 35.991826],
         安庄镇: [118.815076, 35.812024],
-        果庄乡: [118.769212, 35.77904], //果庄乡
-        洛河镇: [118.833803, 35.753576], //洛河镇
-        库山乡: [118.979909, 35.92304], //库山乡
-        招贤镇: [118.929219, 35.723248], //招贤镇
-        桑园镇: [119.046012, 35.678553], //桑园镇
-        阎庄镇: [118.834585, 35.670621], //阎庄镇
+        果庄乡: [118.769212, 35.77904], 
+        洛河镇: [118.833803, 35.753576], 
+        库山乡: [118.979909, 35.92304],
+        招贤镇: [118.929219, 35.723248], 
+        桑园镇: [119.046012, 35.678553], 
+        阎庄街道: [118.834585, 35.670621], 
         莒县电子商务公共服务中心: [118.901658, 35.60688],
-        店子集镇: [118.914151, 35.5844],
-        城阳街道: [118.82472, 35.583488], //城阳街道
-        峤山镇: [118.946005, 35.657339], //峤山镇
+        店子集街道: [118.914151, 35.5844],
+        城阳街道: [118.82472, 35.583488],
+        峤山镇: [118.946005, 35.657339], 
         龙山镇: [119.003747, 35.515955],
-        陵阳镇: [118.890825, 35.545056],
+        陵阳街道: [118.890825, 35.545056],
         寨里河镇: [118.931584, 35.469982],
-        莒县经济开发区: [118.851312, 35.626514],
-        浮来山镇: [118.744789, 35.596051],
+        经济开发区: [118.851312, 35.626514],
+        浮来山街道: [118.744789, 35.596051],
         刘官庄镇: [118.801123, 35.522202],
         长岭镇: [118.844125, 35.484677],
         小店镇: [118.81007, 35.422484],
@@ -332,9 +332,8 @@ export default {
       // this.myCharts1 = this.$echarts.init(document.getElementById('gdMaps'));
       // this.$echarts.registerMap("china1", china1, {});
       this.$echarts.registerMap("莒县", prefecture, {});
-      window.addEventListener("resize", function () {
+      window.addEventListener("resize", () => {
         this.myChart1.resize();
-        // this.myCharts1.resize();
       });
       var yMax = 0;
       for (var j = 0; j < this.mapData.length; j++) {
@@ -374,7 +373,7 @@ export default {
             },
           },
           aspectScale:'1.5',
-          roam: true, // 是否允许缩放
+          roam: false, // 是否允许缩放
           itemStyle: {
             normal: {
               borderColor: "rgba(147, 235, 248, 1)",

src/views/dashboard/home.vue

@@ -810,7 +810,7 @@ export default {
           return ret;
         });
       })(Highcharts);
-      Highcharts.chart("pieChart", {
+      var option =  {
         chart: {
           type: "pie",
           animation: false,
@@ -890,7 +890,12 @@ export default {
             data: data,
           },
         ],
+      }
+      Highcharts.chart("pieChart", option);
+      window.addEventListener("resize", () => {
+        Highcharts.chart("pieChart", option).reflow()
       });
+      
     },
     // 按照日月更换数据
     changeData(val) {