航站视图-件数开关

src/components/SimpleTable/index.vue

@@ -46,7 +46,7 @@ import TableHeaderCell from '@/components/TableHeaderCell/index.vue'
 import type { CSSProperties, VNode } from 'vue'
 import { TableColumnCtx } from 'element-plus/es/components/table/src/table-column/defaults'
 import { CommonData, CommonTableColumn } from '~/common'
-import useTableFilterAndSort from '@/hooks/useTableFilterAndSort'
+import { useTableFilterAndSort } from '@/hooks/useTableFilterAndSort'
 import { ElTable } from 'element-plus'
 
 type SummaryMethod<T> = (data: {

src/hooks/useTableFilterAndSort.ts

@@ -2,7 +2,7 @@ import { Ref } from 'vue'
 import _ from 'lodash'
 import { CommonData, CommonTableColumn } from '~/common'
 
-export default function useTableFilterAndSort(
+export function useTableFilterAndSort(
   tableColumns: Ref<CommonTableColumn[]>,
   tableData: Ref<CommonData[]>
 ) {

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

@@ -8,14 +8,14 @@
           :label="isDeparture ? '预计装载总运单数' : '预计卸载总运单数'"
         />
         <CountBox
-          v-show="goodsCountFlag"
+          v-show="countFlag"
           :count-number="tableDataCount.goodsCount"
           :label="isDeparture ? '预计装载总件数' : '预计卸载总件数'"
         />
       </div>
       <div class="airport-settings">
         <div v-permission="getPermission('count')">
-          <CommonSwitch v-model:flag="goodsCountFlag" label="显示件数" />
+          <CommonSwitch v-model:flag="countFlag" label="显示件数" />
         </div>
         <div v-permission="getPermission('UTC')">
           <CommonSwitch v-model:flag="UTCFlag" label="开启UTC" />
@@ -41,13 +41,13 @@
             :row-class="rowClassV2"
             :cell-props="cellPropsGetter"
           >
-            <template #header-cell="slot: HeaderCellSlotProps">
+            <template #header-cell="{ column }: HeaderCellSlotProps">
               <TableHeaderCell
-                v-model:filter-values="filterValueMap[slot.column.columnName]"
-                v-model:sort-rule="tableDataSortRuleMap[slot.column.columnName]"
-                :label="slot.column.title"
-                :filter-options="filterOptionMap[slot.column.columnName]"
-                :sortable="slot.column.needSort"
+                v-model:filter-values="filterValueMap[column.columnName]"
+                v-model:sort-rule="tableDataSortRuleMap[column.columnName]"
+                :label="tableColumnFormatter(column.columnLabel)"
+                :filter-options="filterOptionMap[column.columnName]"
+                :sortable="column.needSort"
                 filter-style="arrow"
               />
             </template>
@@ -56,10 +56,14 @@
                 class="el-table-v2__cell-text"
                 @click="cellClickHandlerV2(slot)"
               >
-                <el-tooltip v-if="slot.column.columnName.includes('Time')" :content="slot.rowData[slot.column.columnName]">
-                  {{ slot.rowData[slot.column.columnName] }}
+                <!-- <el-tooltip
+                  v-if="slot.column.columnName.includes('Time')"
+                  :content="tableDataFormatter(slot)"
+                >
+                  {{ tableDataFormatter(slot) }}
                 </el-tooltip>
-                <span v-else>{{ slot.rowData[slot.column.columnName] }}</span>
+                <span v-else>{{ tableDataFormatter(slot) }}</span> -->
+                {{ tableDataFormatter(slot) }}
               </div>
             </template>
             <template #footer>
@@ -91,11 +95,12 @@ import ColumnSet from '../../components/ColumnSet/index.vue'
 import CountBox from '../../components/CountBox/index.vue'
 import CommonSwitch from '../../components/CommonSwitch/index.vue'
 import TableHeaderCell from '@/components/TableHeaderCell/index.vue'
-import useTableColumnSet from '../../hooks/useTableColumnSet'
-import useAirportTable from './useAirportTable'
-import useTableStyle from '../../hooks/useTableStyle'
-import useTableCellClick from '../../hooks/useTableCellClick'
-import useTableFilterAndSort from '@/hooks/useTableFilterAndSort'
+import { useTableColumnSet } from '../../hooks/useTableColumnSet'
+import { useAirportTable } from './useAirportTable'
+import { useTableStyle } from '../../hooks/useTableStyle'
+import { useTableCellClick } from '../../hooks/useTableCellClick'
+import { useTableFilterAndSort } from '@/hooks/useTableFilterAndSort'
+import { useCount } from './useCount'
 import { HeaderCellSlotProps } from 'element-plus'
 import { CommonData } from '~/common'
 
@@ -113,7 +118,9 @@ const formDataChangeHandler = (data: CommonData) => {
   Object.assign(formData, data)
 }
 
-const goodsCountFlag = ref(true)
+const countFlag = ref(true)
+const { tableColumnFormatter, tableDataFormatter } = useCount(countFlag)
+
 const UTCFlag = ref(true)
 
 const { tableColumns, tableData } = useAirportTable(props.name, formData)

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

@@ -837,7 +837,7 @@ const computedWidth = (column: SimpleColumn) => {
   return width + 1
 }
 
-export default function useAirportTable(name: string, formData: CommonData) {
+export function useAirportTable(name: string, formData: CommonData) {
   const tableColumns = ref<CommonTableColumn[]>([])
   const tableData = ref<CommonData[]>([])
   const getTableColumns = () => {

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

@@ -0,0 +1,41 @@
+import { Ref } from 'vue'
+import { CellSlotProps } from '../../type'
+
+export function useCount(flag: Ref<boolean>) {
+  const tableColumnFormatter = (columnLabel: string) => {
+    return unref(flag) ? columnLabel : columnLabel.replace('/件', '')
+  }
+
+  const tableDataFormatter = ({
+    rowData,
+    column: { columnName, columnLabel },
+  }: CellSlotProps) => {
+    const cellValue = rowData[columnName]
+    if (!unref(flag)) {
+      const matched = columnLabel.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 (columnName.includes('Time') && typeof cellValue === 'string') {
+      return cellValue.replace('T', '\n')
+    }
+    return cellValue
+  }
+
+  return {
+    tableColumnFormatter,
+    tableDataFormatter,
+  }
+}

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

@@ -55,6 +55,7 @@
           :columns="filteredWaybillColumns"
           :row-class-name="flightWaybillRowClass"
           :cell-class-name="flightWaybillCellClass"
+          :column-props="{ formatter: waybillTableFormatter }"
           @cell-click="flightWaybillCellClickHandler"
         />
       </div>
@@ -67,13 +68,13 @@ import { CaretRight, Download, Refresh } from '@element-plus/icons-vue'
 import SimpleTable from '@/components/SimpleTable/index.vue'
 import CommonSwitch from '../../components/CommonSwitch/index.vue'
 import ColumnSet from '../../components/ColumnSet/index.vue'
-import useTable from '../../hooks/useTable'
-import useTableColumnSet from '../../hooks/useTableColumnSet'
-import useTableExport from '../../hooks/useTableExport'
-import useTableStyle from '../../hooks/useTableStyle'
-import useTableCellClick from '../../hooks/useTableCellClick'
+import { useTable } from '../../hooks/useTable'
+import { useTableColumnSet } from '../../hooks/useTableColumnSet'
+import { useTableExport } from '../../hooks/useTableExport'
+import { useTableStyle } from '../../hooks/useTableStyle'
+import { useTableCellClick } from '../../hooks/useTableCellClick'
+import { useFlightInfo } from './useFlightInfo'
 import { ElMessage } from 'element-plus'
-import useFlightInfo from './useFlightInfo'
 
 const props = defineProps({
   name: {
@@ -110,6 +111,13 @@ const {
   tableColumns: containerTableColumns,
   tableData: containerTableData,
 } = useTable(`${props.name}Container`, dataContent)
+const waybillTableFormatter = (row, column, cellValue, index) => {
+  if (column.property.includes('Time') && typeof cellValue === 'string') {
+    return cellValue.replace('T', '\n')
+  }
+  return String(cellValue ?? '')
+}
+
 const {
   tableColumns: waybillTableColumns,
   tableData: waybillTableData,

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

@@ -165,10 +165,7 @@ const simulateFlightInfoMap = {
   },
 }
 
-export default function useFlightInfo(
-  name: string,
-  dataContent: CommonValue[]
-) {
+export function useFlightInfo(name: string, dataContent: CommonValue[]) {
   const flightInfoItems = ref<
     { label: string; key?: string; getter?: (info: any) => string }[][]
   >([])

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

@@ -15,23 +15,50 @@
       </div>
       <div class="goods-header-operate flex-wrap">
         <Search @clear="clear" @search="search" />
-        <el-button class="button-sqaure" :icon="Download" color="#ac014d" @click="downloadHandler" />
-        <ColumnSet class="button-sqaure" :table-columns="tableColumns" @checked-submit="columnChecked" />
+        <el-button
+          class="button-sqaure"
+          :icon="Download"
+          color="#ac014d"
+          @click="downloadHandler"
+        />
+        <ColumnSet
+          class="button-sqaure"
+          :table-columns="tableColumns"
+          @checked-submit="columnChecked"
+        />
       </div>
     </div>
-    <div :style="{
+    <div
+      :style="{
         maxHeight: trackAirlines.length > 1 ? `${208 * 2 + 8}px` : '208px',
-      }" class="goods-track">
+      }"
+      class="goods-track"
+    >
       <el-scrollbar always>
         <div class="goods-track-warpper">
-          <div v-for="trackAirline in trackAirlines" :key="trackAirline.flightNO" class="goods-track-row">
-            <div v-for="(trackAirport, index) in trackAirline.airports" :key="trackAirport.airport" class="goods-track-box" :style="trackBoxStyle(trackAirline.airports, index)">
+          <div
+            v-for="trackAirline in trackAirlines"
+            :key="trackAirline.flightNO"
+            class="goods-track-row"
+          >
+            <div
+              v-for="(trackAirport, index) in trackAirline.airports"
+              :key="trackAirport.airport"
+              class="goods-track-box"
+              :style="trackBoxStyle(trackAirline.airports, index)"
+            >
               <div class="title flex-wrap">
-                <span v-if="index === 0" class="title-span">航班号：{{ trackAirline.flightNO }}</span>
-                <span class="title-span">{{ trackAirport.isDeparture ? '出港' : '进港' }}：{{
+                <span v-if="index === 0" class="title-span"
+                  >航班号：{{ trackAirline.flightNO }}</span
+                >
+                <span class="title-span"
+                  >{{ trackAirport.isDeparture ? '出港' : '进港' }}：{{
                     trackAirport.airport
-                  }}</span>
-                <span class="title-span">日期：{{ trackAirline.flightDate }}</span>
+                  }}</span
+                >
+                <span class="title-span"
+                  >日期：{{ trackAirline.flightDate }}</span
+                >
               </div>
               <Steps :steps="trackAirport.trackSteps" />
             </div>
@@ -40,7 +67,16 @@
       </el-scrollbar>
     </div>
     <div class="goods-list">
-      <SimpleTable ref="tableRef" :data="tableData" :columns="filteredColumns" scrollbar-always-on :row-class-name="rowClass" :cell-class-name="cellClass" :column-props="{ formatter }" @cell-click="cellClickHandler" />
+      <SimpleTable
+        ref="tableRef"
+        :data="tableData"
+        :columns="filteredColumns"
+        scrollbar-always-on
+        :row-class-name="rowClass"
+        :cell-class-name="cellClass"
+        :column-props="{ formatter }"
+        @cell-click="cellClickHandler"
+      />
     </div>
   </div>
 </template>
@@ -51,36 +87,36 @@ import Search from '@/components/search/index.vue'
 import Steps from '@/components/steps/index.vue'
 import ColumnSet from '../../components/ColumnSet/index.vue'
 import SimpleTable from '@/components/SimpleTable/index.vue'
-import useTrackData from '../../hooks/useTrackData'
-import useTable from '../../hooks/useTable'
-import useTableColumnSet from '../../hooks/useTableColumnSet'
-import useTableExport from '../../hooks/useTableExport'
-import useTableStyle from '../../hooks/useTableStyle'
-import useTableCellClick from '../../hooks/useTableCellClick'
+import { useTrackData } from '../../hooks/useTrackData'
+import { useTable } from '../../hooks/useTable'
+import { useTableColumnSet } from '../../hooks/useTableColumnSet'
+import { useTableExport } from '../../hooks/useTableExport'
+import { useTableStyle } from '../../hooks/useTableStyle'
+import { useTableCellClick } from '../../hooks/useTableCellClick'
+import { useGoodsInfo } from './useGoodsInfo'
 import { Query } from '@/api/webApi'
-import useGoodsInfo from './useGoodsInfo'
 
 const props = defineProps({
   name: {
     type: String,
     required: true,
   },
-});
+})
 
-const route = useRoute();
-const { goodsNO, waybillNO } = route.query;
+const route = useRoute()
+const { goodsNO, waybillNO } = route.query
 
 const { goodsInfoItems, goodsInfo } = useGoodsInfo(props.name, [
   goodsNO as string,
 ])
 
 interface Airline {
-  C0: string; // 航班号
-  C1: string; // 机场
-  C2: string; // 航班日期
-  C3: number; // 起飞/降落
+  C0: string // 航班号
+  C1: string // 机场
+  C2: string // 航班日期
+  C3: number // 起飞/降落
 }
-const goodsAirlines = ref<Airline[]>([]);
+const goodsAirlines = ref<Airline[]>([])
 const getGoodsAirlines = async () => {
   try {
     const {
@@ -90,15 +126,15 @@ const getGoodsAirlines = async () => {
     } = await Query<Airline>({
       id: DATACONTENT_ID.goodsAirline,
       dataContent: [goodsNO],
-    });
+    })
     if (Number(code) !== 0) {
-      throw new Error(message || "失败");
+      throw new Error(message || '失败')
     }
-    goodsAirlines.value = listValues;
+    goodsAirlines.value = listValues
   } catch (error) {
-    console.error(error);
+    console.error(error)
   }
-};
+}
 // onMounted(() => {
 //   getGoodsAirlines()
 // })
@@ -111,34 +147,34 @@ const trackDataContentList = computed(() =>
     isDeparture: C3,
     dataContent: [waybillNO, goodsNO] as string[],
   }))
-);
+)
 const { trackAirlines, trackBoxStyle } = useTrackData(
   props.name,
   trackDataContentList
-);
+)
 
 const dataContent = [waybillNO, goodsNO] as string[]
 const { tableColumns, tableData } = useTable(`${props.name}Flight`, dataContent)
 
 const search = (text: string) => {
-  console.log(text);
-};
-const clear = () => {};
+  console.log(text)
+}
+const clear = () => {}
 
-const tableRef = ref<InstanceType<typeof SimpleTable> | null>(null);
-const { exportToExcel } = useTableExport();
+const tableRef = ref<InstanceType<typeof SimpleTable> | null>(null)
+const { exportToExcel } = useTableExport()
 const downloadHandler = () => {
-  const table = tableRef.value!.table!;
-  exportToExcel({ table });
-};
+  const table = tableRef.value!.table!
+  exportToExcel({ table })
+}
 const formatter = (row, column, cellValue, index) => {
-  if (column.property === "C7") {
-    return String(cellValue ?? "").replace(" ", "\n");
+  if (column.property === 'C7') {
+    return String(cellValue ?? '').replace(' ', '\n')
   }
-  return cellValue;
-};
+  return cellValue
+}
 
-const { filteredColumns, columnChecked } = useTableColumnSet(tableColumns);
+const { filteredColumns, columnChecked } = useTableColumnSet(tableColumns)
 
 const { rowClass, cellClass } = useTableStyle(`${props.name}Flight`)
 

src/views/realTime/components/GoodsView/useGoodsInfo.ts

@@ -41,7 +41,7 @@ const simulateGoodsInfoMap = {
   },
 }
 
-export default function useGoodsInfo(name: string, dataContent: CommonValue[]) {
+export function useGoodsInfo(name: string, dataContent: CommonValue[]) {
   const goodsInfoItems = ref<{ label: string; key: string }[]>([])
   const getGoodsInfoItems = () => {
     goodsInfoItems.value =

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

@@ -3,9 +3,23 @@
     <div class="waybill-info">
       <div class="waybill-info-title">运单基本信息</div>
       <div class="waybill-info-content flex">
-        <div v-for="item in waybillInfoItems" :key="item.key">
-          {{ item.label }}：{{ computedWaybillInfo(item) }}
-        </div>
+        <span
+          v-for="item in waybillInfoItems"
+          :key="item.key"
+          class="waybill-info-item"
+        >
+          <span>{{ item.label }}：</span>
+          <el-tooltip
+            v-if="item.key === 'typeCode'"
+            effect="light"
+            :content="computedWaybillInfo(item)"
+          >
+            <span class="waybill-info-item-value">{{
+              computedWaybillInfo(item)
+            }}</span>
+          </el-tooltip>
+          <span v-else>{{ computedWaybillInfo(item) }}</span>
+        </span>
       </div>
     </div>
     <div class="waybill-header flex">
@@ -88,14 +102,14 @@ import Search from '@/components/search/index.vue'
 import Steps from '@/components/steps/index.vue'
 import ColumnSet from '../../components/ColumnSet/index.vue'
 import SimpleTable from '@/components/SimpleTable/index.vue'
-import useTrackData from '../../hooks/useTrackData'
-import useTable from '../../hooks/useTable'
-import useTableColumnSet from '../../hooks/useTableColumnSet'
-import useTableExport from '../../hooks/useTableExport'
-import useTableStyle from '../../hooks/useTableStyle'
-import useTableCellClick from '../../hooks/useTableCellClick'
-import useWaybillInfo from './useWaybillInfo'
-import { CommonData, CommonValue } from '~/common'
+import { useTrackData } from '../../hooks/useTrackData'
+import { useTable } from '../../hooks/useTable'
+import { useTableColumnSet } from '../../hooks/useTableColumnSet'
+import { useTableExport } from '../../hooks/useTableExport'
+import { useTableStyle } from '../../hooks/useTableStyle'
+import { useTableCellClick } from '../../hooks/useTableCellClick'
+import { useWaybillInfo } from './useWaybillInfo'
+import { CommonData } from '~/common'
 
 const props = defineProps({
   name: {
@@ -121,9 +135,9 @@ const { trackAirlines, trackBoxStyle } = useTrackData(props.name, trackData)
 
 const tableData = computed(() =>
   trackData.value.reduce((data, current) => {
-    const sameRecord = data.find(record =>
+    const sameRow = data.find(row =>
       ['subCode', 'flightNO', 'flightDate', 'stowageNo', 'CargoNo'].every(
-        key => record[key] === current[key]
+        key => row[key] === current[key]
       )
     )
     const {
@@ -144,14 +158,15 @@ const tableData = computed(() =>
       execResult,
       execTime,
     } = current
-    if (sameRecord) {
-      sameRecord[
-        String(nodeCode)
-      ] = `${execPosition}\n${execResult}\n${execTime}`
+    const nodeValue = `${execPosition ?? ''}\n${execResult ?? ''}\n${
+      execTime ?? ''
+    }`
+    if (sameRow) {
+      sameRow[String(nodeCode)] = nodeValue
     } else {
       data.push({
         ...current,
-        [String(nodeCode)]: `${execPosition}\n${execResult}\n${execTime}`,
+        [String(nodeCode)]: nodeValue,
       })
     }
     return data
@@ -201,6 +216,15 @@ const { cellClickHandler } = useTableCellClick(`${props.name}Goods`)
       font-weight: bold;
       margin-bottom: 40px;
     }
+    &-item {
+      display: flex;
+      &-value {
+        max-width: 300px;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+      }
+    }
   }
   &-header :deep {
     margin: 24px 0;

src/views/realTime/components/WaybillView/useWaybillInfo.ts

@@ -91,10 +91,7 @@ const simulateWaybillInfoMap = {
   },
 }
 
-export default function useWaybillInfo(
-  name: string,
-  dataContent: CommonValue[]
-) {
+export function useWaybillInfo(name: string, dataContent: CommonValue[]) {
   const waybillInfoItems = ref<
     { label: string; key?: string; getter?: (info: any) => string }[]
   >([])
@@ -154,6 +151,6 @@ export default function useWaybillInfo(
   return {
     waybillInfoItems,
     waybillInfo,
-    computedWaybillInfo
+    computedWaybillInfo,
   }
 }

src/views/realTime/hooks/useTable.ts

@@ -815,10 +815,7 @@ const simulateTableDataMap: {
   })),
 }
 
-export default function useTable(
-  tableName: string,
-  dataContent?: CommonValue[]
-) {
+export function useTable(tableName: string, dataContent?: CommonValue[]) {
   const tableColumns = ref<CommonTableColumn[]>([])
   const tableData = ref<CommonData[]>([])
   const getTableColumns = () => {
@@ -851,7 +848,13 @@ export default function useTable(
       if (Number(code) !== 0) {
         throw new Error(message || '失败')
       }
-      tableData.value = listValues
+      tableData.value = listValues.filter(
+        row =>
+          !Object.values(row).some(
+            cellValue =>
+              typeof cellValue === 'string' && cellValue.includes('undefined')
+          )
+      )
     } catch (error) {
       console.error(error)
     }

src/views/realTime/hooks/useTableCellClick.ts

@@ -1,7 +1,7 @@
 import { ElMessage } from 'element-plus'
 import type { CellSlotProps } from '../type'
 
-export default function useTableCellClick(tableName?: string) {
+export function useTableCellClick(tableName?: string) {
   const router = useRouter()
   const route = useRoute()
   const cellClickHandler = (row, column, cell, event) => {

src/views/realTime/hooks/useTableColumnSet.ts

@@ -1,7 +1,7 @@
 import { Ref } from 'vue'
 import { CommonTableColumn } from '~/common'
 
-export default function useTableColumnSet(
+export function useTableColumnSet(
   tableColumns: Ref<CommonTableColumn[]>
 ) {
   const filterColumnKeys = ref<string[]>([])

src/views/realTime/hooks/useTableExport.ts

@@ -3,7 +3,7 @@ import { ElMessage } from 'element-plus'
 import * as XLSX from 'xlsx'
 import FileSaver from 'file-saver'
 
-export default function useTableExport() {
+export function useTableExport() {
   const exportToExcel: ExportHandler = ({
     table,
     sheetName = 'sheet1',

src/views/realTime/hooks/useTableStyle.ts

@@ -15,7 +15,7 @@ type CellClassGetter = (params: {
   rowIndex: number
 }) => string
 
-export default function useTableStyle(tableName?: string) {
+export function useTableStyle(tableName?: string) {
   const rowClass = ({ row, rowIndex }) => {
     const classes: string[] = []
     // if (tableName?.includes('FlightContainer')) {

src/views/realTime/hooks/useTrackData.ts

@@ -96,10 +96,7 @@ const trackNodesMap = {
   internationalArrival: [],
 }
 
-export default function useTrackData(
-  name: string,
-  trackData: MaybeRef<CommonData[]>
-) {
+export function useTrackData(name: string, trackData: MaybeRef<CommonData[]>) {
   const isInternational = name.includes('International')
   const trackAirlines = ref<TrackAirline[]>([])
 
@@ -119,6 +116,14 @@ export default function useTrackData(
           execTime,
         }
       ) => {
+        if (
+          !nodeCode ||
+          Object.values(trackNodesMap)
+            .flat()
+            .every(node => node.nodeCode !== nodeCode)
+        ) {
+          return airlines
+        }
         const isDeparture = [
           'DEH',
           'ACC_CHECK',
@@ -132,7 +137,9 @@ export default function useTrackData(
           'OFFLOAD_CONFIRM',
           'BILL_RETURN',
         ].includes(String(nodeCode))
-        const airport = isDeparture ? LoadingLocation : UnloadingLocation
+        const airport = isDeparture
+          ? String(LoadingLocation ?? '')
+          : String(UnloadingLocation ?? '')
         const trackNode = {
           flag: Boolean(
             execPosition ||
@@ -141,10 +148,10 @@ export default function useTrackData(
               execTime
           ),
           descriptions: [
-            execPosition,
-            ConsignmentItemPackagingQuantityQuantity,
-            execResult,
-            String(execTime ?? '').split('T')[1],
+            String(execPosition ?? ''),
+            String(ConsignmentItemPackagingQuantityQuantity ?? ''),
+            String(execResult ?? ''),
+            String(execTime ?? '').split('T')[1] ?? '',
           ],
         }
         const nodeList = trackNodesMap[
@@ -169,9 +176,6 @@ export default function useTrackData(
             }
           }
         })
-        if (!isDeparture) {
-          console.log(trackNode, nodeList)
-        }
         const airline = airlines.find(
           airline =>
             airline.flightNO === flightNO &&
@@ -200,8 +204,8 @@ export default function useTrackData(
           }
         } else {
           airlines.push({
-            flightNO,
-            flightDate,
+            flightNO: String(flightNO ?? ''),
+            flightDate: String(flightDate ?? ''),
             airports: [
               {
                 airport,
@@ -230,143 +234,6 @@ export default function useTrackData(
     getTrackAirlines()
   })
 
-  // const getTrackAirlines = async () => {
-  //   try {
-  //     trackAirlines.value = await trackDataContentList.value.reduce(
-  //       async (
-  //         pre,
-  //         { flightNO, airport, flightDate, isDeparture, dataContent }
-  //       ) => {
-  //         const airlines = await pre
-  //         const trackNodeList = await getTrackData(
-  //           DATACONTENT_ID[
-  //             name.slice(0, 1).toLowerCase() + name.slice(1) + 'Track'
-  //           ],
-  //           dataContent
-  //         )
-  //         const trackSteps: TrackNode[] = trackNodesMap[
-  //           isDeparture
-  //             ? isInternational
-  //               ? 'internationalDeparture'
-  //               : 'departure'
-  //             : isInternational
-  //             ? 'internationalArrival'
-  //             : 'arrival'
-  //         ].map(node => {
-  //           const sameNode = trackNodeList.find(
-  //             ({ C0, C1, C2, C3 }) => C0 === node.nodeCode
-  //           )
-  //           if (sameNode) {
-  //             node = {
-  //               ...node,
-  //               flag: true,
-  //               descriptions: [
-  //                 String(sameNode.C1 ?? ''),
-  //                 String(sameNode.C2 ?? ''),
-  //                 String(sameNode.C3 ?? ''),
-  //               ],
-  //             }
-  //           } else {
-  //             node = {
-  //               ...node,
-  //               flag: false,
-  //               descriptions: [],
-  //             }
-  //           }
-  //           return node
-  //         })
-  //         const trackAirport = {
-  //           airport,
-  //           isDeparture,
-  //           trackSteps,
-  //         }
-  //         const airline = airlines.find(
-  //           airline =>
-  //             airline.flightNO === flightNO && airline.flightDate === flightDate
-  //         )
-  //         if (airline) {
-  //           airline.airports.push(trackAirport)
-  //         } else {
-  //           airlines.push({
-  //             flightNO,
-  //             flightDate,
-  //             airports: [trackAirport],
-  //           })
-  //         }
-  //         return airlines
-  //       },
-  //       Promise.resolve([] as TrackAirline[])
-  //     )
-  //   } catch (error) {
-  //     console.error(error)
-  //   }
-  // }
-  // const getTrackData = async (id: number, dataContent: CommonValue[]) => {
-  //   try {
-  //     const {
-  //       code,
-  //       returnData: { listValues },
-  //       message,
-  //     } = await Query<TrackNodeData>({
-  //       id,
-  //       dataContent,
-  //     })
-  //     if (Number(code) !== 0) {
-  //       throw new Error(message || '失败')
-  //     }
-  //     return listValues
-  //   } catch (error) {
-  //     return Promise.reject(error)
-  //   }
-  // }
-
-  // const getSimulateTrackData = () => {
-  //   const length = name.includes('Waybill') ? 2 : 1
-  //   trackAirlines.value = Array.from({ length }, (_, airlineIndex) => {
-  //     const length = name.includes('International') ? 1 : 2
-  //     return {
-  //       flightNO: airlineIndex < 1 ? 'CA1001' : 'CA1003',
-  //       flightDate: '2022/09/10',
-  //       airports: Array.from({ length }, (_, airportIndex) => ({
-  //         airport: airportIndex < 1 ? '深圳机场' : '南京机场',
-  //         isDeparture: name.includes('Departure')
-  //           ? airportIndex < 1
-  //             ? 1
-  //             : 0
-  //           : airportIndex < 1
-  //           ? 0
-  //           : 1,
-  //         trackSteps: name.includes('International')
-  //           ? name.includes('Departure')
-  //             ? airlineIndex < 1
-  //               ? simulateTrackNodesMap.internationalDeparture
-  //               : simulateTrackNodesMap.internationalDeparture2
-  //             : airlineIndex < 1
-  //             ? simulateTrackNodesMap.internationalArrival
-  //             : simulateTrackNodesMap.internationalArrival2
-  //           : name.includes('Departure')
-  //           ? airlineIndex < 1
-  //             ? airportIndex < 1
-  //               ? simulateTrackNodesMap.departure
-  //               : simulateTrackNodesMap.arrival
-  //             : airportIndex < 1
-  //             ? simulateTrackNodesMap.departure2
-  //             : simulateTrackNodesMap.arrival2
-  //           : airlineIndex < 1
-  //           ? airportIndex < 1
-  //             ? simulateTrackNodesMap.arrival
-  //             : simulateTrackNodesMap.departure
-  //           : airportIndex < 1
-  //           ? simulateTrackNodesMap.arrival2
-  //           : simulateTrackNodesMap.departure2,
-  //       })),
-  //     }
-  //   })
-  // }
-  // onMounted(() => {
-  //   getSimulateTrackData()
-  // })
-
   const trackBoxStyle = computed(
     () => (airports: TrackAirport[], index: number) => {
       const style: CSSProperties = {}