航站视图优化

src/views/dataQuery/components/DataQueryView/useTable.ts

@@ -166,6 +166,7 @@ export function useTable(
       } = await Query<CommonData>({
         id: idGetter(tableName),
         dataContent: defaultDataContent ?? dataContent,
+        pageSize: 9999,
         // needPage: page.value,
       })
       if (Number(code) !== 0) {

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

@@ -139,14 +139,16 @@ const getAirportCount = async () => {
   }
 }
 
-const { tableColumns, tableData, getTableData } = useAirportTable(
-  props.name,
-  formData
-)
+const {
+  tableColumns,
+  tableColumnsCountIndexMap,
+  tableData,
+  getTableData,
+} = useAirportTable(props.name, formData)
 
 const finishedCount = ref(0)
 
-const { warningNodes, getWarningNodes } = useFlightState(
+const { warningNodesMap, getWarningNodes } = useFlightState(
   props.name,
   tableData,
   finishedCount,
@@ -156,7 +158,10 @@ const { warningNodes, getWarningNodes } = useFlightState(
 useLoop([getAirportCount, getTableData, getWarningNodes], 'airport', [formData])
 
 const countFlag = ref(false)
-const { tableColumnFormatter, tableDataFormatter } = useFormatter(countFlag)
+const { tableColumnFormatter, tableDataFormatter } = useFormatter(
+  countFlag,
+  tableColumnsCountIndexMap
+)
 
 // const UTCFlag = ref(true)
 
@@ -188,13 +193,17 @@ const summaryMethod: SummaryMethod<CommonData> = ({ columns, data }) => {
           },
           [0]
         )
-        const matched = column.label.match(/(?<=\()\S+(?=\))/)
-        if (matched && !countFlag.value) {
-          const machedStr = matched[0]
-          const countIndex = machedStr.split('/').findIndex(str => str === '件')
-          if (countIndex > -1 && countIndex < sumArr.length) {
-            sumArr.splice(countIndex, 1)
-          }
+        // const matched = column.label.match(/(?<=\()\S+(?=\))/)
+        // if (matched && !countFlag.value) {
+        //   const machedStr = matched[0]
+        //   const countIndex = machedStr.split('/').findIndex(str => str === '件')
+        //   if (countIndex > -1) {
+        //     sumArr.splice(countIndex, 1)
+        //   }
+        // }
+        const countIndex = tableColumnsCountIndexMap[column.property]
+        if (countIndex) {
+          sumArr.splice(countIndex, 1)
         }
         sums[index] = sumArr.join('/')
       } else {
@@ -390,7 +399,7 @@ const sortRuleChangeHandler = map => {
 }
 
 const { columnChecked } = useTableColumnSet(tableColumns)
-const { rowClass, cellClass } = useTableStyle(props.name, warningNodes)
+const { rowClass, cellClass } = useTableStyle(props.name, warningNodesMap)
 
 const rowClassName = params => {
   const { row, rowIndex } = params

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

@@ -1020,7 +1020,9 @@ function computedTime(originalTime: CommonValue, addend: number | null) {
 
 export function useAirportTable(name: string, formData: CommonData) {
   const tableColumns = ref<CommonTableColumn[]>([])
-  const tableData = ref<CommonData[]>([])
+  const tableColumnsCountIndexMap = reactive<{ [columnName: string]: number }>(
+    {}
+  )
   const getTableColumns = () => {
     const groups = columnGroupsMap[name]
     tableColumns.value = groups.reduce(
@@ -1058,7 +1060,21 @@ export function useAirportTable(name: string, formData: CommonData) {
       },
       []
     )
+    Object.keys(tableColumnsCountIndexMap).forEach(key => {
+      delete tableColumnsCountIndexMap[key]
+    })
+    tableColumns.value.forEach(column => {
+      const matched = column.columnLabel.match(/(?<=\()\S+(?=\))/)
+      if (matched) {
+        const machedStr = matched[0]
+        const countIndex = machedStr.split('/').findIndex(str => str === '件')
+        if (countIndex > -1) {
+          tableColumnsCountIndexMap[column.columnName] = countIndex
+        }
+      }
+    })
   }
+  const tableData = ref<CommonData[]>([])
   const flightTypeMap = ['货机', '客机', '其他']
   const getTableData = async () => {
     try {
@@ -1085,6 +1101,7 @@ export function useAirportTable(name: string, formData: CommonData) {
       } = await Query<CommonData>({
         id: DATACONTENT_ID[name.slice(0, 1).toLowerCase() + name.slice(1)],
         dataContent,
+        pageSize: 9999,
       })
       if (Number(code) !== 0) {
         throw new Error(message || '失败')
@@ -1135,6 +1152,7 @@ export function useAirportTable(name: string, formData: CommonData) {
 
   return {
     tableColumns,
+    tableColumnsCountIndexMap,
     tableData,
     getTableData,
   }

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

@@ -8,27 +8,27 @@ export function useFlightState(
   finishedCount: Ref<number>,
   formData: CommonData
 ) {
-  const warningRules = ref<CommonData[]>([])
-  const getWarningRules = async () => {
-    try {
-      const {
-        code,
-        returnData: { listValues },
-        message,
-      } = await Query<CommonData>({
-        id: DATACONTENT_ID.warningRules,
-        dataContent: [],
-      })
-      if (Number(code) !== 0) {
-        throw new Error(message || '失败')
-      }
-      warningRules.value = listValues
-    } catch (error) {
-      console.error(error)
-    }
-  }
+  // const warningRules = ref<CommonData[]>([])
+  // const getWarningRules = async () => {
+  //   try {
+  //     const {
+  //       code,
+  //       returnData: { listValues },
+  //       message,
+  //     } = await Query<CommonData>({
+  //       id: DATACONTENT_ID.warningRules,
+  //       dataContent: [],
+  //     })
+  //     if (Number(code) !== 0) {
+  //       throw new Error(message || '失败')
+  //     }
+  //     warningRules.value = listValues
+  //   } catch (error) {
+  //     console.error(error)
+  //   }
+  // }
 
-  const warningNodes = ref<WarningNode[]>([])
+  const warningNodesMap = reactive<{ [nodeCode: string]: WarningNode[] }>({})
   const getWarningNodes = async () => {
     try {
       const {
@@ -42,7 +42,16 @@ export function useFlightState(
       if (Number(code) !== 0) {
         throw new Error(message || '失败')
       }
-      warningNodes.value = listValues
+      Object.keys(warningNodesMap).forEach(key => {
+        delete warningNodesMap[key]
+      })
+      listValues.forEach(node => {
+        if (warningNodesMap[node.node_code]) {
+          warningNodesMap[node.node_code].push({ ...node })
+        } else {
+          warningNodesMap[node.node_code] = [{ ...node }]
+        }
+      })
     } catch (error) {
       console.error(error)
     }
@@ -63,22 +72,9 @@ export function useFlightState(
         // 判断已起飞
         if (now >= departureTime) {
           row.hasTakenOff = 'Y'
-          // if (
-          //   name.includes('International') &&
-          //   row['enterPark'] &&
-          //   row['receiveSure1']
-          // ) {
-          //   finishedCount.value++
-          // }
-          // if (!name.includes('International') && row['receiveSure']) {
-          //   finishedCount.value++
-          // }
           finishedCount.value++
         } else {
           row.hasTakenOff = 'N'
-
-          // 未起飞的匹配预警报警策略
-          // row.warningState = getWarningState(row)
         }
       }
       if (
@@ -108,9 +104,6 @@ export function useFlightState(
         // 判断已降落
         if (now >= landingTime) {
           row.hasLanded = 'Y'
-          // if (row['unLoad'] && row['tally']) {
-          //   finishedCount.value++
-          // }
           finishedCount.value++
         } else {
           row.hasLanded = 'N'
@@ -119,70 +112,70 @@ export function useFlightState(
     })
   })
 
-  const getWarningState = (flightData: CommonData) => {
-    let warningState = ''
-    if (
-      typeof flightData.planDepartureTime !== 'string' ||
-      typeof flightData.loadPlaneTime !== 'string'
-    ) {
-      return warningState
-    }
+  // const getWarningState = (flightData: CommonData) => {
+  //   let warningState = ''
+  //   if (
+  //     typeof flightData.planDepartureTime !== 'string' ||
+  //     typeof flightData.loadPlaneTime !== 'string'
+  //   ) {
+  //     return warningState
+  //   }
 
-    const now = Date.now()
-    const departureTime = new Date(
-      flightData.planDepartureTime.replace('T', ' ')
-    ).getTime()
-    const loadTime = new Date(
-      flightData.loadPlaneTime.replace('T', ' ')
-    ).getTime()
-    const duration = departureTime - loadTime
+  //   const now = Date.now()
+  //   const departureTime = new Date(
+  //     flightData.planDepartureTime.replace('T', ' ')
+  //   ).getTime()
+  //   const loadTime = new Date(
+  //     flightData.loadPlaneTime.replace('T', ' ')
+  //   ).getTime()
+  //   const duration = departureTime - loadTime
 
-    warningRules.value.some(
-      ({
-        startDate,
-        endDate,
-        IATACode,
-        flightNO,
-        warningDuration,
-        alarmDuration,
-      }) => {
-        let startTime = 0,
-          endTime = 0
-        if (typeof startDate === 'string') {
-          startTime = new Date(startDate.replace('T', ' ')).getTime()
-        }
-        if (typeof endDate === 'string') {
-          endTime = new Date(endDate.replace('T', ' ')).getTime()
-        }
-        // 排除不在生效期内或是航司、航班号不匹配的策略
-        if ((startTime && startTime > now) || (endTime && endTime < now)) {
-          return false
-        }
-        if (IATACode && IATACode !== flightData.IATACode) {
-          return false
-        }
-        if (flightNO && flightNO !== flightData.flightNO) {
-          return false
-        }
-        if (typeof alarmDuration === 'number' && duration < alarmDuration) {
-          warningState = 'alarm'
-          return true
-        }
-        if (typeof warningDuration === 'number' && duration < warningDuration) {
-          warningState = 'warning'
-          return true
-        }
-        return false
-      }
-    )
+  //   warningRules.value.some(
+  //     ({
+  //       startDate,
+  //       endDate,
+  //       IATACode,
+  //       flightNO,
+  //       warningDuration,
+  //       alarmDuration,
+  //     }) => {
+  //       let startTime = 0,
+  //         endTime = 0
+  //       if (typeof startDate === 'string') {
+  //         startTime = new Date(startDate.replace('T', ' ')).getTime()
+  //       }
+  //       if (typeof endDate === 'string') {
+  //         endTime = new Date(endDate.replace('T', ' ')).getTime()
+  //       }
+  //       // 排除不在生效期内或是航司、航班号不匹配的策略
+  //       if ((startTime && startTime > now) || (endTime && endTime < now)) {
+  //         return false
+  //       }
+  //       if (IATACode && IATACode !== flightData.IATACode) {
+  //         return false
+  //       }
+  //       if (flightNO && flightNO !== flightData.flightNO) {
+  //         return false
+  //       }
+  //       if (typeof alarmDuration === 'number' && duration < alarmDuration) {
+  //         warningState = 'alarm'
+  //         return true
+  //       }
+  //       if (typeof warningDuration === 'number' && duration < warningDuration) {
+  //         warningState = 'warning'
+  //         return true
+  //       }
+  //       return false
+  //     }
+  //   )
 
-    return warningState
-  }
+  //   return warningState
+  // }
 
   return {
     // warningRules,
     // getWarningRules,
-    warningNodes,
+    warningNodesMap,
     getWarningNodes,
   }
 }

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

@@ -2,9 +2,12 @@ import { datetimeToTime } from '@/utils/validate'
 import { Ref } from 'vue'
 import { CommonTableFormatter } from '~/common'
 
-export function useFormatter(flag: Ref<boolean>) {
+export function useFormatter(
+  flag: Ref<boolean>,
+  tableColumnsCountIndexMap: { [columnName: string]: number }
+) {
   const tableColumnFormatter = (columnLabel: string) => {
-    return unref(flag) ? columnLabel : columnLabel.replace('/件', '')
+    return unref(flag) ? columnLabel : columnLabel.replace(/(\/件)|(件\/)/, '')
   }
 
   const tableDataFormatter: CommonTableFormatter = (
@@ -16,22 +19,24 @@ export function useFormatter(flag: Ref<boolean>) {
     if (property === 'flightDate' && typeof cellValue === 'string') {
       return cellValue.trim().slice(5)
     }
-    if (!unref(flag)) {
-      const matched = label.match(/(?<=\()\S+(?=\))/)
-      if (matched) {
-        const machedStr = matched[0]
-        const countIndex = machedStr.split('/').findIndex(str => str === '件')
-        if (
-          countIndex > -1 &&
-          typeof cellValue === 'string' &&
-          cellValue.split('/')[countIndex]
-        ) {
-          return cellValue
-            .split('/')
-            .filter((_, index) => index !== countIndex)
-            .join('/')
-        }
+    if (!unref(flag) && typeof cellValue === 'string') {
+      const countIndex = tableColumnsCountIndexMap[property]
+      if (countIndex) {
+        const splitedValue = cellValue.split('/')
+        splitedValue.splice(countIndex, 1)
+        return splitedValue.join('/')
       }
+      // const matched = label.match(/(?<=\()\S+(?=\))/)
+      // if (matched) {
+      //   const machedStr = matched[0]
+      //   const countIndex = machedStr.split('/').findIndex(str => str === '件')
+      //   if (countIndex > -1 && typeof cellValue === 'string') {
+      //     return cellValue
+      //       .split('/')
+      //       .filter((_, index) => index !== countIndex)
+      //       .join('/')
+      //   }
+      // }
     }
     // 临时处理-没有发起货站交接这一节点数据时，不显示发起货站交接时间
     if (property === 'requestDepotJoinTime' && !row['requestDepotJoin']) {

src/views/realTime/hooks/useTableStyle.ts

@@ -11,52 +11,52 @@ type CellClassGetter = (params: {
   rowIndex: number
 }) => string
 
-function getTime(time: string | null) {
-  const timeString = time?.replace('T', ' ')
-  const datetime = timeString ? new Date(timeString).getTime() : Date.now()
-  return datetime
-}
+// function getTime(time: string | null) {
+//   const timeString = time?.replace('T', ' ')
+//   const datetime = timeString ? new Date(timeString).getTime() : Date.now()
+//   return datetime
+// }
 
-function getDuration(
-  name: string,
-  takeOffStand: CommonValue
-): { warning: number | null; alarm: number | null } {
-  const subMap =
-    HANDOVER_WARNING_MAP[
-      name.includes('International') ? 'internationalDeparture' : 'departure'
-    ]
-  const stand = parseInt(String(takeOffStand))
-  const matchedKey = Object.keys(subMap).find(key => {
-    if (key.includes('-')) {
-      const [start, end] = key.split('-')
-      const min = Number(start)
-      const max = Number(end)
-      if (!Number.isNaN(min) && !Number.isNaN(max)) {
-        return stand >= min && stand <= max
-      }
-    }
-    return key === takeOffStand
-  })
-  let { warning, alarm } = subMap[matchedKey ?? 'all'] ?? {}
-  if (typeof warning === 'number') {
-    warning *= 60 * 1000
-  } else {
-    warning = null
-  }
-  if (typeof alarm === 'number') {
-    alarm *= 60 * 1000
-  } else {
-    alarm = null
-  }
-  return {
-    warning,
-    alarm,
-  }
-}
+// function getDuration(
+//   name: string,
+//   takeOffStand: CommonValue
+// ): { warning: number | null; alarm: number | null } {
+//   const subMap =
+//     HANDOVER_WARNING_MAP[
+//       name.includes('International') ? 'internationalDeparture' : 'departure'
+//     ]
+//   const stand = parseInt(String(takeOffStand))
+//   const matchedKey = Object.keys(subMap).find(key => {
+//     if (key.includes('-')) {
+//       const [start, end] = key.split('-')
+//       const min = Number(start)
+//       const max = Number(end)
+//       if (!Number.isNaN(min) && !Number.isNaN(max)) {
+//         return stand >= min && stand <= max
+//       }
+//     }
+//     return key === takeOffStand
+//   })
+//   let { warning, alarm } = subMap[matchedKey ?? 'all'] ?? {}
+//   if (typeof warning === 'number') {
+//     warning *= 60 * 1000
+//   } else {
+//     warning = null
+//   }
+//   if (typeof alarm === 'number') {
+//     alarm *= 60 * 1000
+//   } else {
+//     alarm = null
+//   }
+//   return {
+//     warning,
+//     alarm,
+//   }
+// }
 
 export function useTableStyle(
   tableName: string,
-  warningNodes?: MaybeRef<WarningNode[]>
+  warningNodesMap?: { [nodeCode: string]: WarningNode[] }
 ) {
   const rowClass = ({ row, rowIndex }) => {
     const classes: string[] = []
@@ -83,21 +83,22 @@ export function useTableStyle(
         }
       }
 
-      if (!tableName?.includes('Transfer') && 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 (matchedNode) {
-          if (String(matchedNode.alarm_type) === '2') {
-            classes.push('cell-alarm')
+      if (!tableName?.includes('Transfer')) {
+        if (warningNodesMap && warningNodesMap[column.property]) {
+          const warningNodes = warningNodesMap[column.property]
+          const matchedNode = warningNodes.find(
+            node =>
+              node.flight_no === row.flightNO &&
+              node.flight_date === row.flightDate &&
+              node.iata_code === row.IATACode
+          )
+          if (matchedNode) {
+            if (String(matchedNode.alarm_type) === '1') {
+              classes.push('cell-warning')
+            }
+            if (String(matchedNode.alarm_type) === '2') {
+              classes.push('cell-alarm')
+            }
           }
         }
       }

typings/common.d.ts

@@ -118,6 +118,7 @@ type MaybeRef<T> = Ref<T> | T
 
 interface WarningNode {
   flight_no: string
+  flight_date: string
   iata_code: string
   node_code: string
   alarm_type: number