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

src/views/BasicsData/modelMaintenance/index.vue

@@ -48,13 +48,26 @@
               </el-col>
               <el-col>
                 <el-form-item
-                  label="标识符"
+                  label="机型类型"
                   size="default"
                   prop="modelType"
                   :rules="formRules.isNotNull"
                 >
                   <el-input
                     v-model="tableForm.modelType"
+                    placeholder="请输入机型类型"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col>
+                <el-form-item
+                  label="标识符"
+                  size="default"
+                  prop="modelCode"
+                  :rules="formRules.isNotNull"
+                >
+                  <el-input
+                    v-model="tableForm.modelCode"
                     placeholder="请输入标识符"
                   />
                 </el-form-item>
@@ -116,6 +129,7 @@ const tableForm = reactive({
   modelName: "",
   modelType: "",
   modelDesc: "",
+  modelCode: "",
   event: "",
 }); //弹窗内容
 //列表
@@ -143,6 +157,7 @@ const resetForm = () => {
   tableForm.modelName = "";
   tableForm.modelType = "";
   tableForm.modelDesc = "";
+  tableForm.modelCode = "";
 };
 //编辑
 const editDialog = (data) => {
@@ -182,6 +197,7 @@ const btnClick = (row, index, param) => {
     tableForm.modelName = index.modelName;
     tableForm.modelType = index.modelType;
     tableForm.modelDesc = index.modelDesc;
+    tableForm.modelCode = index.modelCode;
   } else if (param === 3) {
     msgTitle.value = "删除机型维护";
     flag.value = true;
@@ -191,6 +207,7 @@ const btnClick = (row, index, param) => {
     tableForm.modelName = index.modelName;
     tableForm.modelType = index.modelType;
     tableForm.modelDesc = index.modelDesc;
+    tableForm.modelCode = index.modelCode;
   } else if (param === 4) {
     router.push({
       path: "/BasicsData/modelMaintenance/shippingSpace",

src/views/dashboard/index.vue

@@ -248,12 +248,12 @@ const optionLeft = {
   tooltip: {
     trigger: "axis",
   },
-  // legend: {
-  //   data: ['运输总数', '托运旅客数'],
-  //   show: true,
-  //   top: 0,
-  //   icon: 'roundRect'
-  // },
+  legend: {
+    show: true,
+    top: 0,
+    left:'30%',
+    icon: 'roundRect'
+  },
   grid: {
     left: "0%",
     right: "5%",
@@ -265,7 +265,7 @@ const optionLeft = {
   xAxis: {
     type: "category",
     boundaryGap: true,
-    data: ["2021.12", "2022.01", "2022.02", "2022.03", "2022.04", "2022.05"],
+    data: ["0:00", "2:00", "4:00", "6:00", "8:00", "10:00", "12:00", "14:00", "16:00", "18:00", "20:00", "22:00"],
     axisLine: {
       show: true,
       lineStyle: {
@@ -294,6 +294,7 @@ const optionLeft = {
           color: "rgba(196,194,225, 0.54)",
         },
       },
+      name:"单"
     },
     {
       type: "value",
@@ -306,16 +307,17 @@ const optionLeft = {
           color: "rgba(196,194,225, 0.54)",
         },
       },
+      name:"吨"
     },
   ],
   series: [
     {
-      name: "运单/件",
+      name: "运单/单",
       type: "line",
       symbol: "none",
       key: "bagsnum",
       yAxisIndex: 0,
-      data: [120, 132, 101, 134, 90, 230, 210],
+      data: [120, 132, 101, 134, 90, 230, 210,132, 101, 134, 90, 230],
       areaStyle: {
         color: {
           type: "linear",
@@ -343,7 +345,7 @@ const optionLeft = {
       symbol: "none",
       yAxisIndex: 1,
       key: "passengers",
-      data: [220, 182, 191, 234, 290, 330, 310],
+      data: [220, 182, 191, 234, 290, 330, 310, 132, 101, 134, 90, 230],
       areaStyle: {
         color: {
           type: "linear",
@@ -372,6 +374,12 @@ const airlineAbnormalBaggage = ref({
   component: "commonChartsBar",
   option: {
     baseOption: {
+      tooltip: {
+        trigger: "axis",
+        valueFormatter:function(value){
+          return value +"单"
+        }
+      },
       legend: {
         data: ["报警", "预警"],
         right: "20",
@@ -434,8 +442,11 @@ const airCompaneBaggage = ref({
   component: "commonChartsBar",
   option: {
     baseOption: {
+      tooltip: {
+        trigger: "axis",
+      },
       legend: {
-        data: ["2020年", "2021年"],
+        data: ["运单/单", "重量/吨"],
         right: "20",
         textStyle: {
           color: "#8897BC",
@@ -477,12 +488,13 @@ const airCompaneBaggage = ref({
       },
       series: [
         {
-          name: "2020年",
+          name: "运单/单",
           type: "bar",
           data: [12, 10, 15, 11, 16, 4, 6],
+
         },
         {
-          name: "2021年",
+          name: "重量/吨",
           type: "bar",
           data: [11, 15, 17, 8, 1, 4, 6],
         },
@@ -503,6 +515,12 @@ const airStutas = ref({
       //   }
       //   // top:"-10"
       // },
+      tooltip: {
+        trigger: "axis",
+        valueFormatter:function(value){
+          return value +"单"
+        }
+      },
       color: ["#51DEE9", "#4C88E1"],
       grid: {
         bottom: "10%",
@@ -550,6 +568,12 @@ const airStutas = ref({
 const nodeEfficiency = ref({
   component: "commonChartsLine",
   option: {
+    tooltip: {
+        trigger: "axis",
+        valueFormatter:function(value){
+          return value +"秒"
+        }
+      },
     legend: {
       top: "1%",
       right: "5%",
@@ -572,6 +596,19 @@ const nodeEfficiency = ref({
       "卸机", "机下交接", "货站交接", "提取"
       ],
     },
+    yAxis: {
+        type: "value",
+        axisLabel: {
+          color: "#8897BC",
+        },
+        splitLine: {
+          lineStyle: {
+            type: "dashed",
+            color: "rgba(196,194,225, 0.54)",
+          },
+        },
+        name:"单位：秒"
+      },
     series: [
       {
         name: "平均时间",
@@ -595,7 +632,7 @@ const nodeEfficiency = ref({
           opacity: 0,
         },
         data: [
-          4558, 770, 11745, 2699, 11205, 6497, 1544, 1555, 4181, 447, 60, 9804,
+        4558, 770, 11745, 2699, 11205, 6497, 1544, 1555, 4181, 447, 60, 9804,
         ],
       },
       {
@@ -607,8 +644,7 @@ const nodeEfficiency = ref({
           opacity: 0,
         },
         data: [
-          14240, 3190, 1699, 14446, 11349, 11182, 14829, 11740, 2418, 4824,
-          9707, 8126,
+         14240, 3190, 1699, 14446, 11349, 11182, 14829, 11740, 2418, 4824, 9707, 8126,
         ],
       },
     ],
@@ -624,6 +660,12 @@ const hours = Array.from({ length: 24 }, (v, i) => i + 1);
 const hourPeak = ref({
   component: "commonChartsScatter",
   option: {
+    tooltip: {
+        trigger: "axis",
+        valueFormatter:function(value){
+          return value +"单"
+        }
+      },
     title: node.map((month, index) => ({
       top: ((index + 0.5) * 100) / 4 - 3 + "%",
       text: month,

src/views/dashboard/indexHomeOut.vue

@@ -248,12 +248,12 @@ const optionLeft = {
   tooltip: {
     trigger: "axis",
   },
-  // legend: {
-  //   data: ['运输总数', '托运旅客数'],
-  //   show: true,
-  //   top: 0,
-  //   icon: 'roundRect'
-  // },
+  legend: {
+    show: true,
+    top: 0,
+    left:'30%',
+    icon: 'roundRect'
+  },
   grid: {
     left: "0%",
     right: "5%",
@@ -265,7 +265,7 @@ const optionLeft = {
   xAxis: {
     type: "category",
     boundaryGap: true,
-    data: ["2021.12", "2022.01", "2022.02", "2022.03", "2022.04", "2022.05"],
+    data: ["0:00", "2:00", "4:00", "6:00", "8:00", "10:00", "12:00", "14:00", "16:00", "18:00", "20:00", "22:00"],
     axisLine: {
       show: true,
       lineStyle: {
@@ -294,6 +294,7 @@ const optionLeft = {
           color: "rgba(196,194,225, 0.54)",
         },
       },
+      name:"单"
     },
     {
       type: "value",
@@ -306,15 +307,17 @@ const optionLeft = {
           color: "rgba(196,194,225, 0.54)",
         },
       },
+      name:"吨"
     },
   ],
   series: [
     {
-      name: "运输总数",
+      name: "运单/单",
       type: "line",
       symbol: "none",
       key: "bagsnum",
-      data: [120, 132, 101, 134, 90, 230, 210],
+      yAxisIndex: 0,
+      data: [120, 132, 101, 134, 90, 230, 210,132, 101, 134, 90, 230],
       areaStyle: {
         color: {
           type: "linear",
@@ -337,11 +340,12 @@ const optionLeft = {
       },
     },
     {
-      name: "托运旅客数",
+      name: "重量/吨",
       type: "line",
       symbol: "none",
+      yAxisIndex: 1,
       key: "passengers",
-      data: [220, 182, 191, 234, 290, 330, 310],
+      data: [220, 182, 191, 234, 290, 330, 310, 132, 101, 134, 90, 230],
       areaStyle: {
         color: {
           type: "linear",
@@ -370,6 +374,12 @@ const airlineAbnormalBaggage = ref({
   component: "commonChartsBar",
   option: {
     baseOption: {
+      tooltip: {
+        trigger: "axis",
+        valueFormatter:function(value){
+          return value +"单"
+        }
+      },
       legend: {
         data: ["报警", "预警"],
         right: "20",
@@ -432,8 +442,11 @@ const airCompaneBaggage = ref({
   component: "commonChartsBar",
   option: {
     baseOption: {
+      tooltip: {
+        trigger: "axis",
+      },
       legend: {
-        data: ["2020年", "2021年"],
+        data: ["运单/单", "重量/吨"],
         right: "20",
         textStyle: {
           color: "#8897BC",
@@ -475,12 +488,13 @@ const airCompaneBaggage = ref({
       },
       series: [
         {
-          name: "2020年",
+          name: "运单/单",
           type: "bar",
           data: [12, 10, 15, 11, 16, 4, 6],
+
         },
         {
-          name: "2021年",
+          name: "重量/吨",
           type: "bar",
           data: [11, 15, 17, 8, 1, 4, 6],
         },
@@ -501,6 +515,12 @@ const airStutas = ref({
       //   }
       //   // top:"-10"
       // },
+      tooltip: {
+        trigger: "axis",
+        valueFormatter:function(value){
+          return value +"单"
+        }
+      },
       color: ["#51DEE9", "#4C88E1"],
       grid: {
         bottom: "10%",
@@ -548,6 +568,12 @@ const airStutas = ref({
 const nodeEfficiency = ref({
   component: "commonChartsLine",
   option: {
+    tooltip: {
+        trigger: "axis",
+        valueFormatter:function(value){
+          return value +"秒"
+        }
+      },
     legend: {
       top: "1%",
       right: "5%",
@@ -576,6 +602,19 @@ const nodeEfficiency = ref({
         "装机",
       ],
     },
+    yAxis: {
+        type: "value",
+        axisLabel: {
+          color: "#8897BC",
+        },
+        splitLine: {
+          lineStyle: {
+            type: "dashed",
+            color: "rgba(196,194,225, 0.54)",
+          },
+        },
+        name:"单位：秒"
+      },
     series: [
       {
         name: "平均时间",
@@ -634,6 +673,12 @@ const hours = Array.from({ length: 24 }, (v, i) => i + 1);
 const hourPeak = ref({
   component: "commonChartsScatter",
   option: {
+    tooltip: {
+        trigger: "axis",
+        valueFormatter:function(value){
+          return value +"单"
+        }
+      },
     title: node.map((month, index) => ({
       top: ((index + 0.5) * 100) / 7 - 3 + "%",
       text: month,

src/views/dashboard/indexIn.vue

@@ -248,12 +248,12 @@ const optionLeft = {
   tooltip: {
     trigger: "axis",
   },
-  // legend: {
-  //   data: ['运输总数', '托运旅客数'],
-  //   show: true,
-  //   top: 0,
-  //   icon: 'roundRect'
-  // },
+  legend: {
+    show: true,
+    top: 0,
+    left:'30%',
+    icon: 'roundRect'
+  },
   grid: {
     left: "0%",
     right: "5%",
@@ -265,7 +265,7 @@ const optionLeft = {
   xAxis: {
     type: "category",
     boundaryGap: true,
-    data: ["2021.12", "2022.01", "2022.02", "2022.03", "2022.04", "2022.05"],
+    data: ["0:00", "2:00", "4:00", "6:00", "8:00", "10:00", "12:00", "14:00", "16:00", "18:00", "20:00", "22:00"],
     axisLine: {
       show: true,
       lineStyle: {
@@ -294,6 +294,7 @@ const optionLeft = {
           color: "rgba(196,194,225, 0.54)",
         },
       },
+      name:"单"
     },
     {
       type: "value",
@@ -306,15 +307,17 @@ const optionLeft = {
           color: "rgba(196,194,225, 0.54)",
         },
       },
+      name:"吨"
     },
   ],
   series: [
     {
-      name: "运输总数",
+      name: "运单/单",
       type: "line",
       symbol: "none",
       key: "bagsnum",
-      data: [120, 132, 101, 134, 90, 230, 210],
+      yAxisIndex: 0,
+      data: [120, 132, 101, 134, 90, 230, 210,132, 101, 134, 90, 230],
       areaStyle: {
         color: {
           type: "linear",
@@ -337,11 +340,12 @@ const optionLeft = {
       },
     },
     {
-      name: "托运旅客数",
+      name: "重量/吨",
       type: "line",
       symbol: "none",
+      yAxisIndex: 1,
       key: "passengers",
-      data: [220, 182, 191, 234, 290, 330, 310],
+      data: [220, 182, 191, 234, 290, 330, 310, 132, 101, 134, 90, 230],
       areaStyle: {
         color: {
           type: "linear",
@@ -370,6 +374,12 @@ const airlineAbnormalBaggage = ref({
   component: "commonChartsBar",
   option: {
     baseOption: {
+      tooltip: {
+        trigger: "axis",
+        valueFormatter:function(value){
+          return value +"单"
+        }
+      },
       legend: {
         data: ["报警", "预警"],
         right: "20",
@@ -432,8 +442,11 @@ const airCompaneBaggage = ref({
   component: "commonChartsBar",
   option: {
     baseOption: {
+      tooltip: {
+        trigger: "axis",
+      },
       legend: {
-        data: ["2020年", "2021年"],
+        data: ["运单/单", "重量/吨"],
         right: "20",
         textStyle: {
           color: "#8897BC",
@@ -475,12 +488,13 @@ const airCompaneBaggage = ref({
       },
       series: [
         {
-          name: "2020年",
+          name: "运单/单",
           type: "bar",
           data: [12, 10, 15, 11, 16, 4, 6],
+
         },
         {
-          name: "2021年",
+          name: "重量/吨",
           type: "bar",
           data: [11, 15, 17, 8, 1, 4, 6],
         },
@@ -501,6 +515,12 @@ const airStutas = ref({
       //   }
       //   // top:"-10"
       // },
+      tooltip: {
+        trigger: "axis",
+        valueFormatter:function(value){
+          return value +"单"
+        }
+      },
       color: ["#51DEE9", "#4C88E1"],
       grid: {
         bottom: "10%",
@@ -548,6 +568,12 @@ const airStutas = ref({
 const nodeEfficiency = ref({
   component: "commonChartsLine",
   option: {
+    tooltip: {
+        trigger: "axis",
+        valueFormatter:function(value){
+          return value +"秒"
+        }
+      },
     legend: {
       top: "1%",
       right: "5%",
@@ -570,6 +596,19 @@ const nodeEfficiency = ref({
       "卸机", "机下", "货站", "理货", "海关", "出库", "退运"
       ],
     },
+    yAxis: {
+        type: "value",
+        axisLabel: {
+          color: "#8897BC",
+        },
+        splitLine: {
+          lineStyle: {
+            type: "dashed",
+            color: "rgba(196,194,225, 0.54)",
+          },
+        },
+        name:"单位：秒"
+      },
     series: [
       {
         name: "平均时间",
@@ -622,6 +661,12 @@ const hours = Array.from({ length: 24 }, (v, i) => i + 1);
 const hourPeak = ref({
   component: "commonChartsScatter",
   option: {
+    tooltip: {
+        trigger: "axis",
+        valueFormatter:function(value){
+          return value +"单"
+        }
+      },
     title: node.map((month, index) => ({
       top: ((index + 0.5) * 100) / 7 - 3 + "%",
       text: month,

src/views/dashboard/indexOut.vue

@@ -248,12 +248,12 @@ const optionLeft = {
   tooltip: {
     trigger: "axis",
   },
-  // legend: {
-  //   data: ['运输总数', '托运旅客数'],
-  //   show: true,
-  //   top: 0,
-  //   icon: 'roundRect'
-  // },
+  legend: {
+    show: true,
+    top: 0,
+    left:'30%',
+    icon: 'roundRect'
+  },
   grid: {
     left: "0%",
     right: "5%",
@@ -265,7 +265,7 @@ const optionLeft = {
   xAxis: {
     type: "category",
     boundaryGap: true,
-    data: ["2021.12", "2022.01", "2022.02", "2022.03", "2022.04", "2022.05"],
+    data: ["0:00", "2:00", "4:00", "6:00", "8:00", "10:00", "12:00", "14:00", "16:00", "18:00", "20:00", "22:00"],
     axisLine: {
       show: true,
       lineStyle: {
@@ -294,6 +294,7 @@ const optionLeft = {
           color: "rgba(196,194,225, 0.54)",
         },
       },
+      name:"单"
     },
     {
       type: "value",
@@ -306,15 +307,17 @@ const optionLeft = {
           color: "rgba(196,194,225, 0.54)",
         },
       },
+      name:"吨"
     },
   ],
   series: [
     {
-      name: "运输总数",
+      name: "运单/单",
       type: "line",
       symbol: "none",
       key: "bagsnum",
-      data: [120, 132, 101, 134, 90, 230, 210],
+      yAxisIndex: 0,
+      data: [120, 132, 101, 134, 90, 230, 210,132, 101, 134, 90, 230],
       areaStyle: {
         color: {
           type: "linear",
@@ -337,11 +340,12 @@ const optionLeft = {
       },
     },
     {
-      name: "托运旅客数",
+      name: "重量/吨",
       type: "line",
       symbol: "none",
+      yAxisIndex: 1,
       key: "passengers",
-      data: [220, 182, 191, 234, 290, 330, 310],
+      data: [220, 182, 191, 234, 290, 330, 310, 132, 101, 134, 90, 230],
       areaStyle: {
         color: {
           type: "linear",
@@ -370,6 +374,12 @@ const airlineAbnormalBaggage = ref({
   component: "commonChartsBar",
   option: {
     baseOption: {
+      tooltip: {
+        trigger: "axis",
+        valueFormatter:function(value){
+          return value +"单"
+        }
+      },
       legend: {
         data: ["报警", "预警"],
         right: "20",
@@ -441,8 +451,11 @@ const airCompaneBaggage = ref({
   component: "commonChartsBar",
   option: {
     baseOption: {
+      tooltip: {
+        trigger: "axis",
+      },
       legend: {
-        data: ["2020年", "2021年"],
+        data: ["运单/单", "重量/吨"],
         right: "20",
         textStyle: {
           color: "#8897BC",
@@ -484,12 +497,13 @@ const airCompaneBaggage = ref({
       },
       series: [
         {
-          name: "2020年",
+          name: "运单/单",
           type: "bar",
           data: [12, 10, 15, 11, 16, 4, 6],
+
         },
         {
-          name: "2021年",
+          name: "重量/吨",
           type: "bar",
           data: [11, 15, 17, 8, 1, 4, 6],
         },
@@ -510,6 +524,12 @@ const airStutas = ref({
       //   }
       //   // top:"-10"
       // },
+      tooltip: {
+        trigger: "axis",
+        valueFormatter:function(value){
+          return value +"单"
+        }
+      },
       color: ["#51DEE9", "#4C88E1"],
       grid: {
         bottom: "10%",
@@ -557,6 +577,12 @@ const airStutas = ref({
 const nodeEfficiency = ref({
   component: "commonChartsLine",
   option: {
+    tooltip: {
+        trigger: "axis",
+        valueFormatter:function(value){
+          return value +"秒"
+        }
+      },
     legend: {
       top: "1%",
       right: "5%",
@@ -579,6 +605,19 @@ const nodeEfficiency = ref({
       "入园", "海关", "运抵", "安检", "核单", "理货", "拉下", "待运区", "货站交接", "机下交接", "装机"
       ],
     },
+    yAxis: {
+        type: "value",
+        axisLabel: {
+          color: "#8897BC",
+        },
+        splitLine: {
+          lineStyle: {
+            type: "dashed",
+            color: "rgba(196,194,225, 0.54)",
+          },
+        },
+        name:"单位：秒"
+      },
     series: [
       {
         name: "平均时间",
@@ -631,6 +670,12 @@ const hours = Array.from({ length: 24 }, (v, i) => i + 1);
 const hourPeak = ref({
   component: "commonChartsScatter",
   option: {
+    tooltip: {
+        trigger: "axis",
+        valueFormatter:function(value){
+          return value +"单"
+        }
+      },
     title: node.map((month, index) => ({
       top: ((index + 0.5) * 100) / 11 - 3 + "%",
       text: month,