11-23问题修改

public/demo.js

@@ -160,6 +160,7 @@ const DATACONTENT_ID = {
   arrivalFlightWaybill: 1803510, // 国内进港航班运单
   internationalArrivalFlightInfo: 1803509, // 国际进港航班基础信息
   internationalArrivalFlightWaybill: 1803510, // 国际进港航班运单
+  airportNameZh: 1803517, // 机场中文名
   // 运单
   waybillInfo: 1803514, // 运单基础信息
   waybillGoods: 1803515, // 运单节点跟踪

src/hooks/useTableFilterAndSort.ts

@@ -4,7 +4,9 @@ import { CommonData, CommonTableColumn } from '~/common'
 
 export function useTableFilterAndSort(
   tableColumns: Ref<CommonTableColumn[]>,
-  tableData: Ref<CommonData[]>
+  tableData: Ref<CommonData[]>,
+  defaultFilterValueMap = {},
+  defaultSortRuleMap = {}
 ) {
   watch([tableColumns, tableData], ([columns, records]) => {
     const tempSets = {}
@@ -30,8 +32,12 @@ export function useTableFilterAndSort(
   })
 
   const filterOptionMap = reactive({})
-  const filterValueMap = reactive<{ [x: string]: string[] }>({})
-  const tableDataSortRuleMap = reactive<{ [x: string]: string }>({})
+  const filterValueMap = reactive<{ [x: string]: string[] }>(
+    defaultFilterValueMap
+  )
+  const tableDataSortRuleMap = reactive<{ [x: string]: string }>(
+    defaultSortRuleMap
+  )
   const dealedTableData = computed(() => {
     const filtered = tableData.value.filter(item => {
       let flag = true

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

@@ -147,8 +147,10 @@ const tableDataCount = computed(() => ({
   }, 0),
   flightCount: tableData.value.length,
   freightFlightCount: tableData.value.length,
-  loadCount: tableData.value.length,
-  takeOffCount: tableData.value.length,
+  loadCount: tableData.value.reduce((sum, current) => {
+    return current.loadPlaneSure ? sum + 1 : sum
+  }, 0),
+  takeOffCount: 0,
 }))
 
 const { cellClickHandlerV2 } = useTableCellClick(props.name)
@@ -158,7 +160,12 @@ const {
   filterValueMap,
   tableDataSortRuleMap,
   dealedTableData,
-} = useTableFilterAndSort(tableColumns, tableData)
+} = useTableFilterAndSort(
+  tableColumns,
+  tableData,
+  {},
+  { planDepartureTime: 'ascending' }
+)
 
 const permissionMap = {
   DepartureAirport: {

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

@@ -175,19 +175,19 @@ const columnGroupsMap: {
         },
         {
           columnName: 'loadPlaneSure',
-          columnLabel: '装机单确认\n(板卡/件)',
+          columnLabel: '装机\n(板卡/件)',
         },
         {
           columnName: 'loadPlaneSureTime',
-          columnLabel: '装机单确认\n时间',
+          columnLabel: '装机时间',
         },
         {
           columnName: 'loadPlane',
-          columnLabel: '装机\n(板卡/件)',
+          columnLabel: '关闭舱门\n(板卡/件)',
         },
         {
           columnName: 'loadPlaneTime',
-          columnLabel: '装机时间',
+          columnLabel: '关闭舱门\n时间',
         },
         {
           columnName: 'register',

src/views/realTime/components/FlightView/useFlightInfo.ts

@@ -7,7 +7,7 @@ const flightInfoItemsMap = {
     [
       {
         label: '起飞机场简称',
-        getter: info => '',
+        key: 'departureAirportZh',
       },
       {
         label: '日期',
@@ -59,7 +59,7 @@ const flightInfoItemsMap = {
     [
       {
         label: '降落机场简称',
-        getter: info => '',
+        key: 'landingAirportZh',
       },
       {
         label: '日期',
@@ -75,7 +75,7 @@ const flightInfoItemsMap = {
     [
       {
         label: '起飞机场简称',
-        getter: info => '',
+        key: 'departureAirportZh',
       },
       {
         label: '日期',
@@ -115,7 +115,7 @@ const flightInfoItemsMap = {
     [
       {
         label: '降落机场简称',
-        getter: info => '',
+        key: 'landingAirportZh',
       },
       {
         label: '日期',
@@ -219,8 +219,44 @@ export function useFlightInfo(name: string, dataContent: CommonValue[]) {
       ]
     Object.assign(flightInfo, simulateFlightInfo)
   }
-  onMounted(() => {
-    getFlightInfo()
+
+  const getAirportNameZh = async (airportCode: string) => {
+    try {
+      const {
+        code,
+        returnData: { listValues },
+        message,
+      } = await Query({
+        id: DATACONTENT_ID.airportNameZh,
+        dataContent: [airportCode],
+      })
+      if (Number(code) !== 0) {
+        throw new Error(message ?? '失败')
+      }
+      if (!listValues.length) {
+        ElMessage.info('未查询到航班中文名')
+        return ''
+      }
+      return listValues[0].airportname
+    } catch (error) {
+      console.error(error)
+      return ''
+    }
+  }
+
+  onMounted(async () => {
+    await getFlightInfo()
+    const { departureAirport, landingAirport } = flightInfo
+    if (departureAirport) {
+      flightInfo.departureAirportZh = await getAirportNameZh(
+        String(departureAirport)
+      )
+    }
+    if (landingAirport) {
+      flightInfo.landingAirportZh = await getAirportNameZh(
+        String(landingAirport)
+      )
+    }
     // getSimulateFlightInfo()
   })
 

src/views/realTime/hooks/useTrackData.ts

@@ -116,27 +116,11 @@ export function useTrackData(name: string, trackData: MaybeRef<CommonData[]>) {
           execTime,
         }
       ) => {
-        if (
-          !nodeCode ||
-          Object.values(trackNodesMap)
-            .flat()
-            .every(node => node.nodeCode !== nodeCode)
-        ) {
-          return airlines
-        }
-        const isDeparture = [
-          'DEH',
-          'ACC_CHECK',
-          '安检',
-          'LS_CARGO',
-          'WAT_LOC',
-          'CARGOS_DEP_ULD_HANDOVER',
-          '出港货邮',
-          '装载完成',
-          'CARGOS_OFFLOAD',
-          'OFFLOAD_CONFIRM',
-          'BILL_RETURN',
-        ].includes(String(nodeCode))
+        const isDeparture =
+          trackNodesMap.departure
+            .concat(trackNodesMap.internationalDeparture)
+            .some(node => node.nodeCode === nodeCode) ||
+          (name.includes('Departure') && nodeCode === 'NEW')
         const airport = isDeparture
           ? String(departureAirport ?? '')
           : String(arriveAirport ?? '')
@@ -198,7 +182,7 @@ export function useTrackData(name: string, trackData: MaybeRef<CommonData[]>) {
           } else {
             airline.airports.push({
               airport,
-              isDeparture: isDeparture,
+              isDeparture,
               trackSteps: nodeList,
             })
           }
@@ -209,7 +193,7 @@ export function useTrackData(name: string, trackData: MaybeRef<CommonData[]>) {
             airports: [
               {
                 airport,
-                isDeparture: isDeparture,
+                isDeparture,
                 trackSteps: nodeList,
               },
             ],