2.21部分问题修改

src/views/dashboard/hooks/usePublic.ts

@@ -10,6 +10,7 @@ export enum showTimeMsg {
   AirlineAbnormal, //航班统计
   PickingStatistics, //拉货统计
   TallyWeight, //理货重量
+  SpecialClassification, // 特货分类
 }
 
 export function usePublic() {
@@ -501,7 +502,10 @@ export function usePublic() {
   }
   const formatWeight = (num: string | number) => {
     const newNum = Number(num)
-    return Math.ceil(newNum / 1000)
+    if (newNum > 0 && newNum <= 1000) {
+      return 1
+    }
+    return (newNum / 1000).toFixed()
   }
   return {
     optionLeft,

src/views/dashboard/index.vue

@@ -128,6 +128,14 @@
               <div class="dashboard-content-top-right-item-top-title">
                 特货分类统计
               </div>
+              <div class="dashboard-content-top-right-item-top-time" @click="showDatePicker(showTimeMsg.SpecialClassification)">
+                <el-icon color="#ffffff" size="18">
+                  <Calendar />
+                </el-icon>
+                <el-icon color="#ffffff">
+                  <CaretBottom />
+                </el-icon>
+              </div>
               <div class="dashboard-content-top-right-item-top-time">
                 <el-dropdown trigger="click" @command="handleCommand">
                   <span class="icons">
@@ -223,7 +231,7 @@ const tallyObj = ref<any>({});
 const flightNums = ref<number>(0);
 const stockNums = ref<number>(0);
 const weightNums = ref<number | string>(0);
-const specialGoods = ref<string>("");
+const specialGoods = ref<string>("分类");
 const specialGoodsDatas = ref<any>([]);
 const specialGoodsAll = ref<any>([]);
 const form = ref({
@@ -270,6 +278,9 @@ const submitForm = () => {
     case showTimeMsg.TallyWeight:
       tallyWeightFunc();
       break;
+    case showTimeMsg.SpecialClassification:
+      airlineFunc();
+      break;
     default:
       break;
   }

src/views/dashboard/indexHomeOut.vue

@@ -127,6 +127,14 @@
               <div class="dashboard-content-top-right-item-top-title">
                 特货分类统计
               </div>
+              <div class="dashboard-content-top-right-item-top-time" @click="showDatePicker(showTimeMsg.SpecialClassification)">
+                <el-icon color="#ffffff" size="18">
+                  <Calendar />
+                </el-icon>
+                <el-icon color="#ffffff">
+                  <CaretBottom />
+                </el-icon>
+              </div>
               <div class="dashboard-content-top-right-item-top-time">
                 <el-dropdown trigger="click" @command="handleCommand">
                   <span class="icons">
@@ -220,7 +228,7 @@ const airlineObj = ref<any>({});
 const pickingObj = ref<any>({});
 const flightNums = ref<number>(0);
 const stockNums = ref<number>(0);
-const specialGoods = ref<string>("");
+const specialGoods = ref<string>("分类");
 const specialGoodsDatas = ref<any>([]);
 const specialGoodsAll = ref<any>([]);
 const weightNums = ref<number | string>(0);
@@ -268,6 +276,9 @@ const submitForm = () => {
     case showTimeMsg.PickingStatistics:
       pickingFuncs();
       break;
+    case showTimeMsg.SpecialClassification:
+      airlineFunc();
+      break;
     default:
       break;
   }

src/views/dashboard/indexIn.vue

@@ -172,6 +172,14 @@
               <div class="dashboard-content-top-right-item-top-title">
                 特货分类统计
               </div>
+              <div class="dashboard-content-top-right-item-top-time" @click="showDatePicker(showTimeMsg.SpecialClassification)">
+                <el-icon color="#ffffff" size="18">
+                  <Calendar />
+                </el-icon>
+                <el-icon color="#ffffff">
+                  <CaretBottom />
+                </el-icon>
+              </div>
               <div class="dashboard-content-top-right-item-top-time">
                 <el-dropdown trigger="click" @command="handleCommand">
                   <span class="icons">
@@ -266,7 +274,7 @@ const airlineObj = ref<any>({});
 const tallyObj = ref<any>({});
 const flightNums = ref<number>(0);
 const stockNums = ref<number>(0);
-const specialGoods = ref<string>("");
+const specialGoods = ref<string>("分类");
 const specialGoodsDatas = ref<any>([]);
 const specialGoodsAll = ref<any>([]);
 const weightNums = ref<number | string>(0);
@@ -314,6 +322,9 @@ const submitForm = () => {
     case showTimeMsg.TallyWeight:
       tallyWeightFunc();
       break;
+    case showTimeMsg.SpecialClassification:
+      airlineFunc();
+      break;
     default:
       break;
   }

src/views/dashboard/indexOut.vue

@@ -169,6 +169,14 @@
               <div class="dashboard-content-top-right-item-top-title">
                 特货分类统计
               </div>
+              <div class="dashboard-content-top-right-item-top-time" @click="showDatePicker(showTimeMsg.SpecialClassification)">
+                <el-icon color="#ffffff" size="18">
+                  <Calendar />
+                </el-icon>
+                <el-icon color="#ffffff">
+                  <CaretBottom />
+                </el-icon>
+              </div>
               <div class="dashboard-content-top-right-item-top-time">
                 <el-dropdown trigger="click" @command="handleCommand">
                   <span class="icons">
@@ -262,7 +270,7 @@ const airlineObj = ref<any>({});
 const pickingObj = ref<any>({});
 const flightNums = ref<number>(0);
 const stockNums = ref<number>(0);
-const specialGoods = ref<string>("");
+const specialGoods = ref<string>("分类");
 const specialGoodsDatas = ref<any>([]);
 const specialGoodsAll = ref<any>([]);
 const weightNums = ref<number | string>(0);
@@ -310,6 +318,9 @@ const submitForm = () => {
     case showTimeMsg.PickingStatistics:
       pickingFuncs();
       break;
+    case showTimeMsg.SpecialClassification:
+      airlineFunc();
+      break;
     default:
       break;
   }

src/views/realTime/components/AirportView/useFormatter.ts

@@ -38,18 +38,19 @@ export function useFormatter(flag: Ref<boolean>) {
       return ''
     }
     if (property.includes('Time') && typeof cellValue === 'string') {
-      if (
-        ['planDepartureTime', 'acLandingTime', 'planLandingTime'].includes(
-          property
-        )
-      ) {
-        return cellValue
-          .trim()
-          .slice(5, -3)
-          .replace(/[T|\s]+/, '\n')
-      } else {
-        return datetimeToTime(cellValue, row.flightDate)
-      }
+      // if (
+      //   ['planDepartureTime', 'acLandingTime', 'planLandingTime'].includes(
+      //     property
+      //   )
+      // ) {
+      //   return cellValue
+      //     .trim()
+      //     .slice(5, -3)
+      //     .replace(/[T|\s]+/, '\n')
+      // } else {
+      //   return datetimeToTime(cellValue, row.flightDate)
+      // }
+      return datetimeToTime(cellValue, row.flightDate)
     }
     if (property === 'jiahuo') {
       return cellValue ? '是' : '否'

src/views/realTime/hooks/useTable.ts

@@ -131,11 +131,11 @@ const tableColumnsMap: {
       columnName: 'DEH',
       className: 'cell-filter cell-filter-green node-departure',
     },
-    {
-      columnLabel: '收运核查',
-      columnName: 'ACC_CHECK',
-      className: 'cell-filter cell-filter-green node-departure',
-    },
+    // {
+    //   columnLabel: '收运核查',
+    //   columnName: 'ACC_CHECK',
+    //   className: 'cell-filter cell-filter-green node-departure',
+    // },
     // {
     //   columnLabel: '拒运',
     //   columnName: 'ACC_CHECK_2',
@@ -383,11 +383,11 @@ const tableColumnsMap: {
       columnName: 'DEH',
       className: 'cell-filter cell-filter-green node-departure',
     },
-    {
-      columnLabel: '查验',
-      columnName: 'ACC_CHECK',
-      className: 'cell-filter cell-filter-green node-departure',
-    },
+    // {
+    //   columnLabel: '收运核查',
+    //   columnName: 'ACC_CHECK',
+    //   className: 'cell-filter cell-filter-green node-departure',
+    // },
     // {
     //   columnLabel: '拒运',
     //   columnName: 'ACC_CHECK_2',

src/views/realTime/hooks/useTrackData.ts

@@ -26,10 +26,10 @@ const trackNodesMap = {
       name: '收货核单',
       nodeCode: 'DEH',
     },
-    {
-      name: '收运核查',
-      nodeCode: 'ACC_CHECK',
-    },
+    // {
+    //   name: '收运核查',
+    //   nodeCode: 'ACC_CHECK',
+    // },
     {
       name: '安检',
       nodeCode: '安检', // 暂无