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

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

@@ -84,6 +84,14 @@ const columnGroupsMap: {
           columnName: 'C5_time',
           columnLabel: '收运核单\n时间',
         },
+        {
+          columnName: 'C5_1',
+          columnLabel: '核单不通过\n(运单/件/重量)',
+        },
+        {
+          columnName: 'C5_1_time',
+          columnLabel: '核单不通过\n时间',
+        },
         {
           columnName: 'C6',
           columnLabel: '查验\n(拒运/查验)',
@@ -94,11 +102,11 @@ const columnGroupsMap: {
         },
         {
           columnName: 'C7',
-          columnLabel: '安检\n(运单/件)',
+          columnLabel: '安检放行\n(运单/件)',
         },
         {
           columnName: 'C7_time',
-          columnLabel: '安检时间',
+          columnLabel: '安检放行\n时间',
         },
         {
           columnName: 'C8',
@@ -118,16 +126,24 @@ const columnGroupsMap: {
         },
         {
           columnName: 'C10',
-          columnLabel: '配载\n(板卡/件)',
+          columnLabel: '预配载\n(板卡/件)',
         },
         {
           columnName: 'C10_time',
-          columnLabel: '配载时间',
+          columnLabel: '预配载时间',
         },
         {
           columnName: 'C11',
           columnLabel: '计划交接\n时间',
         },
+        {
+          columnName: 'C12_0',
+          columnLabel: '发起货站交接\n(板卡/件)',
+        },
+        {
+          columnName: 'C12_0_time',
+          columnLabel: '发起货站交接\n时间',
+        },
         {
           columnName: 'C12',
           columnLabel: '货站交接\n(板卡/件)',
@@ -152,6 +168,14 @@ const columnGroupsMap: {
           columnName: 'C14_time',
           columnLabel: '机下交接\n时间',
         },
+        {
+          columnName: 'C15_0',
+          columnLabel: '装机单确认\n(板卡/件)',
+        },
+        {
+          columnName: 'C15_0_time',
+          columnLabel: '装机单确认\n时间',
+        },
         {
           columnName: 'C15',
           columnLabel: '装机\n(板卡/件)',
@@ -162,11 +186,11 @@ const columnGroupsMap: {
         },
         {
           columnName: 'C16',
-          columnLabel: '拉货登记\n(板卡/件)',
+          columnLabel: '拉下登记\n(板卡/件)',
         },
         {
           columnName: 'C16_time',
-          columnLabel: '拉货登记\n时间',
+          columnLabel: '拉下登记\n时间',
         },
         {
           columnName: 'C17',
@@ -338,6 +362,10 @@ const columnGroupsMap: {
           columnName: 'C17',
           columnLabel: '预配载\n(板卡/件)',
         },
+        {
+          columnName: 'C17_time',
+          columnLabel: '预配载时间',
+        },
         {
           columnName: 'C18',
           columnLabel: '发起货站交接\n(板卡/件)',
@@ -449,6 +477,14 @@ const columnGroupsMap: {
     {
       groupName: '地服相关',
       children: [
+        {
+          columnName: 'C5_0',
+          columnLabel: '卸机单\n(板/箱/卡)',
+        },
+        {
+          columnName: 'C5_0_time',
+          columnLabel: '卸机单确认\n时间',
+        },
         {
           columnName: 'C5',
           columnLabel: '卸机\n(板/箱/卡)',
@@ -473,6 +509,10 @@ const columnGroupsMap: {
           columnName: 'C7_time',
           columnLabel: '货站交接\n时间',
         },
+        {
+          columnName: 'C8',
+          columnLabel: '理货\n(板卡/运单/件/重量)',
+        },
         {
           columnName: 'C8_time',
           columnLabel: '理货时间',
@@ -621,9 +661,11 @@ const simulateTableDataMap = {
     C1: '锂2/冷1',
     C2: '365/536',
     C3: '1/2',
-    C4: '',
+    C4: '0/0',
     C5: '364/534/1254KG',
     C5_time: '12:02',
+    C5_1: '364/534/1254KG',
+    C5_1_time: '12:02',
     C6: '0/7',
     C6_time: '12:02',
     C7: '364/534',
@@ -635,15 +677,19 @@ const simulateTableDataMap = {
     C10: '8/536',
     C10_time: '12:02',
     C11: '11:45',
+    C12_0: '8/536',
+    C12_0_time: '12:02',
     C12: i === 1 ? '4/243' : '8/536',
     C12_time: '12:02',
     C13: i === 2 ? '5/357' : '8/536',
     C13_time: '12:02',
     C14: '8/536',
     C14_time: '12:02',
+    C15_0: '8/536',
+    C15_0_time: '12:02',
     C15: '8/536',
     C15_time: '12:02',
-    C16: '0/358/5',
+    C16: '358/5',
     C16_time: '12:02',
     C17: '0/5',
     C17_time: '12:02',
@@ -659,7 +705,7 @@ const simulateTableDataMap = {
     C1: '锂2/冷1',
     C2: '365/536',
     C3: '1/2',
-    C4: '',
+    C4: '0/0',
     C5: '364/534',
     C5_time: '12:02',
     C6: '364/534',
@@ -684,6 +730,7 @@ const simulateTableDataMap = {
     C16: '8/536',
     C16_time: '12:02',
     C17: '8/536',
+    C17_time: '12:02',
     C18: '8/536',
     C18_time: '12:02',
     C19: '8/536',
@@ -707,8 +754,10 @@ const simulateTableDataMap = {
     landingStand: '84',
     C1: '锂2/冷1',
     C2: '363/543',
-    C3: '',
-    C4: i === 0 ? '0/6' : '',
+    C3: '0/0',
+    C4: i === 0 ? '0/6' : '0/0',
+    C5_0: '8/8/8',
+    C5_0_time: '12:02',
     C5: '8/8/8',
     C5_time: '12:02',
     C6: '8/8/8',
@@ -728,8 +777,8 @@ const simulateTableDataMap = {
     landingStand: '84',
     C1: '锂2/冷1',
     C2: '363/543',
-    C3: '',
-    C4: i === 0 ? '0/6' : '',
+    C3: '0/0',
+    C4: i === 0 ? '0/6' : '0/0',
     C5: '8/8/8',
     C6: '8/8/8',
     C6_time: '12:02',