1.18问题修改

src/components/SimpleTable/index.vue

@@ -22,7 +22,16 @@
     @selection-change="(...args:any[]) => { emit('selectionChange', ...args) }"
     @sort-change="(...args:any[]) => { emit('sortChange', ...args) }"
   >
-    <el-table-column v-for="column in tableColumns" :key="column.columnName" v-bind="computedColumnProps(column)">
+    <el-table-column v-if="sequence" type="index" :width="50" align="center">
+      <template #header>
+        <TableHeaderCell label="序号" />
+      </template>
+    </el-table-column>
+    <el-table-column
+      v-for="column in tableColumns"
+      :key="column.columnName"
+      v-bind="computedColumnProps(column)"
+    >
       <template #header>
         <TableHeaderCell
           v-model:filter-values="filterValueMap[column.columnName]"
@@ -47,15 +56,30 @@ import { CommonData, CommonTableColumn } from '~/common'
 import { useTableFilterAndSort } from '@/hooks/useTableFilterAndSort'
 import { ElTable } from 'element-plus'
 
-type SummaryMethod<T> = (data: { columns: TableColumnCtx<T>[]; data: T[] }) => string[]
+type SummaryMethod<T> = (data: {
+  columns: TableColumnCtx<T>[]
+  data: T[]
+}) => string[]
 type ColumnCls<T> = string | ((data: { row: T; rowIndex: number }) => string)
-type ColumnStyle<T> = CSSProperties | ((data: { row: T; rowIndex: number }) => CSSProperties)
+type ColumnStyle<T> =
+  | CSSProperties
+  | ((data: { row: T; rowIndex: number }) => CSSProperties)
 type CellCls<T> =
   | string
-  | ((data: { row: T; rowIndex: number; column: TableColumnCtx<T>; columnIndex: number }) => string)
+  | ((data: {
+      row: T
+      rowIndex: number
+      column: TableColumnCtx<T>
+      columnIndex: number
+    }) => string)
 type CellStyle<T> =
   | CSSProperties
-  | ((data: { row: T; rowIndex: number; column: TableColumnCtx<T>; columnIndex: number }) => CSSProperties)
+  | ((data: {
+      row: T
+      rowIndex: number
+      column: TableColumnCtx<T>
+      columnIndex: number
+    }) => CSSProperties)
 type Sort = {
   prop: string
   order: 'ascending' | 'descending'
@@ -80,7 +104,12 @@ type TableColumnProps<T> = {
   fixed?: boolean | string
   renderHeader?: (data: { column: TableColumnCtx<T>; $index: number }) => VNode
   resizable?: boolean
-  formatter?: (row: T, column: TableColumnCtx<T>, cellValue: any, index: number) => VNode | string
+  formatter?: (
+    row: T,
+    column: TableColumnCtx<T>,
+    cellValue: any,
+    index: number
+  ) => VNode | string
   showOverflowTooltip?: boolean
   align?: string
   headerAlign?: string
@@ -139,7 +168,11 @@ const props = withDefaults(
       children?: string
     }
     lazy?: boolean
-    load?: (row: CommonData, treeNode: TreeNode, resolve: (data: CommonData[]) => void) => void
+    load?: (
+      row: CommonData,
+      treeNode: TreeNode,
+      resolve: (data: CommonData[]) => void
+    ) => void
     className?: string
     style?: CSSProperties
     tableLayout?: Layout
@@ -147,6 +180,7 @@ const props = withDefaults(
     scrollbarAlwaysOn?: boolean
     columnProps?: TableColumnProps<CommonData>
     columns: (CommonTableColumn & TableColumnProps<CommonData>)[]
+    sequence?: boolean
   }>(),
   {
     size: 'default',
@@ -223,10 +257,12 @@ watchEffect(() => {
   tableData.value = props.data
 })
 
-const { filterOptionMap, filterValueMap, sortRuleMap, dealedTableData } = useTableFilterAndSort(
-  tableColumns,
-  tableData
-)
+const {
+  filterOptionMap,
+  filterValueMap,
+  sortRuleMap,
+  dealedTableData,
+} = useTableFilterAndSort(tableColumns, tableData)
 
 const emit = defineEmits([
   'select',
@@ -314,5 +350,14 @@ defineExpose({
       cursor: pointer;
     }
   }
+
+  .el-scrollbar__bar {
+    &.is-horizontal {
+      height: 15px;
+    }
+    &.is-vertical {
+      width: 15px;
+    }
+  }
 }
 </style>

src/components/TableHeaderCell/index.vue

@@ -42,7 +42,10 @@
           </el-icon>
         </div>
         <div v-if="sortable" class="sort-button" @click="sortChange">
-          <el-icon :color="sortRule ? '#2d7cff' : '#000000'">
+          <el-icon
+            :color="sortRule ? '#2d7cff' : '#000000'"
+            :size="sortRule ? 16 : ''"
+          >
             <SortUp v-show="sortRule === 'ascending'" />
             <SortDown v-show="sortRule === 'descending'" />
             <Sort v-show="!sortRule" />
@@ -211,12 +214,23 @@ const sortChange = () => {
   .button-wrapper {
     width: 14px;
     height: 100%;
-    background-color: #dfc37f;
     display: flex;
     flex-direction: column;
     justify-content: space-around;
     align-items: center;
+    position: relative;
+    &::after {
+      content: '';
+      display: block;
+      width: 100%;
+      height: 100%;
+      position: absolute;
+      z-index: 0;
+      background-color: #000000;
+      opacity: 0.1;
+    }
     > div {
+      z-index: 1;
       flex: 1;
       display: flex;
       justify-content: center;
@@ -246,4 +260,9 @@ const sortChange = () => {
     margin-right: 10px;
   }
 }
+
+.el-table-v2__main .button-wrapper {
+  position: relative;
+  z-index: 0;
+}
 </style>

src/views/dataQuery/components/DataQueryView/index.vue

@@ -170,7 +170,7 @@ const { tableColumns, tableData, getTableData } = useTable(
 const { filteredColumns, columnChecked } = useTableColumnSet(tableColumns)
 
 const formatter: CommonTableFormatter = (row, column, cellValue, index) => {
-  const value = String(cellValue ?? '')
+  const value = String(cellValue ?? '').trim()
   if (column.property.includes('Time')) {
     return value.replace('T', '\n')
   }

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

@@ -50,6 +50,9 @@
           &.bg-yellow {
             background-color: #f9f3cb;
           }
+          &.bg-purple {
+            background-color: #9e99d0;
+          }
           &.bg-green {
             background-color: #ace5d3;
           }
@@ -97,10 +100,10 @@
         }
         .el-virtual-scrollbar {
           &.el-vl__horizontal {
-            height: 10px !important;
+            height: 15px !important;
           }
           &.el-vl__vertical {
-            width: 10px !important;
+            width: 15px !important;
           }
         }
       }
@@ -120,6 +123,9 @@
           }
         }
       }
+      .el-empty {
+        height: 100%;
+      }
     }
   }
 }

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

@@ -44,8 +44,8 @@
             :row-class="rowClass"
             :cell-props="cellPropsGetter"
             :row-event-handlers="rowEventHandlers"
-            :h-scrollbar-size="10"
-            :v-scrollbar-size="10"
+            :h-scrollbar-size="15"
+            :v-scrollbar-size="15"
             scrollbar-always-on
             @scroll="tableScrollHandler"
           >
@@ -340,9 +340,9 @@ watch(tableData, async rows => {
   dealedCount.value = 0
   const now = new Date().getTime()
   rows.forEach((row, rowIndex) => {
-    if (props.name.includes('DepartureAirport') && row.planDepartureTime) {
+    if (props.name.includes('DepartureAirport') && typeof row.planDepartureTime === 'string') {
       const departureTime = new Date(
-        (row.planDepartureTime as string).replace('T', ' ')
+        row.planDepartureTime.replace('T', ' ')
       ).getTime()
       if (now >= departureTime) {
         row.hasTakenOff = 'Y'
@@ -351,9 +351,9 @@ watch(tableData, async rows => {
         row.hasTakenOff = 'N'
       }
     }
-    if (props.name.includes('ArrivalAirport') && row.planLandingTime) {
+    if (props.name.includes('ArrivalAirport') && typeof row.planLandingTime ==='string') {
       const landingTime = new Date(
-        (row.planLandingTime as string).replace('T', ' ')
+        row.planLandingTime.replace('T', ' ')
       ).getTime()
       if (now >= landingTime) {
         row.hasLanded = 'Y'

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

@@ -63,32 +63,32 @@ const columnGroupsMap: {
           columnLabel: '实际降落\n时间',
           width: 73,
         },
+        {
+          columnName: 'jiahuo',
+          columnLabel: '一个码标记',
+        },
       ],
     },
     {
-      groupName: '货站相关',
+      groupName: '运单相关',
       children: [
         {
           columnName: 'speCargoInfo',
           columnLabel: '特货信息',
         },
         {
-          columnName: 'transIn',
-          columnLabel: '中转进\n(运单/件)',
-        },
-        {
-          columnName: 'returns',
-          columnLabel: '退运\n(板卡/件)',
+          columnName: 'preLoad',
+          columnLabel: '运单申报\n(运单/件)',
         },
+        // {
+        //   columnName: 'transIn',
+        //   columnLabel: '中转进\n(运单/件)',
+        // },
       ],
     },
     {
-      groupName: '地服相关',
+      groupName: '货站相关',
       children: [
-        {
-          columnName: 'preLoad',
-          columnLabel: '运单申报\n(运单/件)',
-        },
         {
           columnName: 'receiveSure',
           columnLabel: '收运核单\n(运单/件/重量)',
@@ -97,14 +97,14 @@ const columnGroupsMap: {
           columnName: 'receiveSureTime',
           columnLabel: '收运核单\n时间',
         },
-        {
-          columnName: 'receiveSure_No',
-          columnLabel: '核单不通过\n(运单/件/重量)',
-        },
-        {
-          columnName: 'receiveSureTime_No',
-          columnLabel: '核单不通过\n时间',
-        },
+        // {
+        //   columnName: 'receiveSure_No',
+        //   columnLabel: '核单不通过\n(运单/件/重量)',
+        // },
+        // {
+        //   columnName: 'receiveSureTime_No',
+        //   columnLabel: '核单不通过\n时间',
+        // },
         {
           columnName: 'checks',
           columnLabel: '查验\n(拒运/查验)',
@@ -145,6 +145,11 @@ const columnGroupsMap: {
           columnName: 'stowageTime',
           columnLabel: '预配载时间',
         },
+      ],
+    },
+    {
+      groupName: '地服相关',
+      children: [
         // {
         //   columnName: 'planJoinTime',
         //   columnLabel: '计划交接\n时间',
@@ -214,6 +219,122 @@ const columnGroupsMap: {
           columnName: 'pullSureTime',
           columnLabel: '拉回确认\n时间',
         },
+        {
+          columnName: 'returns',
+          columnLabel: '退运\n(板卡/件)',
+        },
+        {
+          columnName: 'returnTime',
+          columnLabel: '退运时间',
+        },
+      ],
+    },
+  ],
+  ArrivalAirport: [
+    {
+      groupName: '航班相关',
+      children: [
+        {
+          columnName: 'IATACode',
+          columnLabel: '航司',
+          needFilters: 1,
+        },
+        {
+          columnName: 'flightNO',
+          columnLabel: '航班号',
+          needFilters: 1,
+        },
+        {
+          columnName: 'flightDate',
+          columnLabel: '执飞日期',
+        },
+        {
+          columnName: 'planLandingTime',
+          columnLabel: '降落时间',
+        },
+        {
+          columnName: 'target',
+          columnLabel: '目的站',
+          needFilters: 1,
+        },
+        {
+          columnName: 'landingStand',
+          columnLabel: '停机位',
+        },
+        {
+          columnName: 'speCargoInfo',
+          columnLabel: '特货信息',
+        },
+        // {
+        //   columnName: 'preUnLoad',
+        //   columnLabel: '预计卸载数\n(运单/件)',
+        // },
+        // {
+        //   columnName: 'transOut',
+        //   columnLabel: '中转出\n(运单/件)',
+        // },
+        // {
+        //   columnName: 'receiveDiff',
+        //   columnLabel: '收货差异\n(板卡/件)',
+        // },
+      ],
+    },
+    {
+      groupName: '地服相关',
+      children: [
+        // {
+        //   columnName: 'unloadBill',
+        //   columnLabel: '卸机单\n(板/箱/卡)',
+        // },
+        // {
+        //   columnName: 'unloadBillTime',
+        //   columnLabel: '卸机单确认\n时间',
+        // },
+        {
+          columnName: 'unLoad',
+          columnLabel: '卸机\n(板/箱/卡)',
+        },
+        {
+          columnName: 'unLoadTime',
+          columnLabel: '卸机时间',
+        },
+        {
+          columnName: 'planeDown',
+          columnLabel: '库区到达\n(板/箱/卡)',
+        },
+        {
+          columnName: 'planeDownTime_IN',
+          columnLabel: '库区到达\n时间',
+        },
+      ],
+    },
+    {
+      groupName: '货站相关',
+      children: [
+        {
+          columnName: 'depotJoin',
+          columnLabel: '货站交接\n(板/箱/卡)',
+        },
+        {
+          columnName: 'depotJoinTime_IN',
+          columnLabel: '货站交接\n时间',
+        },
+        {
+          columnName: 'tally',
+          columnLabel: '理货\n(运单/件/重量)',
+        },
+        {
+          columnName: 'tallyTime_in',
+          columnLabel: '理货时间',
+        },
+        {
+          columnName: 'outWarehouse',
+          columnLabel: '出库\n(批/运单/件)',
+        },
+        {
+          columnName: 'outWarehouseTime',
+          columnLabel: '出库时间',
+        },
       ],
     },
   ],
@@ -266,32 +387,27 @@ const columnGroupsMap: {
           columnLabel: '实际降落\n时间',
           width: 73,
         },
-      ],
-    },
-    {
-      groupName: '货站相关',
-      children: [
         {
           columnName: 'speCargoInfo',
           columnLabel: '特货信息',
         },
-        {
-          columnName: 'transIn',
-          columnLabel: '中转进\n(运单/件)',
-        },
-        {
-          columnName: 'returns1',
-          columnLabel: '退运\n(板卡/件)',
-        },
+        // {
+        //   columnName: 'transIn',
+        //   columnLabel: '中转进\n(运单/件)',
+        // },
+        // {
+        //   columnName: 'returns1',
+        //   columnLabel: '退运\n(板卡/件)',
+        // },
       ],
     },
     {
-      groupName: '地服相关',
+      groupName: '货站相关',
       children: [
-        {
-          columnName: 'preLoad',
-          columnLabel: '运单申报\n(运单/件)',
-        },
+        // {
+        //   columnName: 'preLoad',
+        //   columnLabel: '运单申报\n(运单/件)',
+        // },
         {
           columnName: 'enterPark',
           columnLabel: '入园\n(运单/件)',
@@ -302,11 +418,11 @@ const columnGroupsMap: {
         },
         {
           columnName: 'enterCustoms',
-          columnLabel: '进入海关\n(运单/件)',
+          columnLabel: '海关中控\n(运单/件)',
         },
         {
           columnName: 'enterCustomsTime',
-          columnLabel: '进入海关时间',
+          columnLabel: '海关中控\n时间',
         },
         {
           columnName: 'passCustoms',
@@ -316,14 +432,14 @@ const columnGroupsMap: {
           columnName: 'passCustomsTime',
           columnLabel: '海关放行\n时间',
         },
-        {
-          columnName: 'nopassCustoms',
-          columnLabel: '海关不通过\n(运单/件)',
-        },
-        {
-          columnName: 'nopassCustomsTime',
-          columnLabel: '海关不通过\n时间',
-        },
+        // {
+        //   columnName: 'nopassCustoms',
+        //   columnLabel: '海关不通过\n(运单/件)',
+        // },
+        // {
+        //   columnName: 'nopassCustomsTime',
+        //   columnLabel: '海关不通过\n时间',
+        // },
         {
           columnName: 'receiveSure1',
           columnLabel: '运抵货站\n(运单/件)',
@@ -332,14 +448,14 @@ const columnGroupsMap: {
           columnName: 'receiveSureTime',
           columnLabel: '运抵货站\n时间',
         },
-        {
-          columnName: 'returns2',
-          columnLabel: '退运\n(板卡/件)',
-        },
-        {
-          columnName: 'returnTime',
-          columnLabel: '退运时间',
-        },
+        // {
+        //   columnName: 'returns2',
+        //   columnLabel: '退运\n(板卡/件)',
+        // },
+        // {
+        //   columnName: 'returnTime',
+        //   columnLabel: '退运时间',
+        // },
         {
           columnName: 'securityYes',
           columnLabel: '安检放行\n(运单/件)',
@@ -356,14 +472,14 @@ const columnGroupsMap: {
           columnName: 'receiveSureResultTime',
           columnLabel: '收运核单\n时间',
         },
-        {
-          columnName: 'receiveSure_No',
-          columnLabel: '核单不通过\n(运单/件)',
-        },
-        {
-          columnName: 'receiveSureTime_No',
-          columnLabel: '核单不通过\n时间',
-        },
+        // {
+        //   columnName: 'receiveSure_No',
+        //   columnLabel: '核单不通过\n(运单/件)',
+        // },
+        // {
+        //   columnName: 'receiveSureTime_No',
+        //   columnLabel: '核单不通过\n时间',
+        // },
         {
           columnName: 'tally_out',
           columnLabel: '理货\n(板卡/运单/件)',
@@ -376,14 +492,14 @@ const columnGroupsMap: {
           columnName: 'planJoinTime',
           columnLabel: '计划交接\n时间',
         },
-        {
-          columnName: 'wait',
-          columnLabel: '待运区\n(板卡/件)',
-        },
-        {
-          columnName: 'waitTime',
-          columnLabel: '待运区\n时间',
-        },
+        // {
+        //   columnName: 'wait',
+        //   columnLabel: '待运区\n(板卡/件)',
+        // },
+        // {
+        //   columnName: 'waitTime',
+        //   columnLabel: '待运区\n时间',
+        // },
         {
           columnName: 'stowage',
           columnLabel: '预配载\n(板卡/件)',
@@ -400,14 +516,19 @@ const columnGroupsMap: {
           columnName: 'requestDepotJoinTime',
           columnLabel: '发起货站交接\n时间',
         },
-        {
-          columnName: 'depotJoin',
-          columnLabel: '货站交接\n(板卡/件)',
-        },
-        {
-          columnName: 'depotJoinTime',
-          columnLabel: '货站交接\n时间',
-        },
+      ],
+    },
+    {
+      groupName: '地服相关',
+      children: [
+        // {
+        //   columnName: 'depotJoin',
+        //   columnLabel: '货站交接\n(板卡/件)',
+        // },
+        // {
+        //   columnName: 'depotJoinTime',
+        //   columnLabel: '货站交接\n时间',
+        // },
         {
           columnName: 'resure',
           columnLabel: '运输前复核\n(板卡/件)',
@@ -449,113 +570,13 @@ const columnGroupsMap: {
           columnName: 'pullregisterTime',
           columnLabel: '拉下登记\n时间',
         },
-      ],
-    },
-  ],
-  ArrivalAirport: [
-    {
-      groupName: '航班相关',
-      children: [
-        {
-          columnName: 'IATACode',
-          columnLabel: '航司',
-          needFilters: 1,
-        },
-        {
-          columnName: 'flightNO',
-          columnLabel: '航班号',
-          needFilters: 1,
-        },
-        {
-          columnName: 'flightDate',
-          columnLabel: '执飞日期',
-        },
-        {
-          columnName: 'planLandingTime',
-          columnLabel: '降落时间',
-        },
-        {
-          columnName: 'target',
-          columnLabel: '目的站',
-          needFilters: 1,
-        },
-        {
-          columnName: 'landingStand',
-          columnLabel: '停机位',
-        },
-      ],
-    },
-    {
-      groupName: '货站相关',
-      children: [
-        {
-          columnName: 'speCargoInfo',
-          columnLabel: '特货信息',
-        },
-        {
-          columnName: 'preUnLoad',
-          columnLabel: '预计卸载数\n(运单/件)',
-        },
-        {
-          columnName: 'transOut',
-          columnLabel: '中转出\n(运单/件)',
-        },
-        {
-          columnName: 'receiveDiff',
-          columnLabel: '收货差异\n(板卡/件)',
-        },
-      ],
-    },
-    {
-      groupName: '地服相关',
-      children: [
-        // {
-        //   columnName: 'unloadBill',
-        //   columnLabel: '卸机单\n(板/箱/卡)',
-        // },
-        // {
-        //   columnName: 'unloadBillTime',
-        //   columnLabel: '卸机单确认\n时间',
-        // },
-        {
-          columnName: 'unLoad',
-          columnLabel: '卸机\n(板/箱/卡)',
-        },
-        {
-          columnName: 'unLoadTime',
-          columnLabel: '卸机时间',
-        },
-        {
-          columnName: 'planeDown',
-          columnLabel: '库区到达\n(板/箱/卡)',
-        },
-        {
-          columnName: 'planeDownTime_IN',
-          columnLabel: '库区到达\n时间',
-        },
-        {
-          columnName: 'depotJoin',
-          columnLabel: '货站交接\n(板/箱/卡)',
-        },
-        {
-          columnName: 'depotJoinTime_IN',
-          columnLabel: '货站交接\n时间',
-        },
-        {
-          columnName: 'tally',
-          columnLabel: '理货\n(运单/件/重量)',
-        },
-        {
-          columnName: 'tallyTime_in',
-          columnLabel: '理货时间',
-        },
         {
-          columnName: 'outWarehouse',
-          columnLabel: '出库\n(批/运单/件)',
+          columnName: 'pullSure',
+          columnLabel: '拉回确认\n(板卡/件)',
         },
         {
-          columnName: 'outWarehouseTime',
-          columnLabel: '出库时间',
+          columnName: 'pullSureTime',
+          columnLabel: '拉回确认\n时间',
         },
       ],
     },
@@ -591,31 +612,26 @@ const columnGroupsMap: {
           columnName: 'landingStand',
           columnLabel: '停机位',
         },
-      ],
-    },
-    {
-      groupName: '货站相关',
-      children: [
         {
           columnName: 'speCargoInfo',
           columnLabel: '特货信息',
         },
-        {
-          columnName: 'preUnLoad',
-          columnLabel: '预计卸载数\n(运单/件)',
-        },
-        {
-          columnName: 'transOut',
-          columnLabel: '中转出\n(运单/件)',
-        },
-        {
-          columnName: 'receiveDiff',
-          columnLabel: '收货差异\n(板卡/件)',
-        },
+        // {
+        //   columnName: 'preUnLoad',
+        //   columnLabel: '预计卸载数\n(运单/件)',
+        // },
+        // {
+        //   columnName: 'transOut',
+        //   columnLabel: '中转出\n(运单/件)',
+        // },
+        // {
+        //   columnName: 'receiveDiff',
+        //   columnLabel: '收货差异\n(板卡/件)',
+        // },
       ],
     },
     {
-      groupName: '地服相关',
+      groupName: '货站相关',
       children: [
         // {
         //   columnName: 'unloadBill',
@@ -641,6 +657,11 @@ const columnGroupsMap: {
           columnName: 'planeDownTime_IN',
           columnLabel: '机下交接\n时间',
         },
+      ],
+    },
+    {
+      groupName: '地服相关',
+      children: [
         {
           columnName: 'depotJoin',
           columnLabel: '货站交接\n(板/箱/卡)',
@@ -673,20 +694,25 @@ const columnGroupsMap: {
           columnName: 'outWarehouseTime',
           columnLabel: '出库时间',
         },
-        {
-          columnName: "concat(punishCustomsList_in,'/',punishCustoms_in)",
-          columnLabel: '海关罚没\n(运单/件)',
-        },
-        {
-          columnName: 'punishCustomsTime_in',
-          columnLabel: '海关罚没\n时间',
-        },
+        // {
+        //   columnName: "concat(punishCustomsList_in,'/',punishCustoms_in)",
+        //   columnLabel: '海关罚没\n(运单/件)',
+        // },
+        // {
+        //   columnName: 'punishCustomsTime_in',
+        //   columnLabel: '海关罚没\n时间',
+        // },
       ],
     },
   ],
 }
 
-const headerClassMap = ['bg-yellow', 'bg-green', 'bg-cyan']
+const headerClassMap = {
+  航班相关: 'bg-yellow',
+  运单相关: 'bg-purple',
+  货站相关: 'bg-green',
+  地服相关: 'bg-cyan',
+}
 
 const computedWidth = (column: SimpleColumn) => {
   let width = 0
@@ -700,9 +726,11 @@ const computedWidth = (column: SimpleColumn) => {
       width = realLength * 8
     }
   })
-  if (column.needFilters || column.needSort) {
-    width += 8
-  }
+  // 筛选/排序按钮宽度
+  // if (column.needFilters || column.needSort) {
+  //   width += 8
+  // }
+  width += 8
   // border
   return width + 1
 }
@@ -713,7 +741,7 @@ export function useAirportTable(name: string, formData: CommonData) {
   const getTableColumns = () => {
     const groups = columnGroupsMap[name]
     tableColumns.value = groups.reduce(
-      (columns: (CommonTableColumn & AnyColumn)[], group, groupIndex) => {
+      (columns: (CommonTableColumn & AnyColumn)[], group) => {
         group.children.forEach(column => {
           columns.push({
             key: column.columnName,
@@ -734,7 +762,7 @@ export function useAirportTable(name: string, formData: CommonData) {
             width: computedWidth(column),
             flexGrow: 1,
             align: 'center',
-            headerClass: headerClassMap[groupIndex],
+            headerClass: headerClassMap[group.groupName] ?? '',
             groupName: group.groupName,
             ...column,
           })

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

@@ -28,7 +28,10 @@ export function useFormatter(flag: Ref<boolean>) {
       }
     }
     if (columnName.includes('Time') && typeof cellData === 'string') {
-      return cellData.slice(5, -3).replace('T', '\n')
+      return cellData.trim().slice(5, -3).replace('T', '\n')
+    }
+    if (columnName === 'jiahuo') {
+      return cellData ? '是' : '否'
     }
     return cellData
   }

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

@@ -163,7 +163,7 @@ watch(
 )
 
 const formatter: CommonTableFormatter = (row, column, cellValue, index) => {
-  const value = String(cellValue ?? '')
+  const value = String(cellValue ?? '').trim()
   if (column.property.includes('Time')) {
     return value.replace('T', '\n')
   }

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

@@ -33,6 +33,7 @@
           :row-class-name="flightContainerRowClass"
           :cell-class-name="flightContainerCellClass"
           :column-props="{ formatter: tableFormatter }"
+          sequence
           @cell-click="flightContainerCellClickHandler"
         />
       </div>
@@ -145,7 +146,7 @@ const tableFormatter: CommonTableFormatter = (
   cellValue,
   index
 ) => {
-  const value = String(cellValue ?? '')
+  const value = String(cellValue ?? '').trim()
   if (
     column.property.includes('Time') ||
     [

src/views/realTime/hooks/useTable.ts

@@ -18,17 +18,17 @@ const tableColumnsMap: {
 } = {
   DepartureFlightContainer: [
     { columnLabel: '集装器编号', columnName: 'stowageNo', width: 120 },
-    { columnLabel: '运单数', columnName: 'list', width: 60, needCount: 1 },
+    { columnLabel: '配载运单', columnName: 'list', width: 60 },
     { columnLabel: '件数', columnName: 'number', width: 60, needCount: 1 },
     { columnLabel: '重量', columnName: 'weight', width: 60, needCount: 1 },
     {
-      columnLabel: '加货',
-      columnName: 'tally',
+      columnLabel: '拉下',
+      columnName: 'pull',
       className: 'cell-filter cell-filter-yellow',
     },
     {
-      columnLabel: '拉下',
-      columnName: 'pull',
+      columnLabel: '加货',
+      columnName: 'tally',
       className: 'cell-filter cell-filter-yellow',
     },
     // {
@@ -69,7 +69,7 @@ const tableColumnsMap: {
   ],
   DepartureFlightWaybill: [
     { columnLabel: '运单号', columnName: 'stockCode', width: 120 },
-    { columnLabel: '集装器数量', columnName: 'stowageNum', needCount: 1 },
+    { columnLabel: '集装器数量', columnName: 'stowageNum' },
     {
       columnLabel: '品名',
       columnName: 'typeCode',
@@ -77,12 +77,12 @@ const tableColumnsMap: {
       showOverflowTooltip: true,
     },
     { columnLabel: '特货信息', columnName: 'speCargoInfo' },
-    { columnLabel: '货物件数', columnName: 'luggageCount', needCount: 1 },
+    { columnLabel: '运单件数', columnName: 'luggageCount', needCount: 1 },
     { columnLabel: '货物重量', columnName: 'weight', needCount: 1 },
     { columnLabel: '拉下件数', columnName: 'pullNum', needCount: 1 },
     { columnLabel: '退运件数', columnName: 'returnNum', needCount: 1 },
     { columnLabel: '最新节点', columnName: 'nodeCode' },
-    { columnLabel: '最新位置', columnName: 'execPosition' },
+    // { columnLabel: '最新位置', columnName: 'execPosition' },
     { columnLabel: '处理结果', columnName: 'execResult' },
     { columnLabel: '处理时间', columnName: 'execTime', width: 130 },
     // { columnLabel: '中转进航班号', columnName: 'inFlightNO' },
@@ -247,12 +247,12 @@ const tableColumnsMap: {
     },
     { columnLabel: '特货信息', columnName: 'speCargoInfo', needCount: 1 },
     {
-      columnLabel: '进港报文货物件数',
+      columnLabel: '进港报文运单件数',
       columnName: 'messageCargos_in',
       needCount: 1,
     },
     {
-      columnLabel: '进港实际货物件数',
+      columnLabel: '进港实际运单件数',
       columnName: 'acCargos_in',
       needCount: 1,
     },
@@ -262,7 +262,7 @@ const tableColumnsMap: {
       needCount: 1,
     },
     { columnLabel: '最新节点', columnName: 'nodeCode' },
-    { columnLabel: '最新位置', columnName: 'execPosition' },
+    // { columnLabel: '最新位置', columnName: 'execPosition' },
     { columnLabel: '处理结果', columnName: 'execResult' },
     { columnLabel: '处理时间', columnName: 'execTime', width: 130 },
     // { columnLabel: '中转出航班号', columnName: 'transferFlightNO' },
@@ -418,17 +418,17 @@ const tableColumnsMap: {
   ],
   InternationalDepartureFlightContainer: [
     { columnLabel: '集装器编号', columnName: 'stowageNo', width: 120 },
-    { columnLabel: '运单数', columnName: 'list', width: 60, needCount: 1 },
+    { columnLabel: '配载运单', columnName: 'list', width: 60 },
     { columnLabel: '件数', columnName: 'number', width: 60, needCount: 1 },
     { columnLabel: '重量', columnName: 'weight', width: 60, needCount: 1 },
     {
-      columnLabel: '理货',
-      columnName: 'tally',
+      columnLabel: '拉下',
+      columnName: 'pull',
       className: 'cell-filter cell-filter-yellow',
     },
     {
-      columnLabel: '拉下',
-      columnName: 'pull',
+      columnLabel: '理货',
+      columnName: 'tally',
       className: 'cell-filter cell-filter-yellow',
     },
     // {
@@ -469,7 +469,7 @@ const tableColumnsMap: {
   ],
   InternationalDepartureFlightWaybill: [
     { columnLabel: '运单号', columnName: 'stockCode', width: 120 },
-    { columnLabel: '集装器数量', columnName: 'stowageNum', needCount: 1 },
+    { columnLabel: '集装器数量', columnName: 'stowageNum' },
     {
       columnLabel: '品名',
       columnName: 'typeCode',
@@ -477,12 +477,12 @@ const tableColumnsMap: {
       showOverflowTooltip: true,
     },
     { columnLabel: '特货信息', columnName: 'speCargoInfo' },
-    { columnLabel: '货物件数', columnName: 'luggageCount', needCount: 1 },
+    { columnLabel: '运单件数', columnName: 'luggageCount', needCount: 1 },
     { columnLabel: '货物重量', columnName: 'weight', needCount: 1 },
     { columnLabel: '拉下件数', columnName: 'pullNum', needCount: 1 },
     { columnLabel: '退运件数', columnName: 'returnNum', needCount: 1 },
     { columnLabel: '最新节点', columnName: 'nodeCode' },
-    { columnLabel: '最新位置', columnName: 'execPosition' },
+    // { columnLabel: '最新位置', columnName: 'execPosition' },
     { columnLabel: '处理结果', columnName: 'execResult' },
     { columnLabel: '处理时间', columnName: 'execTime', width: 130 },
     // { columnLabel: '中转进航班号', columnName: 'inFlightNO' },
@@ -602,12 +602,12 @@ const tableColumnsMap: {
     },
     { columnLabel: '特货信息', columnName: 'speCargoInfo', needCount: 1 },
     {
-      columnLabel: '进港报文货物件数',
+      columnLabel: '进港报文运单件数',
       columnName: 'messageCargos_in',
       needCount: 1,
     },
     {
-      columnLabel: '进港实际货物件数',
+      columnLabel: '进港实际运单件数',
       columnName: 'acCargos_in',
       needCount: 1,
     },
@@ -617,7 +617,7 @@ const tableColumnsMap: {
       needCount: 1,
     },
     { columnLabel: '最新节点', columnName: 'nodeCode' },
-    { columnLabel: '最新位置', columnName: 'execPosition' },
+    // { columnLabel: '最新位置', columnName: 'execPosition' },
     { columnLabel: '处理结果', columnName: 'execResult' },
     { columnLabel: '处理时间', columnName: 'execTime', width: 130 },
     { columnLabel: '中转出航班号', columnName: 'transferFlightNO' },
@@ -635,7 +635,12 @@ const tableColumnsMap: {
       needFilters: 1,
       width: 70,
     },
-    { columnLabel: '货物编码', columnName: 'cargoSN', needFilters: 1, width: 100 },
+    {
+      columnLabel: '货物编码',
+      columnName: 'cargoSN',
+      needFilters: 1,
+      width: 100,
+    },
     // { columnLabel: '中转', columnName: 'C2', needFilters: 1 },
     {
       columnLabel: '退运',