Эх сурвалжийг харах

国际离港-节点修改

zhongxiaoyu 2 жил өмнө
parent
commit
ceb3216aab

+ 13 - 12
src/views/realTime/components/AirportView/useAirportTable.ts

@@ -511,14 +511,7 @@ const columnGroupsMap: {
         //   columnName: 'waitTime',
         //   columnLabel: '待运区\n时间',
         // },
-        {
-          columnName: 'stowage',
-          columnLabel: '预配载\n(板卡/件)',
-        },
-        {
-          columnName: 'stowageTime',
-          columnLabel: '预配载时间',
-        },
+
         {
           columnName: "concat(requestDepotJoinBoard,'/',requestDepotJoin)",
           columnLabel: '发起货站交接\n(板卡/件)',
@@ -583,13 +576,21 @@ const columnGroupsMap: {
           columnLabel: '拉下登记\n时间',
         },
         {
-          columnName: 'pullSure',
-          columnLabel: '拉回确认\n(板卡/件)',
+          columnName: 'stowage',
+          columnLabel: '实配\n(板卡/件)',
         },
         {
-          columnName: 'pullSureTime',
-          columnLabel: '拉回确认\n时间',
+          columnName: 'stowageTime',
+          columnLabel: '实配时间',
         },
+        // {
+        //   columnName: 'pullSure',
+        //   columnLabel: '拉回确认\n(板卡/件)',
+        // },
+        // {
+        //   columnName: 'pullSureTime',
+        //   columnLabel: '拉回确认\n时间',
+        // },
       ],
     },
   ],

+ 3 - 0
src/views/realTime/components/FlightView/index.vue

@@ -171,6 +171,9 @@ const tableFormatter: CommonTableFormatter = (
     return value.slice(5, -3).replace(/(T|\s)+/, '\n')
   }
   if (column.property === 'nodeCode') {
+    if (props.name.includes('InternationalDeparture') && value === 'LS_CARGO'){
+      return '实配'
+    }
     return NODE_CODE[value] ?? ''
   }
   return value

+ 13 - 12
src/views/realTime/hooks/useTable.ts

@@ -253,12 +253,12 @@ const tableColumnsMap: {
     },
     { columnLabel: '特货信息', columnName: 'speCargoInfo', needCount: 1 },
     {
-      columnLabel: '进港报文运单件数',
+      columnLabel: '运单件数',
       columnName: 'messageCargos_in',
       needCount: 1,
     },
     {
-      columnLabel: '进港实际运单件数',
+      columnLabel: '理货件数',
       columnName: 'acCargos_in',
       needCount: 1,
     },
@@ -448,11 +448,7 @@ const tableColumnsMap: {
     //   columnName: 'wait',
     //   className: 'cell-filter cell-filter-yellow',
     // },
-    {
-      columnLabel: '预配载',
-      columnName: 'stowage',
-      className: 'cell-filter cell-filter-yellow',
-    },
+
     // {
     //   columnLabel: '货站交接',
     //   columnName: 'depot',
@@ -474,10 +470,15 @@ const tableColumnsMap: {
       className: 'cell-filter cell-filter-yellow',
     },
     {
-      columnLabel: '拉回确认',
-      columnName: 'pullSure',
+      columnLabel: '实配',
+      columnName: 'stowage',
       className: 'cell-filter cell-filter-yellow',
     },
+    // {
+    //   columnLabel: '拉回确认',
+    //   columnName: 'pullSure',
+    //   className: 'cell-filter cell-filter-yellow',
+    // },
   ],
   InternationalDepartureFlightWaybill: [
     { columnLabel: '运单号', columnName: 'stockCode', width: 120 },
@@ -562,7 +563,7 @@ const tableColumnsMap: {
       className: 'cell-filter cell-filter-green node-departure',
     },
     {
-      columnLabel: '预配载',
+      columnLabel: '实配',
       columnName: 'LS_CARGO',
       className: 'cell-filter cell-filter-green node-departure',
     },
@@ -619,12 +620,12 @@ const tableColumnsMap: {
     },
     { columnLabel: '特货信息', columnName: 'speCargoInfo', needCount: 1 },
     {
-      columnLabel: '进港报文运单件数',
+      columnLabel: '运单件数',
       columnName: 'messageCargos_in',
       needCount: 1,
     },
     {
-      columnLabel: '进港实际运单件数',
+      columnLabel: '理货件数',
       columnName: 'acCargos_in',
       needCount: 1,
     },

+ 16 - 16
src/views/realTime/hooks/useTrackData.ts

@@ -134,22 +134,18 @@ const trackNodesMap = {
       name: '待运区',
       nodeCode: 'WAT_LOC',
     },
-    {
-      name: '预配载',
-      nodeCode: 'LS_CARGO',
-    },
     // {
-    //   name: '货站交接',
-    //   nodeCode: 'CARGOS_HANDOVER_STATUS_02',
-    // },
-    {
-      name: '交接复核',
-      nodeCode: 'CARGOS_HANDOVER_STATUS_03',
-    },
-    {
-      name: '机下交接',
-      nodeCode: '出港货邮',
-    },
+      //   name: '货站交接',
+      //   nodeCode: 'CARGOS_HANDOVER_STATUS_02',
+      // },
+      {
+        name: '交接复核',
+        nodeCode: 'CARGOS_HANDOVER_STATUS_03',
+      },
+      {
+        name: '机下交接',
+        nodeCode: '出港货邮',
+      },
     {
       name: '装机',
       nodeCode: '装载完成',
@@ -158,8 +154,12 @@ const trackNodesMap = {
       name: '拉下',
       nodeCode: 'CARGOS_OFFLOAD',
     },
+    {
+      name: '实配',
+      nodeCode: 'LS_CARGO',
+    },
     // {
-    //   name: '退运',
+      //   name: '退运',
     //   nodeCode: '',
     // },
   ],