Browse Source

离港航班视图-预警报警修改

zhongxiaoyu 2 năm trước cách đây
mục cha
commit
3eb7167aef

+ 2 - 2
src/views/realTime/hooks/useTable.ts

@@ -936,8 +936,8 @@ const tableColumnsMap: {
     { columnLabel: '最新节点', columnName: 'nodeCode' },
     { columnLabel: '处理结果', columnName: 'execResult' },
     { columnLabel: '处理时间', columnName: 'execTime', width: 130 },
-    { columnLabel: '拉下件数', columnName: 'pullNum', needCount: 1 },
-    { columnLabel: '退运件数', columnName: 'returnNum', needCount: 1 },
+    // { columnLabel: '拉下件数', columnName: 'pullNum', needCount: 1 },
+    // { columnLabel: '退运件数', columnName: 'returnNum', needCount: 1 },
   ],
   InternationalTransferDepartureWaybillGoods: [
     {

+ 19 - 14
src/views/realTime/hooks/useTableStyle.ts

@@ -81,19 +81,21 @@ export function useTableStyle(tableName?: string) {
           classes.push('flight-state-cancel')
         }
       }
+      // if (
+      //   ((column.property === 'register' &&
+      //     cellData.split('/').some(char => Number(char) > 0)) ||
+      //     (['pullregisterTime', 'pullRegisterTime'] as CommonValue[]).includes(
+      //       column.property
+      //     )) &&
+      //   typeof cellData === 'string'
+      // ) {
+      //   classes.push('cell-warning')
+      // }
       if (
-        (column.property === 'register' &&
-          typeof cellData === 'string' &&
-          cellData.split('/').some(char => Number(char) > 0)) ||
-        ((['pullregisterTime', 'pullRegisterTime'] as CommonValue[]).includes(
-          column.property
-        ) &&
-          typeof cellData === 'string')
-      ) {
-        classes.push('cell-warning')
-      }
-      if (
-        (['resure', 'resureTime'] as CommonValue[]).includes(column.property) &&
+        ([
+          'resure',
+          //  'resureTime'
+        ] as CommonValue[]).includes(column.property) &&
         (row['planeDownTime'] ?? '') !== ''
       ) {
         const { stowage, resure } = row
@@ -119,7 +121,10 @@ export function useTableStyle(tableName?: string) {
       // }
       if (
         tableName === 'DepartureAirport' &&
-        ['securityYes', 'securityTime'].includes(column.property)
+        [
+          'securityYes',
+          // 'securityTime'
+        ].includes(column.property)
       ) {
         const { receiveSure, receiveSure1, securityYes } = row
         let receiveNum = 0,
@@ -151,7 +156,7 @@ export function useTableStyle(tableName?: string) {
             classes.push('cell-warning')
           }
         }
-        
+
         if (column.property === 'loadPlaneTime') {
           const { planDepartureTime, loadPlaneTime } = row
           if (