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

src/views/components/showmap.vue

@@ -229,7 +229,7 @@ export default {
               period: 10, // 箭头指向速度，值越小速度越快
               trailLength: 0.1, // 特效尾迹长度[0,1]值越大，尾迹越长重
               symbol: "arrow", // 箭头图标
-              symbolSize: 6, // 图标大小
+              symbolSize: this.fontSize(6), // 图标大小
               trailColor: '#ffd419',
               color: '#ffd419', //流动点颜色
             },
@@ -302,12 +302,16 @@ export default {
             tooltip: {
               trigger: "item",
               formatter: "{b}<br/>{c} (件)",
+              textStyle:{
+                fontSize:this.fontSize(12)
+              }
             },
-            aspectScale:'1.5',
+            aspectScale:'1.2',
             label: {
               show: true,
               textStyle:{
-                color:'#fff'
+                color:'#fff',
+                fontSize:this.fontSize(12)
               }
             },
             // itemStyle: {
@@ -360,15 +364,16 @@ export default {
           max: yMax,
           text: ["高", "低"],
           orient: "horizontal",
-          itemWidth: 15,
+          itemWidth: this.fontSize(15),
           itemHeight: this.fontSize(150),
           right: 0,
-          bottom: 3,
+          bottom: '0.6%',
           inRange: {
             color: ["#1e73dd", "#04296f"],
           },
           textStyle: {
             color: "#fff",
+            fontSize:this.fontSize(12)
           },
         },
         geo: {
@@ -379,7 +384,7 @@ export default {
               show: false,
             },
           },
-          aspectScale:'1.5',
+          aspectScale:'1.2',
           roam: false, // 是否允许缩放
           itemStyle: {
             normal: {

src/views/dashboard/home.vue

@@ -469,9 +469,9 @@ export default {
       this.pieData = this.pieData.sort(function (a, b) {
         return b.y - a.y;
       });
-      this.pieData[0].h = 10;
+      this.pieData[0].h = 15;
-      this.pieData[1].h = 5;
+      this.pieData[1].h = 10;
-      this.pieData[2].h = 2;
+      this.pieData[2].h = 5;
       this.shouData.map((item, index) => {
         if (index <= 10) {
           this.slideList[0].arr.push({ no: index + 1, name: item.name, count: item.count });
@@ -847,7 +847,7 @@ export default {
             beta: 0,
           },
           backgroundColor: null,
-          marginTop: -45,
+          marginTop: -10,
         },
         colors: ["#00bdff", "#52f4c1", "#00dbec"],
         title: {
@@ -863,7 +863,7 @@ export default {
           pie: {
             allowPointSelect: true,
             cursor: "pointer",
-            depth: 15,
+            depth: this.fontSize(15),
             dataLabels: {
               enabled: true, //是否显示饼图的线形tip
               distance: "11%",
@@ -1728,7 +1728,7 @@ export default {
         background-size: 100% 100%;
         // background-position-y: 0.5rem;
         // background-position-x: -3px;
-        top: 2rem;
+        top: 2.2rem;
         left: 50%;
         transform: translate(-50%, -50%);
       }