航站视图-预警报警修改

public/config.js

@@ -74,6 +74,7 @@ var NEW_DATACONTENT_ID = [
   52033,
   52022,
   52023,
+  51062,
   9, //航站查询
   10, //航司查询
   11, //节点查询
@@ -271,6 +272,7 @@ var DATACONTENT_ID = {
   internationalDepartureTransferAirport: 51015, // 中转航站
   internationalDepartureTransferAirportCount: 51016, // 中转统计
   warningRules: 18040, // 报警预警策略
+  warningNodes: 51062, // 报警预警节点
   // 航班
   departureFlightInfo: 51003, // 国内离港航班基础信息
   departureFlightWaybill: 52004, // 国内离港航班运单

src/views/realTime/components/AirportView/index.vue

@@ -146,18 +146,15 @@ const { tableColumns, tableData, getTableData } = useAirportTable(
 
 const finishedCount = ref(0)
 
-const { getWarningRules } = useFlightState(props.name, tableData, finishedCount)
-
-useLoop(
-  [
-    getAirportCount,
-    getTableData,
-    // getWarningRules,
-  ],
-  'airport',
-  [formData]
+const { warningNodes, getWarningNodes } = useFlightState(
+  props.name,
+  tableData,
+  finishedCount,
+  formData
 )
 
+useLoop([getAirportCount, getTableData, getWarningNodes], 'airport', [formData])
+
 const countFlag = ref(false)
 const { tableColumnFormatter, tableDataFormatter } = useFormatter(countFlag)
 
@@ -393,7 +390,7 @@ const sortRuleChangeHandler = map => {
 }
 
 const { columnChecked } = useTableColumnSet(tableColumns)
-const { rowClass, cellClass } = useTableStyle(props.name)
+const { rowClass, cellClass } = useTableStyle(props.name, warningNodes)
 
 const rowClassName = params => {
   const { row, rowIndex } = params

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

@@ -790,7 +790,7 @@ const columnGroupsMap: {
           columnLabel: '理货时间',
         },
         {
-          columnName: "passCustoms_in",
+          columnName: 'passCustoms_in',
           columnLabel: '海关放行\n(运单/件)',
           labelClassName: 'bg-purple',
         },
@@ -1110,16 +1110,16 @@ export function useAirportTable(name: string, formData: CommonData) {
           ? flightTypeMap[row.flightType] ?? '其他'
           : '其他'
 
-        if (
-          (name === 'DepartureAirport' ||
-            name === 'InternationalDepartureAirport') &&
-          row.flightType === '货机'
-        ) {
-          row.endLoadTime = computedTime(
-            row.planDepartureTime,
-            getAddend(`${row.planeType}`, name)
-          )
-        }
+        // if (
+        //   (name === 'DepartureAirport' ||
+        //     name === 'InternationalDepartureAirport') &&
+        //   row.flightType === '货机'
+        // ) {
+        //   row.endLoadTime = computedTime(
+        //     row.planDepartureTime,
+        //     getAddend(`${row.planeType}`, name)
+        //   )
+        // }
         return {
           ...row,
           rowKey: `${row.IATACode}-${row.flightNO}-${row.flightDate}`,

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

@@ -1,11 +1,12 @@
 import { Query } from '@/api/webApi'
 import { Ref } from 'vue'
-import { CommonData, CommonValue } from '~/common'
+import { CommonData, CommonValue, WarningNode } from '~/common'
 
 export function useFlightState(
   name: string,
   tableData: Ref<CommonData[]>,
-  finishedCount: Ref<number>
+  finishedCount: Ref<number>,
+  formData: CommonData
 ) {
   const warningRules = ref<CommonData[]>([])
   const getWarningRules = async () => {
@@ -27,6 +28,26 @@ export function useFlightState(
     }
   }
 
+  const warningNodes = ref<WarningNode[]>([])
+  const getWarningNodes = async () => {
+    try {
+      const {
+        code,
+        returnData: { listValues },
+        message,
+      } = await Query<WarningNode>({
+        id: DATACONTENT_ID.warningNodes,
+        dataContent: [formData.startDate, formData.endDate],
+      })
+      if (Number(code) !== 0) {
+        throw new Error(message || '失败')
+      }
+      warningNodes.value = listValues
+    } catch (error) {
+      console.error(error)
+    }
+  }
+
   watch(tableData, data => {
     finishedCount.value = 0
     const now = Date.now()
@@ -57,7 +78,7 @@ export function useFlightState(
           row.hasTakenOff = 'N'
 
           // 未起飞的匹配预警报警策略
-          row.warningState = getWarningState(row)
+          // row.warningState = getWarningState(row)
         }
       }
       if (
@@ -159,7 +180,9 @@ export function useFlightState(
   }
 
   return {
-    warningRules,
-    getWarningRules,
+    // warningRules,
+    // getWarningRules,
+    warningNodes,
+    getWarningNodes,
   }
 }

src/views/realTime/hooks/useTableStyle.ts

@@ -1,5 +1,5 @@
 import { Column } from 'element-plus'
-import { CommonData, CommonValue } from '~/common'
+import { CommonData, CommonValue, MaybeRef, WarningNode } from '~/common'
 import { RowClassGetter } from '../type'
 
 type CellClassGetter = (params: {
@@ -54,7 +54,10 @@ function getDuration(
   }
 }
 
-export function useTableStyle(tableName?: string) {
+export function useTableStyle(
+  tableName: string,
+  warningNodes?: MaybeRef<WarningNode[]>
+) {
   const rowClass = ({ row, rowIndex }) => {
     const classes: string[] = []
     if (tableName?.includes('Airport')) {
@@ -70,10 +73,8 @@ export function useTableStyle(tableName?: string) {
   const cellClass = ({ row, column, rowIndex, columnIndex }) => {
     const classes: string[] = []
 
-    const cellData = row[column.property]
-
     if (tableName?.includes('Airport')) {
-      if ((['flightNO'] as CommonValue[]).includes(column.property)) {
+      if (column.property === 'flightNO') {
         classes.push('cell-click')
         if (row.flightState === 'DLY') {
           classes.push('flight-state-delay')
@@ -82,123 +83,21 @@ export function useTableStyle(tableName?: string) {
         }
       }
 
-      if (
-        column.property === 'register' &&
-        typeof cellData === 'string' &&
-        cellData.split('/').some(char => Number(char) > 0)
-      ) {
-        classes.push('cell-warning')
-      }
-
-      if (
-        ([
-          'resure',
-          //  'resureTime'
-        ] as CommonValue[]).includes(column.property) &&
-        (row['planeDownTime'] ?? '') !== ''
-      ) {
-        const { stowage, resure } = row
-        let stowageNum = 0,
-          resureNum = 0
-        if (typeof stowage === 'string') {
-          stowageNum = Number(stowage.split('/')[0]) || 0
-        }
-        if (typeof resure === 'string') {
-          resureNum = Number(resure.split('/')[0]) || 0
-        }
-        if (stowageNum !== resureNum) {
-          classes.push('cell-warning')
-        }
-      }
-      // if (column.property === 'loadPlaneTime') {
-      //   if (row['warningState'] === 'alarm') {
-      //     classes.push('cell-alarm')
-      //   }
-      //   if (row['warningState'] === 'warning') {
-      //     classes.push('cell-warning')
-      //   }
-      // }
-      if (
-        tableName === 'DepartureAirport' &&
-        [
-          'securityYes',
-          // 'securityTime'
-        ].includes(column.property)
-      ) {
-        const { receiveSure, receiveSure1, securityYes } = row
-        let receiveNum = 0,
-          securityNum = 0
-        if (tableName.includes('International')) {
-          if (typeof receiveSure1 === 'string') {
-            receiveNum = Number(receiveSure1.split('/')[0]) || 0
-          }
-        } else {
-          if (typeof receiveSure === 'string') {
-            receiveNum = Number(receiveSure.split('/')[0]) || 0
-          }
-        }
-        if (typeof securityYes === 'string') {
-          securityNum = Number(securityYes.split('/')[0]) || 0
-        }
-        if (receiveNum !== securityNum) {
-          classes.push('cell-warning')
-        }
-      }
-
-      if (tableName?.includes('Departure') && row.flightType === '货机') {
-        if (column.property === 'loadPlaneSureTime') {
-          const { planDepartureTime, loadPlaneSureTime } = row
-          if (
-            getTime(planDepartureTime) - getTime(loadPlaneSureTime) <
-            5 * 60 * 1000
-          ) {
-            classes.push('cell-warning')
-          }
-        }
-
-        if (column.property === 'loadPlaneTime') {
-          const { planDepartureTime, loadPlaneTime } = row
-          if (
-            getTime(planDepartureTime) - getTime(loadPlaneTime) <
-            2 * 60 * 1000
-          ) {
-            classes.push('cell-warning')
-          }
-        }
-
-        if (
-          tableName === 'DepartureAirport' &&
-          column.property === 'addCargoTime'
-        ) {
-          const { endLoadTime, addCargoTime } = row
-          if (getTime(endLoadTime) < getTime(addCargoTime)) {
+      if (warningNodes) {
+        const matchedNode = unref(warningNodes).find(
+          node =>
+            node.node_code === column.property &&
+            node.iata_code === row.IATACode &&
+            node.flight_no === row.flightNO
+        )
+        if (matchedNode) {
+          if (String(matchedNode.alarm_type) === '1') {
             classes.push('cell-warning')
           }
         }
-
-        if (
-          tableName === 'InternationalDepartureAirport' &&
-          column.property === 'securityTime'
-        ) {
-          const { endLoadTime, securityTime } = row
-          if (getTime(endLoadTime) < getTime(securityTime)) {
-            classes.push('cell-warning')
-          }
-        }
-
-        if (column.property === 'planeDownTime') {
-          const { planDepartureTime, planeDownTime, takeOffStand } = row
-          const { warning, alarm } = getDuration(tableName, takeOffStand)
-          if (
-            typeof alarm === 'number' &&
-            getTime(planDepartureTime) - getTime(planeDownTime) < alarm
-          ) {
+        if (matchedNode) {
+          if (String(matchedNode.alarm_type) === '2') {
             classes.push('cell-alarm')
-          } else if (
-            typeof warning === 'number' &&
-            getTime(planDepartureTime) - getTime(planeDownTime) < warning
-          ) {
-            classes.push('cell-warning')
           }
         }
       }
@@ -221,12 +120,6 @@ export function useTableStyle(tableName?: string) {
       }
     }
 
-    // if (tableName?.includes('WaybillGoods')) {
-    //   if (['CargoSN'].includes(column.property)) {
-    //     classes.push('cell-click')
-    //   }
-    // }
-
     return classes.join(' ')
   }
 

typings/common.d.ts

@@ -115,3 +115,10 @@ interface CommonQueryResult<T = any> {
 type SelectOptionQueryResult = CommonQueryResult<SelectOption>
 
 type MaybeRef<T> = Ref<T> | T
+
+interface WarningNode {
+  flight_no: string
+  iata_code: string
+  node_code: string
+  alarm_type: number
+}