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

src/views/components/showmap.vue

@@ -162,6 +162,13 @@ export default {
     }
   },
   methods: {
+    //修改echarts图表字体大小
+    fontSize(res){
+      const clientWidth = window.innerWidth||document.documentElement.clientWidth||document.body.clientWidth;
+      if (!clientWidth) return;
+      let fontSize = clientWidth / 1920;
+      return res*fontSize;
+    },
     createCharts1() {
       var convertData = (data) => {
         var res = [];
@@ -354,7 +361,7 @@ export default {
           text: ["高", "低"],
           orient: "horizontal",
           itemWidth: 15,
-          itemHeight: 150,
+          itemHeight: this.fontSize(150),
           right: 0,
           bottom: 3,
           inRange: {

src/views/dashboard/home.vue

@@ -367,6 +367,13 @@ export default {
     backMap() {
       this.$refs.pathMap.backMap();
     },
+    //修改echarts图表字体大小
+    fontSize(res){
+      const clientWidth = window.innerWidth||document.documentElement.clientWidth||document.body.clientWidth;
+      if (!clientWidth) return;
+      let fontSize = clientWidth / 1920;
+      return res*fontSize;
+    },
     //触发定位地图
     doMap(item) {
       this.$refs.pathMap.queryDingwei(item.deviceId);
@@ -690,7 +697,7 @@ export default {
         title: {
           text: "仓库收件量趋势",
           textStyle: {
-            fontSize: 15,
+            fontSize: this.fontSize(15),
             color: "#fff",
           },
           top: 0,
@@ -699,9 +706,10 @@ export default {
           data: ["到件量", "派件量"],
           textStyle: {
             color: "#fff",
+            fontSize:this.fontSize(12)
           },
           top: 0,
-          right: 10,
+          right: "2%",
           itemHeight: 8,
         },
         tooltip: {
@@ -728,6 +736,7 @@ export default {
           },
           axisLabel: {
             color: "rgba(255, 255, 255, .7)",
+            fontSize:this.fontSize(12)
           },
         },
         yAxis: {
@@ -735,6 +744,7 @@ export default {
           axisLabel: {
             show: true,
             color: "#fff",
+            fontSize:this.fontSize(12)
           },
           splitLine: {
             lineStyle: {
@@ -837,7 +847,7 @@ export default {
             beta: 0,
           },
           backgroundColor: null,
-          marginTop: -10,
+          marginTop: -45,
         },
         colors: ["#00bdff", "#52f4c1", "#00dbec"],
         title: {
@@ -1288,6 +1298,7 @@ export default {
             font-family: "FZSK";
             font-size: 0.16rem;
             color: #ffffff;
+            font-style: italic;
           }
         }
 
@@ -1424,6 +1435,7 @@ export default {
             font-family: "FZSK";
             font-size: 0.16rem;
             color: #ffffff;
+            font-style: italic;
 
             img {
               width: 0.18rem;
@@ -1716,7 +1728,7 @@ export default {
         background-size: 100% 100%;
         // background-position-y: 0.5rem;
         // background-position-x: -3px;
-        top: 2.2rem;
+        top: 2rem;
         left: 50%;
         transform: translate(-50%, -50%);
       }