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

src/views/dashboard/hooks/usePublic.ts

@@ -21,6 +21,7 @@ export function usePublic() {
       top: 0,
       right: '20%',
       icon: 'roundRect',
+      data: ['重量/吨', '运单/单'],
       textStyle: {
         color: '#698dc3',
       },
@@ -32,7 +33,7 @@ export function usePublic() {
       top: '17%',
       containLabel: true,
     },
-    color: ['#51DEE9', '#4C88E1'],
+    color: ['#4C88E1', '#51DEE9'],
     xAxis: {
       type: 'category',
       boundaryGap: true,
@@ -69,9 +70,6 @@ export function usePublic() {
         type: 'value',
         axisLabel: {
           color: '#8897BC',
-          formatter: function (item) {
-            return item / 10000 + '万'
-          },
         },
         splitLine: {
           lineStyle: {
@@ -79,7 +77,7 @@ export function usePublic() {
             color: 'rgba(196,194,225, 0.54)',
           },
         },
-        name: '单',
+        name: '吨',
       },
       {
         type: 'value',
@@ -92,12 +90,12 @@ export function usePublic() {
             color: 'rgba(196,194,225, 0.54)',
           },
         },
-        name: '吨',
+        name: '单',
       },
     ],
     series: [
       {
-        name: '运单/单',
+        name: '重量/吨',
         type: 'line',
         symbol: 'none',
         key: 'bagsnum',
@@ -120,12 +118,13 @@ export function usePublic() {
                 color: 'rgba(0,180,255,0.01)',
               },
             ],
+
             global: false,
           },
         },
       },
       {
-        name: '重量/吨',
+        name: '运单/单',
         type: 'line',
         symbol: 'none',
         yAxisIndex: 1,
@@ -165,14 +164,14 @@ export function usePublic() {
           },
         },
         legend: {
-          data: ['航班数', '运单数'],
+          data: ['运单数', '航班数'],
           right: '20%',
           textStyle: {
             color: '#8897BC',
           },
           // top:"-10"
         },
-        color: ['#51DEE9', '#4C88E1'],
+        color: ['#4C88E1', '#51DEE9'],
         grid: {
           bottom: '10%',
           left: '13%',
@@ -209,13 +208,13 @@ export function usePublic() {
         },
         series: [
           {
-            name: '航班数',
+            name: '运单数',
             type: 'bar',
             data: [0, 0, 0, 0],
             barWidth: 10,
           },
           {
-            name: '运单数',
+            name: '航班数',
             type: 'bar',
             data: [0, 0, 0, 0],
             barWidth: 10,
@@ -232,7 +231,7 @@ export function usePublic() {
           trigger: 'axis',
         },
         legend: {
-          data: ['运单/单', '重量/吨'],
+          data: ['重量/吨', '运单/单'],
           right: '20%',
           textStyle: {
             color: '#8897BC',

src/views/dashboard/index.vue

@@ -63,17 +63,17 @@
         <div class="dashboard-content-top-center">
           <div v-loading="loading4" element-loading-text="数据加载中..." element-loading-svg-view-box="-10, -10, 50, 50" element-loading-background="rgba(0,0,0, 0.3)" class="dashboard-content-top-center-top">
             <div class="dashboard-content-top-center-top-list">
-              <div class="dashboard-content-top-center-top-list-txt">重量</div>
-              <div class="dashboard-content-top-center-top-list-num">{{ weightNums }}</div>
-            </div>
-            <div class="dashboard-content-top-center-top-list">
-              <div class="dashboard-content-top-center-top-list-txt">航班数</div>
+              <div class="dashboard-content-top-center-top-list-txt">今日计划航班数</div>
               <div class="dashboard-content-top-center-top-list-num">{{ flightNums }}</div>
             </div>
             <div class="dashboard-content-top-center-top-list">
-              <div class="dashboard-content-top-center-top-list-txt">运单数</div>
+              <div class="dashboard-content-top-center-top-list-txt">已完成航班数</div>
               <div class="dashboard-content-top-center-top-list-num">{{ stockNums }}</div>
             </div>
+            <div class="dashboard-content-top-center-top-list">
+              <div class="dashboard-content-top-center-top-list-txt">已装载总量KG</div>
+              <div class="dashboard-content-top-center-top-list-num">{{ weightNums }}</div>
+            </div>
           </div>
           <div v-loading="loading5" element-loading-text="数据加载中..." element-loading-svg-view-box="-10, -10, 50, 50" element-loading-background="rgba(0,0,0, 0.3)" class="dashboard-content-top-center-bottom">
             <div class="dashboard-content-top-center-bottom-title">航班动态跟踪</div>
@@ -286,7 +286,7 @@ const hourlyPeakFunc = async () => {
     { flightDate1: dateNow.value.time, flightDate2: form.value.endDate },
   ])) as any;
   if (listValues && isValue(listValues)) {
-    hourlyPeakObj.value = pubFunc(listValues, optionLeft);
+    hourlyPeakObj.value = pubFunc(listValues, optionLeft, true);
   }
   loading1.value = false;
 };
@@ -301,7 +301,7 @@ const waybillTrendFunc = async () => {
     listValues.forEach((item) => {
       item.jobTime = parseDate(item["jobTime"]);
     });
-    waybillTrendObj.value = pubFunc(listValues, optionLeft);
+    waybillTrendObj.value = pubFunc(listValues, optionLeft, true);
   }
   loading2.value = false;
 };
@@ -332,9 +332,9 @@ const numbersFunc = async () => {
     },
   ])) as any;
   if (listValues && isValue(listValues)) {
-    const { flightNum, stockNum, weight } = listValues[0];
+    const { flightNum, finishFlightNum, weight } = listValues[0];
     flightNums.value = flightNum ?? 0;
-    stockNums.value = stockNum ?? 0;
+    stockNums.value = finishFlightNum ?? 0;
     weightNums.value = weight ?? 0;
   }
   loading4.value = false;
@@ -409,7 +409,7 @@ const airlineFunc = async () => {
         item.jobTime = NODE_CODE[item["nodeCode"]] ?? item["nodeCode"];
         item.weight = item["flightNum"];
       });
-    airlineObj.value = pubFunc(listValues, newObj, true);
+    airlineObj.value = pubFunc(listValues, newObj);
   }
   loading7.value = false;
 };

src/views/dashboard/indexHomeOut.vue

@@ -63,17 +63,17 @@
         <div class="dashboard-content-top-center">
           <div v-loading="loading4" element-loading-text="数据加载中..." element-loading-svg-view-box="-10, -10, 50, 50" element-loading-background="rgba(0,0,0, 0.3)" class="dashboard-content-top-center-top">
             <div class="dashboard-content-top-center-top-list">
-              <div class="dashboard-content-top-center-top-list-txt">重量</div>
-              <div class="dashboard-content-top-center-top-list-num">{{ weightNums }}</div>
-            </div>
-            <div class="dashboard-content-top-center-top-list">
-              <div class="dashboard-content-top-center-top-list-txt">航班数</div>
+              <div class="dashboard-content-top-center-top-list-txt">今日计划航班数</div>
               <div class="dashboard-content-top-center-top-list-num">{{ flightNums }}</div>
             </div>
             <div class="dashboard-content-top-center-top-list">
-              <div class="dashboard-content-top-center-top-list-txt">运单数</div>
+              <div class="dashboard-content-top-center-top-list-txt">已完成航班数</div>
               <div class="dashboard-content-top-center-top-list-num">{{ stockNums }}</div>
             </div>
+            <div class="dashboard-content-top-center-top-list">
+              <div class="dashboard-content-top-center-top-list-txt">已装载总量KG</div>
+              <div class="dashboard-content-top-center-top-list-num">{{ weightNums }}</div>
+            </div>
           </div>
           <div v-loading="loading5" element-loading-text="数据加载中..." element-loading-svg-view-box="-10, -10, 50, 50" element-loading-background="rgba(0,0,0, 0.3)" class="dashboard-content-top-center-bottom">
             <div class="dashboard-content-top-center-bottom-title">航班动态跟踪</div>
@@ -309,7 +309,7 @@ const hourlyPeakFunc = async () => {
     { flightDate1: dateNow.value.time, flightDate2: form.value.endDate },
   ])) as any;
   if (listValues && isValue(listValues)) {
-    hourlyPeakObj.value = pubFunc(listValues, optionLeft);
+    hourlyPeakObj.value = pubFunc(listValues, optionLeft, true);
   }
   loading1.value = false;
 };
@@ -324,7 +324,7 @@ const waybillTrendFunc = async () => {
     listValues.forEach((item) => {
       item.jobTime = parseDate(item["jobTime"]);
     });
-    waybillTrendObj.value = pubFunc(listValues, optionLeft);
+    waybillTrendObj.value = pubFunc(listValues, optionLeft, true);
   }
   loading2.value = false;
 };
@@ -355,9 +355,9 @@ const numbersFunc = async () => {
     },
   ])) as any;
   if (listValues && isValue(listValues)) {
-    const { flightNum, stockNum, weight } = listValues[0];
+    const { flightNum, finishFlightNum, weight } = listValues[0];
     flightNums.value = flightNum ?? 0;
-    stockNums.value = stockNum ?? 0;
+    stockNums.value = finishFlightNum ?? 0;
     weightNums.value = weight ?? 0;
   }
   loading4.value = false;
@@ -430,7 +430,7 @@ const airlineFunc = async () => {
         item.jobTime = NODE_CODE[item["nodeCode"]] ?? item["nodeCode"];
         item.weight = item["flightNum"];
       });
-    airlineObj.value = pubFunc(listValues, newObj, true);
+    airlineObj.value = pubFunc(listValues, newObj);
   }
   loading7.value = false;
 };
@@ -450,7 +450,7 @@ const pickingFuncs = async () => {
       item.jobTime = parseDate(item["flightDate"]);
       item.weight = item["flightNum"];
     });
-    pickingObj.value = pubFunc(listValues, newObj, true);
+    pickingObj.value = pubFunc(listValues, newObj);
   }
   loading8.value = false;
 };

src/views/dashboard/indexIn.vue

@@ -63,17 +63,17 @@
         <div class="dashboard-content-top-center">
           <div v-loading="loading4" element-loading-text="数据加载中..." element-loading-svg-view-box="-10, -10, 50, 50" element-loading-background="rgba(0,0,0, 0.3)" class="dashboard-content-top-center-top">
             <div class="dashboard-content-top-center-top-list">
-              <div class="dashboard-content-top-center-top-list-txt">重量</div>
-              <div class="dashboard-content-top-center-top-list-num">{{ weightNums }}</div>
-            </div>
-            <div class="dashboard-content-top-center-top-list">
-              <div class="dashboard-content-top-center-top-list-txt">航班数</div>
+              <div class="dashboard-content-top-center-top-list-txt">今日计划航班数</div>
               <div class="dashboard-content-top-center-top-list-num">{{ flightNums }}</div>
             </div>
             <div class="dashboard-content-top-center-top-list">
-              <div class="dashboard-content-top-center-top-list-txt">运单数</div>
+              <div class="dashboard-content-top-center-top-list-txt">已完成航班数</div>
               <div class="dashboard-content-top-center-top-list-num">{{ stockNums }}</div>
             </div>
+            <div class="dashboard-content-top-center-top-list">
+              <div class="dashboard-content-top-center-top-list-txt">已装载总量KG</div>
+              <div class="dashboard-content-top-center-top-list-num">{{ weightNums }}</div>
+            </div>
           </div>
           <div v-loading="loading5" element-loading-text="数据加载中..." element-loading-svg-view-box="-10, -10, 50, 50" element-loading-background="rgba(0,0,0, 0.3)" class="dashboard-content-top-center-bottom">
             <div class="dashboard-content-top-center-bottom-title">航班动态跟踪</div>
@@ -286,7 +286,7 @@ const hourlyPeakFunc = async () => {
     { flightDate1: dateNow.value.time, flightDate2: form.value.endDate },
   ])) as any;
   if (listValues && isValue(listValues)) {
-    hourlyPeakObj.value = pubFunc(listValues, optionLeft);
+    hourlyPeakObj.value = pubFunc(listValues, optionLeft, true);
   }
   loading1.value = false;
 };
@@ -301,7 +301,7 @@ const waybillTrendFunc = async () => {
     listValues.forEach((item) => {
       item.jobTime = parseDate(item["jobTime"]);
     });
-    waybillTrendObj.value = pubFunc(listValues, optionLeft);
+    waybillTrendObj.value = pubFunc(listValues, optionLeft, true);
   }
   loading2.value = false;
 };
@@ -332,9 +332,9 @@ const numbersFunc = async () => {
     },
   ])) as any;
   if (listValues && isValue(listValues)) {
-    const { flightNum, stockNum, weight } = listValues[0];
+    const { flightNum, finishFlightNum, weight } = listValues[0];
     flightNums.value = flightNum ?? 0;
-    stockNums.value = stockNum ?? 0;
+    stockNums.value = finishFlightNum ?? 0;
     weightNums.value = weight ?? 0;
   }
   loading4.value = false;
@@ -408,7 +408,7 @@ const airlineFunc = async () => {
         item.jobTime = NODE_CODE[item["nodeCode"]] ?? item["nodeCode"];
         item.weight = item["flightNum"];
       });
-    airlineObj.value = pubFunc(listValues, newObj, true);
+    airlineObj.value = pubFunc(listValues, newObj);
   }
   loading7.value = false;
 };

src/views/dashboard/indexOut.vue

@@ -63,17 +63,17 @@
         <div class="dashboard-content-top-center">
           <div v-loading="loading4" element-loading-text="数据加载中..." element-loading-svg-view-box="-10, -10, 50, 50" element-loading-background="rgba(0,0,0, 0.3)" class="dashboard-content-top-center-top">
             <div class="dashboard-content-top-center-top-list">
-              <div class="dashboard-content-top-center-top-list-txt">重量</div>
-              <div class="dashboard-content-top-center-top-list-num">{{ weightNums }}</div>
-            </div>
-            <div class="dashboard-content-top-center-top-list">
-              <div class="dashboard-content-top-center-top-list-txt">航班数</div>
+              <div class="dashboard-content-top-center-top-list-txt">今日计划航班数</div>
               <div class="dashboard-content-top-center-top-list-num">{{ flightNums }}</div>
             </div>
             <div class="dashboard-content-top-center-top-list">
-              <div class="dashboard-content-top-center-top-list-txt">运单数</div>
+              <div class="dashboard-content-top-center-top-list-txt">已完成航班数</div>
               <div class="dashboard-content-top-center-top-list-num">{{ stockNums }}</div>
             </div>
+            <div class="dashboard-content-top-center-top-list">
+              <div class="dashboard-content-top-center-top-list-txt">已装载总量KG</div>
+              <div class="dashboard-content-top-center-top-list-num">{{ weightNums }}</div>
+            </div>
           </div>
           <div v-loading="loading5" element-loading-text="数据加载中..." element-loading-svg-view-box="-10, -10, 50, 50" element-loading-background="rgba(0,0,0, 0.3)" class="dashboard-content-top-center-bottom">
             <div class="dashboard-content-top-center-bottom-title">航班动态跟踪</div>
@@ -303,7 +303,7 @@ const hourlyPeakFunc = async () => {
     { flightDate1: dateNow.value.time, flightDate2: form.value.endDate },
   ])) as any;
   if (listValues && isValue(listValues)) {
-    hourlyPeakObj.value = pubFunc(listValues, optionLeft);
+    hourlyPeakObj.value = pubFunc(listValues, optionLeft, true);
   }
   loading1.value = false;
 };
@@ -318,7 +318,7 @@ const waybillTrendFunc = async () => {
     listValues.forEach((item) => {
       item.jobTime = parseDate(item["jobTime"]);
     });
-    waybillTrendObj.value = pubFunc(listValues, optionLeft);
+    waybillTrendObj.value = pubFunc(listValues, optionLeft, true);
   }
   loading2.value = false;
 };
@@ -349,10 +349,10 @@ const numbersFunc = async () => {
     },
   ])) as any;
   if (listValues && isValue(listValues)) {
-    const { flightNum, stockNum, weight } = listValues[0];
-    flightNums.value = flightNum;
-    stockNums.value = stockNum;
-    weightNums.value = weight;
+    const { flightNum, finishFlightNum, weight } = listValues[0];
+    flightNums.value = flightNum ?? 0;
+    stockNums.value = finishFlightNum ?? 0;
+    weightNums.value = weight ?? 0;
   }
   loading4.value = false;
 };
@@ -425,7 +425,7 @@ const airlineFunc = async () => {
         item.jobTime = NODE_CODE[item["nodeCode"]] ?? item["nodeCode"];
         item.weight = item["flightNum"];
       });
-    airlineObj.value = pubFunc(listValues, newObj, true);
+    airlineObj.value = pubFunc(listValues, newObj);
   }
   loading7.value = false;
 };
@@ -445,7 +445,7 @@ const pickingFuncs = async () => {
       item.jobTime = parseDate(item["flightDate"]);
       item.weight = item["flightNum"];
     });
-    pickingObj.value = pubFunc(listValues, newObj, true);
+    pickingObj.value = pubFunc(listValues, newObj);
   }
   loading8.value = false;
 };