Merge branch 'master' of http://120.26.64.82:3000/BFFE/SZYGM1.0

src/views/dashboard/index.vue

@@ -382,7 +382,7 @@ const airlineAbnormalBaggage = ref({
       },
       legend: {
         data: ["报警", "预警"],
-        right: "20",
+        right: "20%",
         textStyle: {
           color: "#8897BC",
         },
@@ -421,6 +421,7 @@ const airlineAbnormalBaggage = ref({
             color: "rgba(196,194,225, 0.54)",
           },
         },
+        name:'单'
       },
       series: [
         {
@@ -447,7 +448,7 @@ const airCompaneBaggage = ref({
       },
       legend: {
         data: ["运单/单", "重量/吨"],
-        right: "20",
+        right: "20%",
         textStyle: {
           color: "#8897BC",
         },
@@ -455,8 +456,8 @@ const airCompaneBaggage = ref({
       color: ["#51DEE9", "#4C88E1"],
       grid: {
         bottom: "10%",
-        left: "5%",
-        right: "1%",
+        left: "13%",
+        right: "8%",
         top: "15%",
       },
       xAxis: {
@@ -474,29 +475,49 @@ const airCompaneBaggage = ref({
           color: "#8897BC",
         },
       },
-      yAxis: {
-        type: "value",
-        axisLabel: {
-          color: "#8897BC",
+      yAxis: [
+      {
+      type: "value",
+      axisLabel: {
+        color: "#8897BC",
+        formatter: function (item) {
+          return item / 10000 + "万";
         },
-        splitLine: {
-          lineStyle: {
-            type: "dashed",
-            color: "rgba(196,194,225, 0.54)",
-          },
+      },
+      splitLine: {
+        lineStyle: {
+          type: "dashed",
+          color: "rgba(196,194,225, 0.54)",
         },
       },
+      name:"单"
+    },
+    {
+      type: "value",
+      axisLabel: {
+        color: "#8897BC",
+      },
+      splitLine: {
+        lineStyle: {
+          type: "dashed",
+          color: "rgba(196,194,225, 0.54)",
+        },
+      },
+      name:"吨"
+    },
+      ],
       series: [
         {
           name: "运单/单",
           type: "bar",
           data: [12, 10, 15, 11, 16, 4, 6],
-
+          yAxisIndex: 0,
         },
         {
           name: "重量/吨",
           type: "bar",
           data: [11, 15, 17, 8, 1, 4, 6],
+          yAxisIndex: 1,
         },
       ],
     },
@@ -554,6 +575,7 @@ const airStutas = ref({
             color: "rgba(196,194,225, 0.54)",
           },
         },
+        name:'单'
       },
       series: [
         {
@@ -652,7 +674,7 @@ const nodeEfficiency = ref({
 });
 
 const node = [
-"卸机", "机下交接", "货站交接", "提取"
+  "卸机", "机下交接", "货站交接", "提取"
 ];
 
 const hours = Array.from({ length: 24 }, (v, i) => i + 1);

src/views/dashboard/indexHomeOut.vue

@@ -421,6 +421,7 @@ const airlineAbnormalBaggage = ref({
             color: "rgba(196,194,225, 0.54)",
           },
         },
+        name:'单'
       },
       series: [
         {
@@ -447,7 +448,7 @@ const airCompaneBaggage = ref({
       },
       legend: {
         data: ["运单/单", "重量/吨"],
-        right: "20",
+        right: "20%",
         textStyle: {
           color: "#8897BC",
         },
@@ -455,8 +456,8 @@ const airCompaneBaggage = ref({
       color: ["#51DEE9", "#4C88E1"],
       grid: {
         bottom: "10%",
-        left: "5%",
-        right: "1%",
+        left: "13%",
+        right: "8%",
         top: "15%",
       },
       xAxis: {
@@ -474,29 +475,49 @@ const airCompaneBaggage = ref({
           color: "#8897BC",
         },
       },
-      yAxis: {
-        type: "value",
-        axisLabel: {
-          color: "#8897BC",
+      yAxis: [
+      {
+      type: "value",
+      axisLabel: {
+        color: "#8897BC",
+        formatter: function (item) {
+          return item / 10000 + "万";
         },
-        splitLine: {
-          lineStyle: {
-            type: "dashed",
-            color: "rgba(196,194,225, 0.54)",
-          },
+      },
+      splitLine: {
+        lineStyle: {
+          type: "dashed",
+          color: "rgba(196,194,225, 0.54)",
+        },
+      },
+      name:"单"
+    },
+    {
+      type: "value",
+      axisLabel: {
+        color: "#8897BC",
+      },
+      splitLine: {
+        lineStyle: {
+          type: "dashed",
+          color: "rgba(196,194,225, 0.54)",
         },
       },
+      name:"吨"
+    },
+      ],
       series: [
         {
           name: "运单/单",
           type: "bar",
           data: [12, 10, 15, 11, 16, 4, 6],
-
+          yAxisIndex: 0,
         },
         {
           name: "重量/吨",
           type: "bar",
           data: [11, 15, 17, 8, 1, 4, 6],
+          yAxisIndex: 1,
         },
       ],
     },
@@ -554,6 +575,7 @@ const airStutas = ref({
             color: "rgba(196,194,225, 0.54)",
           },
         },
+        name:'单'
       },
       series: [
         {

src/views/dashboard/indexIn.vue

@@ -421,6 +421,7 @@ const airlineAbnormalBaggage = ref({
             color: "rgba(196,194,225, 0.54)",
           },
         },
+        name:'单'
       },
       series: [
         {
@@ -447,7 +448,7 @@ const airCompaneBaggage = ref({
       },
       legend: {
         data: ["运单/单", "重量/吨"],
-        right: "20",
+        right: "20%",
         textStyle: {
           color: "#8897BC",
         },
@@ -455,8 +456,8 @@ const airCompaneBaggage = ref({
       color: ["#51DEE9", "#4C88E1"],
       grid: {
         bottom: "10%",
-        left: "5%",
-        right: "1%",
+        left: "13%",
+        right: "8%",
         top: "15%",
       },
       xAxis: {
@@ -474,29 +475,49 @@ const airCompaneBaggage = ref({
           color: "#8897BC",
         },
       },
-      yAxis: {
-        type: "value",
-        axisLabel: {
-          color: "#8897BC",
+      yAxis: [
+      {
+      type: "value",
+      axisLabel: {
+        color: "#8897BC",
+        formatter: function (item) {
+          return item / 10000 + "万";
         },
-        splitLine: {
-          lineStyle: {
-            type: "dashed",
-            color: "rgba(196,194,225, 0.54)",
-          },
+      },
+      splitLine: {
+        lineStyle: {
+          type: "dashed",
+          color: "rgba(196,194,225, 0.54)",
+        },
+      },
+      name:"单"
+    },
+    {
+      type: "value",
+      axisLabel: {
+        color: "#8897BC",
+      },
+      splitLine: {
+        lineStyle: {
+          type: "dashed",
+          color: "rgba(196,194,225, 0.54)",
         },
       },
+      name:"吨"
+    },
+      ],
       series: [
         {
           name: "运单/单",
           type: "bar",
           data: [12, 10, 15, 11, 16, 4, 6],
-
+          yAxisIndex: 0,
         },
         {
           name: "重量/吨",
           type: "bar",
           data: [11, 15, 17, 8, 1, 4, 6],
+          yAxisIndex: 1,
         },
       ],
     },
@@ -554,6 +575,7 @@ const airStutas = ref({
             color: "rgba(196,194,225, 0.54)",
           },
         },
+        name:'单'
       },
       series: [
         {

src/views/dashboard/indexOut.vue

@@ -430,6 +430,7 @@ const airlineAbnormalBaggage = ref({
             color: "rgba(196,194,225, 0.54)",
           },
         },
+        name:'单'
       },
       series: [
         {
@@ -456,7 +457,7 @@ const airCompaneBaggage = ref({
       },
       legend: {
         data: ["运单/单", "重量/吨"],
-        right: "20",
+        right: "20%",
         textStyle: {
           color: "#8897BC",
         },
@@ -464,8 +465,8 @@ const airCompaneBaggage = ref({
       color: ["#51DEE9", "#4C88E1"],
       grid: {
         bottom: "10%",
-        left: "5%",
-        right: "1%",
+        left: "13%",
+        right: "8%",
         top: "15%",
       },
       xAxis: {
@@ -483,29 +484,49 @@ const airCompaneBaggage = ref({
           color: "#8897BC",
         },
       },
-      yAxis: {
-        type: "value",
-        axisLabel: {
-          color: "#8897BC",
+      yAxis: [
+      {
+      type: "value",
+      axisLabel: {
+        color: "#8897BC",
+        formatter: function (item) {
+          return item / 10000 + "万";
         },
-        splitLine: {
-          lineStyle: {
-            type: "dashed",
-            color: "rgba(196,194,225, 0.54)",
-          },
+      },
+      splitLine: {
+        lineStyle: {
+          type: "dashed",
+          color: "rgba(196,194,225, 0.54)",
+        },
+      },
+      name:"单"
+    },
+    {
+      type: "value",
+      axisLabel: {
+        color: "#8897BC",
+      },
+      splitLine: {
+        lineStyle: {
+          type: "dashed",
+          color: "rgba(196,194,225, 0.54)",
         },
       },
+      name:"吨"
+    },
+      ],
       series: [
         {
           name: "运单/单",
           type: "bar",
           data: [12, 10, 15, 11, 16, 4, 6],
-
+          yAxisIndex: 0,
         },
         {
           name: "重量/吨",
           type: "bar",
           data: [11, 15, 17, 8, 1, 4, 6],
+          yAxisIndex: 1,
         },
       ],
     },
@@ -563,6 +584,7 @@ const airStutas = ref({
             color: "rgba(196,194,225, 0.54)",
           },
         },
+        name:'单'
       },
       series: [
         {