Merge branch 'master' of http://120.26.64.82:3000/BFFE/SZYGM1.0

src/components/SimpleTable/index.vue

@@ -22,16 +22,13 @@
     @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-for="column in tableColumns" :key="column.columnName" v-bind="computedColumnProps(column)">
       <template #header>
         <TableHeaderCell
           v-model:filter-values="filterValueMap[column.columnName]"
           v-model:sort-rule="tableDataSortRuleMap[column.columnName]"
           :label="column.columnLabel"
+          :desc="column.columnDescribe"
           :filter-options="filterOptionMap[column.columnName]"
           :sortable="!!column.needSort"
           filter-style="arrow"
@@ -49,30 +46,15 @@ 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'
@@ -97,12 +79,7 @@ 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
@@ -161,15 +138,12 @@ 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
     flexible?: boolean
+    scrollbarAlwaysOn?: boolean
     columnProps?: TableColumnProps<CommonData>
     columns: (CommonTableColumn & TableColumnProps<CommonData>)[]
   }>(),
@@ -248,12 +222,10 @@ watchEffect(() => {
   tableData.value = props.data
 })
 
-const {
-  filterOptionMap,
-  filterValueMap,
-  tableDataSortRuleMap,
-  dealedTableData,
-} = useTableFilterAndSort(tableColumns, tableData)
+const { filterOptionMap, filterValueMap, tableDataSortRuleMap, dealedTableData } = useTableFilterAndSort(
+  tableColumns,
+  tableData
+)
 
 const emit = defineEmits([
   'select',

src/components/TableHeaderCell/index.vue

@@ -1,89 +1,84 @@
 <template>
-  <div
-    :class="[
-      'table-header-cell',
-      'el-table-v2__header-cell-text',
-      'el-table__header-cell-text',
-      {
-        'table-header-cell-space-between':
-          (filterable && filterStyle === 'arrow') || sortable,
-      },
-    ]"
-  >
-    <template v-if="filterable && filterStyle === 'underline'">
-      <span :class="['filter-button-wrapper']">
-        <span
-          :class="['filter-button', { 'filter-button-active': active }]"
+  <el-tooltip :disabled="!desc" :content="desc">
+    <div
+      :class="[
+        'table-header-cell',
+        'el-table-v2__header-cell-text',
+        'el-table__header-cell-text',
+        {
+          'table-header-cell-space-between': (filterable && filterStyle === 'arrow') || sortable,
+        },
+      ]"
+    >
+      <template v-if="filterable && filterStyle === 'underline'">
+        <span :class="['filter-button-wrapper']">
+          <span
+            :class="['filter-button', { 'filter-button-active': active }]"
+            ref="buttonRef"
+            v-click-outside="clickOutsideHandler"
+            >{{ `${desc ? '*' : ''}${label}` }}</span
+          >
+        </span>
+      </template>
+      <template v-else>
+        <span style="flex: 1">{{ `${desc ? '*' : ''}${label}` }}</span>
+      </template>
+      <div v-if="(filterable && filterStyle === 'arrow') || sortable" class="button-wrapper">
+        <div
+          v-if="filterable && filterStyle === 'arrow'"
           ref="buttonRef"
           v-click-outside="clickOutsideHandler"
-          >{{ label }}</span
+          :class="['filter-arrow', { 'arrow-active': active, 'arrow-expand': expand }]"
         >
-      </span>
-    </template>
-    <template v-else>
-      <span style="flex: 1">{{ label }}</span>
-    </template>
-    <div
-      v-if="(filterable && filterStyle === 'arrow') || sortable"
-      class="button-wrapper"
-    >
-      <div
-        v-if="filterable && filterStyle === 'arrow'"
-        ref="buttonRef"
-        v-click-outside="clickOutsideHandler"
-        :class="[
-          'filter-arrow',
-          { 'arrow-active': active, 'arrow-expand': expand },
-        ]"
-      >
-        <el-icon>
-          <CaretBottom />
-        </el-icon>
-      </div>
-      <div v-if="sortable" class="sort-button" @click="sortChange">
-        <el-icon>
-          <SortUp v-show="sortRule === 'ascending'" />
-          <SortDown v-show="sortRule === 'descending'" />
-          <Sort v-show="!sortRule" />
-        </el-icon>
+          <el-icon>
+            <CaretBottom />
+          </el-icon>
+        </div>
+        <div v-if="sortable" class="sort-button" @click="sortChange">
+          <el-icon>
+            <SortUp v-show="sortRule === 'ascending'" />
+            <SortDown v-show="sortRule === 'descending'" />
+            <Sort v-show="!sortRule" />
+          </el-icon>
+        </div>
       </div>
+      <el-popover
+        ref="popoverRef"
+        :virtual-ref="buttonRef"
+        virtual-triggering
+        trigger="click"
+        :width="224"
+        class="table-header-cell-popover"
+        placement="bottom"
+        @show="expand = true"
+        @hide="expand = false"
+      >
+        <el-select
+          v-model="selections"
+          size="default"
+          placeholder="筛选"
+          multiple
+          filterable
+          default-first-option
+          collapse-tags
+          clearable
+          :teleported="false"
+          @change="
+            newVal => {
+              emit('update:filterValues', newVal)
+            }
+          "
+        >
+          <el-option
+            v-for="(option, index) in filterOptions"
+            :key="option.value + index"
+            :value="option.value"
+            :label="option.label"
+          />
+        </el-select>
+      </el-popover>
     </div>
-  </div>
-  <el-popover
-    ref="popoverRef"
-    :virtual-ref="buttonRef"
-    virtual-triggering
-    trigger="click"
-    :width="224"
-    class="table-header-cell-popover"
-    placement="bottom"
-    @show="expand = true"
-    @hide="expand = false"
-  >
-    <el-select
-      v-model="selections"
-      size="default"
-      placeholder="筛选"
-      multiple
-      filterable
-      default-first-option
-      collapse-tags
-      clearable
-      :teleported="false"
-      @change="
-        newVal => {
-          emit('update:filterValues', newVal)
-        }
-      "
-    >
-      <el-option
-        v-for="(option, index) in filterOptions"
-        :key="option.value + index"
-        :value="option.value"
-        :label="option.label"
-      />
-    </el-select>
-  </el-popover>
+  </el-tooltip>
 </template>
 
 <script setup lang="ts">
@@ -96,6 +91,10 @@ const props = defineProps({
     type: String,
     default: '',
   },
+  desc: {
+    type: String,
+    default: ''
+  },
   filterStyle: {
     type: String as PropType<'arrow' | 'underline'>,
     default: 'arrow',

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

@@ -17,17 +17,15 @@
         type="datetime"
         format="YYYY-MM-DD HH:mm"
         value-format="YYYY-MM-DD HH:mm"
+        :default-time="new Date('2000-01-01 23:59:59')"
+        :disabled-date="disabledEndTime"
         size="default"
         :prefix-icon="datePreTitle('结束')"
         :clearable="false"
       />
     </el-form-item>
     <el-form-item :prop="formData.flightStatus" style="width: 104px">
-      <el-select
-        v-model="formData.flightStatus"
-        size="default"
-        :clearable="false"
-      >
+      <el-select v-model="formData.flightStatus" size="default" :clearable="false">
         <el-option
           v-for="option in flightStatusOptions"
           :key="option.value"
@@ -37,11 +35,7 @@
       </el-select>
     </el-form-item>
     <el-form-item :prop="formData.flightWarning" style="width: 104px">
-      <el-select
-        v-model="formData.flightWarning"
-        size="default"
-        :clearable="false"
-      >
+      <el-select v-model="formData.flightWarning" size="default" :clearable="false">
         <el-option
           v-for="option in flightWarningOptions"
           :key="option.value"
@@ -50,16 +44,8 @@
         />
       </el-select>
     </el-form-item>
-    <el-form-item
-      v-if="name.includes('International')"
-      :prop="formData.waybillType"
-      style="width: 104px"
-    >
-      <el-select
-        v-model="formData.waybillType"
-        size="default"
-        :clearable="false"
-      >
+    <el-form-item v-if="name.includes('International')" :prop="formData.waybillType" style="width: 104px">
+      <el-select v-model="formData.waybillType" size="default" :clearable="false">
         <el-option
           v-for="option in waybillTypeOptions"
           :key="option.value"
@@ -73,6 +59,8 @@
 
 <script setup lang="tsx">
 import { parseTime } from '@/utils/validate'
+import { ElMessage } from 'element-plus'
+import { CommonData } from '~/common'
 
 const props = defineProps({
   name: {
@@ -83,20 +71,44 @@ const props = defineProps({
 
 const emit = defineEmits(['formDataChange'])
 
+const defaultStartTime = `${parseTime(new Date(), '{y}-{m}-{d}')} 00:00`
+const defaultEndTime = `${parseTime(new Date(), '{y}-{m}-{d}')} 23:59`
 const formData = reactive({
-  startDate: `${parseTime(new Date(), '{y}-{m}-{d}')} 00:00`,
-  endDate: `${parseTime(new Date(), '{y}-{m}-{d}')} 23:59`,
+  startDate: defaultStartTime,
+  endDate: defaultEndTime,
   flightStatus: '',
   flightWarning: '',
   waybillType: '',
 })
 watchEffect(() => {
-  const formatFormData = {}
+  if (!formData.startDate || !formData.endDate) {
+    return
+  }
+  const start = new Date(formData.startDate + ':00').getTime()
+  const end = new Date(formData.endDate + ':59').getTime()
+  if (start > end) {
+    ElMessage.warning('开始时间不能晚于结束时间')
+    formData.endDate = ''
+    return
+  }
+  if (start <= end - 2 * 24 * 60 * 60 * 1000) {
+    ElMessage.warning('间隔不能超过2天')
+    formData.endDate = ''
+    return
+  }
+  const formattedFormData: CommonData = {}
   Object.entries(formData).forEach(([key, value]) => {
-    formatFormData[key] = value === '' ? null : value
+    formattedFormData[key] = value === '' ? null : value
   })
-  emit('formDataChange', formatFormData)
+  formattedFormData.startDate = formData.startDate + ':00'
+  formattedFormData.endDate = formData.endDate + ':59'
+  emit('formDataChange', formattedFormData)
 })
+const disabledEndTime = endDate => {
+  const start = new Date(formData.startDate + ':00').getTime()
+  const end = new Date(endDate + ':59').getTime()
+  return start > end || start <= end - 2 * 24 * 60 * 60 * 1000
+}
 
 const datePreTitle = (title: string) => {
   return <div class="date-pre-title">{title}：</div>

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

@@ -21,10 +21,7 @@
           <CommonSwitch v-model:flag="UTCFlag" label="开启UTC" />
         </div>
         <div v-permission="getPermission('columnSet')">
-          <ColumnSet
-            :table-columns="tableColumns"
-            @checked-submit="columnChecked"
-          />
+          <ColumnSet :table-columns="tableColumns" @checked-submit="columnChecked" />
         </div>
       </div>
     </div>
@@ -46,16 +43,14 @@
                 v-model:filter-values="filterValueMap[column.columnName]"
                 v-model:sort-rule="tableDataSortRuleMap[column.columnName]"
                 :label="tableColumnFormatter(column.columnLabel)"
+                :desc="column.columnDescribe"
                 :filter-options="filterOptionMap[column.columnName]"
                 :sortable="column.needSort"
                 filter-style="arrow"
               />
             </template>
             <template #cell="slot: CellSlotProps">
-              <div
-                class="el-table-v2__cell-text"
-                @click="cellClickHandlerV2(slot)"
-              >
+              <div class="el-table-v2__cell-text" @click="cellClickHandlerV2(slot)">
                 <!-- <el-tooltip
                   v-if="slot.column.columnName.includes('Time')"
                   :content="tableDataFormatter(slot)"
@@ -68,18 +63,11 @@
             </template>
             <template #footer>
               <div class="table-footer">
-                <span class="table-footer-count"
-                  >航班总数：{{ tableDataCount.flightCount }}</span
-                >
-                <span class="table-footer-count"
-                  >货运航班总数：{{ tableDataCount.freightFlightCount }}</span
-                >
-                <span class="table-footer-count"
-                  >已装机总数：{{ tableDataCount.loadCount }}</span
-                >
-                <span class="table-footer-count"
-                  >已起飞总数：{{ tableDataCount.takeOffCount }}</span
-                >
+                <!-- <span class="table-footer-count">航班总数：{{ tableDataCount.flightCount }}</span> -->
+                <span class="table-footer-count">货运航班总数：{{ tableDataCount.freightFlightCount }}</span>
+                <span v-if="isDeparture" class="table-footer-count">已装机总数：{{ tableDataCount.loadCount }}</span>
+                <span v-else class="table-footer-count">已卸机总数：{{ tableDataCount.unloadCount }}</span>
+                <span class="table-footer-count">已起飞总数：{{ tableDataCount.takeOffCount }}</span>
               </div>
             </template>
           </el-table-v2>
@@ -130,37 +118,42 @@ const cellPropsGetter = params => ({
   class: cellClassV2(params),
 })
 
-const tableDataCount = computed(() => ({
-  waybillCount: tableData.value.reduce((count, current) => {
-    const countValue = current[isDeparture ? 'preLoad' : 'preUnload']
-    if (countValue) {
-      count += Number(String(countValue).split('/')[0])
-    }
-    return count
-  }, 0),
-  goodsCount: tableData.value.reduce((count, current) => {
-    const countValue = current[isDeparture ? 'preLoad' : 'preUnload']
-    if (countValue) {
-      count += Number(String(countValue).split('/')[1])
+const tableDataCount = computed(() =>
+  tableData.value.reduce(
+    (counts: { [x: string]: number }, current) => {
+      const preCount = current[isDeparture ? 'preLoad' : 'preUnload']
+      if (preCount) {
+        counts.waybillCount += Number(String(preCount).split('/')[0])
+        counts.goodsCount += Number(String(preCount).split('/')[1])
+      }
+      counts.flightCount++
+      const isFreight = tableColumns.value.some(column => column.groupName === '地服相关' && current[column.columnName])
+      if (isFreight) {
+        counts.freightFlightCount++
+      }
+      if (current.loadPlaneSure) {
+        counts.loadCount++
+      }
+      if (current.unLoad) {
+        counts.unloadCount++
+      }
+      return counts
+    },
+    {
+      waybillCount: 0,
+      goodsCount: 0,
+      flightCount: 0,
+      freightFlightCount: 0,
+      loadCount: 0,
+      unloadCount: 0,
+      takeOffCount: 0,
     }
-    return count
-  }, 0),
-  flightCount: tableData.value.length,
-  freightFlightCount: tableData.value.length,
-  loadCount: tableData.value.reduce((sum, current) => {
-    return current.loadPlaneSure ? sum + 1 : sum
-  }, 0),
-  takeOffCount: 0,
-}))
+  )
+)
 
 const { cellClickHandlerV2 } = useTableCellClick(props.name)
 
-const {
-  filterOptionMap,
-  filterValueMap,
-  tableDataSortRuleMap,
-  dealedTableData,
-} = useTableFilterAndSort(
+const { filterOptionMap, filterValueMap, tableDataSortRuleMap, dealedTableData } = useTableFilterAndSort(
   tableColumns,
   tableData,
   {},
@@ -169,26 +162,22 @@ const {
 
 const permissionMap = {
   DepartureAirport: {
-    count:
-      'number_of_pieces_displayed_in_domestic_departure_terminal_view_button',
+    count: 'number_of_pieces_displayed_in_domestic_departure_terminal_view_button',
     UTC: 'turn_on_utc_in_view_of_domestic_departure_terminal_button',
     columnSet: 'domestic_departure_terminal_view_column_setting_button',
   },
   InternationalDepartureAirport: {
-    count:
-      'number_of_pieces_displayed_in_international_departure_terminal_view_button',
+    count: 'number_of_pieces_displayed_in_international_departure_terminal_view_button',
     UTC: 'international_departure_terminal_view_opens_utc_button',
     columnSet: 'international_departure_terminal_view_column_setting_button',
   },
   ArrivalAirport: {
-    count:
-      'number_of_pieces_displayed_in_domestic_inbound_terminal_view_button',
+    count: 'number_of_pieces_displayed_in_domestic_inbound_terminal_view_button',
     UTC: 'turn_on_utc_in_view_of_domestic_inbound_terminal_button',
     columnSet: 'domestic_inbound_terminal_view_column_setting_button',
   },
   InternationalArrivalAirport: {
-    count:
-      'number_of_display_pieces_of_international_inbound_terminal_view_button',
+    count: 'number_of_display_pieces_of_international_inbound_terminal_view_button',
     UTC: 'the_view_of_international_inbound_terminal_opens_utc_button',
     columnSet: 'view_column_setting_of_international_inbound_terminal_button',
   },

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

@@ -64,10 +64,6 @@ const columnGroupsMap: {
           columnName: 'speCargoInfo',
           columnLabel: '特货信息',
         },
-        {
-          columnName: 'preLoad',
-          columnLabel: '预计装载数\n(运单/件)',
-        },
         {
           columnName: 'transIn',
           columnLabel: '中转进\n(运单/件)',
@@ -81,6 +77,10 @@ const columnGroupsMap: {
     {
       groupName: '地服相关',
       children: [
+        {
+          columnName: 'preLoad',
+          columnLabel: '运单申报\n(运单/件)',
+        },
         {
           columnName: 'receiveSure',
           columnLabel: '收运核单\n(运单/件/重量)',
@@ -168,23 +168,24 @@ const columnGroupsMap: {
         {
           columnName: 'planeDown',
           columnLabel: '机下交接\n(板卡/件)',
-        },
+          columnDescribe: '根据运输前复核计算所得',
+    },
         {
           columnName: 'planeDownTime',
           columnLabel: '机下交接\n时间',
         },
-        {
-          columnName: 'loadPlaneSure',
-          columnLabel: '装机\n(板卡/件)',
-        },
+        // {
+        //   columnName: 'loadPlaneSure',
+        //   columnLabel: '装机\n(板卡/件)',
+        // },
         {
           columnName: 'loadPlaneSureTime',
           columnLabel: '装机时间',
         },
-        {
-          columnName: 'loadPlane',
-          columnLabel: '关闭舱门\n(板卡/件)',
-        },
+        // {
+        //   columnName: 'loadPlane',
+        //   columnLabel: '关闭舱门\n(板卡/件)',
+        // },
         {
           columnName: 'loadPlaneTime',
           columnLabel: '关闭舱门\n时间',
@@ -403,6 +404,7 @@ const columnGroupsMap: {
         {
           columnName: 'planeDown',
           columnLabel: '机下交接\n(板卡/件)',
+          columnDescribe: '根据运输前复核计算所得',
         },
         {
           columnName: 'planeDownTime',
@@ -884,8 +886,8 @@ export function useAirportTable(name: string, formData: CommonData) {
         waybillType,
       } = formData
       const dataContent = [
-        startDate + ':00',
-        endDate + ':59',
+        startDate,
+        endDate,
         // flightStatus,
         // flightWarning
       ]

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

@@ -1,7 +1,7 @@
 <template>
   <div class="common-switch switch-wrapper">
     <el-switch
-      v-model="flag"
+      :model-value="flag"
       size="default"
       style="--el-switch-on-color: #ac014d; --el-switch-off-color: #b1b1b1"
       @change="updateFlag"
@@ -11,19 +11,20 @@
 </template>
 
 <script setup lang="ts">
+import { ElSwitch } from 'element-plus'
 const props = defineProps({
   flag: {
     type: Boolean,
-    required: true,
+    required: true
   },
   label: {
-    type: String,
-  },
+    type: String
+  }
 })
 
 const emit = defineEmits(['update:flag'])
 
-const updateFlag = (val: boolean) => {
+const updateFlag = (val: boolean | number | string) => {
   emit('update:flag', val)
 }
 </script>

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

@@ -20,6 +20,7 @@
         <SimpleTable
           :data="containerTableData"
           :columns="containerTableColumns"
+          scrollbar-always-on
           :row-class-name="flightContainerRowClass"
           :cell-class-name="flightContainerCellClass"
           @cell-click="flightContainerCellClickHandler"
@@ -177,7 +178,8 @@ const { cellClickHandler: flightWaybillCellClickHandler } = useTableCellClick(
     height: 345px;
     display: flex;
     .flight-info-wrapper {
-      flex: 1 1 1040px;
+      width: 1040px;
+      flex-shrink: 0;
       height: 100%;
       background: #410425;
       box-sizing: border-box;
@@ -219,6 +221,7 @@ const { cellClickHandler: flightWaybillCellClickHandler } = useTableCellClick(
       }
     }
     .container-list {
+      width: 0;
       flex: 1;
       height: 100%;
       margin-left: 16px;

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

@@ -150,8 +150,8 @@ const tableData = computed(() =>
       CargoSN,
       pullMark,
       returnMark,
-      transMark,
-      exceptionCustomsMark,
+      // transMark,
+      // exceptionCustomsMark,
       execPosition, // 读取位置
       nodeCode, // 节点名称
       ConsignmentItemPackagingQuantityQuantity, // 跟踪节点件数

src/views/realTime/hooks/useTable.ts

@@ -20,7 +20,7 @@ const tableColumnsMap: {
     { columnLabel: '运单数', columnName: 'list', width: 60, needCount: 1 },
     { columnLabel: '件数', columnName: 'number', width: 60, needCount: 1 },
     {
-      columnLabel: '理货',
+      columnLabel: '加货',
       columnName: 'tally',
       className: 'cell-filter cell-filter-yellow',
     },
@@ -29,9 +29,14 @@ const tableColumnsMap: {
       columnName: 'pull',
       className: 'cell-filter cell-filter-yellow',
     },
+    // {
+    //   columnLabel: '待运区',
+    //   columnName: 'wait',
+    //   className: 'cell-filter cell-filter-yellow',
+    // },
     {
-      columnLabel: '待运区',
-      columnName: 'wait',
+      columnLabel: '预配载',
+      columnName: 'stowage',
       className: 'cell-filter cell-filter-yellow',
     },
     {
@@ -39,6 +44,11 @@ const tableColumnsMap: {
       columnName: 'depot',
       className: 'cell-filter cell-filter-yellow',
     },
+    {
+      columnLabel: '运输前复核',
+      columnName: 'resure',
+      className: 'cell-filter cell-filter-yellow',
+    },
     {
       columnLabel: '机下交接',
       columnName: 'planeDown',
@@ -49,6 +59,11 @@ const tableColumnsMap: {
       columnName: 'loadPlane',
       className: 'cell-filter cell-filter-yellow',
     },
+    {
+      columnLabel: '拉回确认',
+      columnName: 'pullSure',
+      className: 'cell-filter cell-filter-yellow',
+    },
   ],
   DepartureFlightWaybill: [
     { columnLabel: '运单号', columnName: 'stockCode', width: 120 },
@@ -56,7 +71,7 @@ const tableColumnsMap: {
     {
       columnLabel: '品名',
       columnName: 'typeCode',
-      width: 160,
+      width: 300,
       showOverflowTooltip: true,
     },
     { columnLabel: '特货信息', columnName: 'speCargoInfo' },
@@ -67,13 +82,13 @@ const tableColumnsMap: {
     { columnLabel: '最新位置', columnName: 'execPosition' },
     { columnLabel: '处理结果', columnName: 'execResult' },
     { columnLabel: '处理时间', columnName: 'execTime', width: 130 },
-    { columnLabel: '中转进航班号', columnName: 'inFlightNO' },
-    {
-      columnLabel: '中转航班降落时间',
-      columnName: 'inFlightNOLandTime',
-      width: 130,
-    },
-    { columnLabel: '装载序号', columnName: 'queueNo' },
+    // { columnLabel: '中转进航班号', columnName: 'inFlightNO' },
+    // {
+    //   columnLabel: '中转航班降落时间',
+    //   columnName: 'inFlightNOLandTime',
+    //   width: 130,
+    // },
+    // { columnLabel: '装载序号', columnName: 'queueNo' },
   ],
   DepartureWaybillGoods: [
     {
@@ -106,11 +121,11 @@ const tableColumnsMap: {
       columnName: 'ACC_CHECK',
       className: 'cell-filter cell-filter-green',
     },
-    {
-      columnLabel: '拒运',
-      columnName: 'ACC_CHECK_2',
-      className: 'cell-filter cell-filter-green',
-    },
+    // {
+    //   columnLabel: '拒运',
+    //   columnName: 'ACC_CHECK_2',
+    //   className: 'cell-filter cell-filter-green',
+    // },
     {
       columnLabel: '安检',
       columnName: '安检',
@@ -118,17 +133,27 @@ const tableColumnsMap: {
     },
     {
       columnLabel: '加货',
-      columnName: 'LS_CARGO',
+      columnName: 'ACC_BUP',
       className: 'cell-filter cell-filter-green',
     },
     {
-      columnLabel: '待运区',
-      columnName: 'WAT_LOC',
+      columnLabel: '预配载',
+      columnName: 'LS_CARGO',
       className: 'cell-filter cell-filter-green',
     },
+    // {
+    //   columnLabel: '待运区',
+    //   columnName: 'WAT_LOC',
+    //   className: 'cell-filter cell-filter-green',
+    // },
     {
       columnLabel: '货站交接',
-      columnName: 'CARGOS_DEP_ULD_HANDOVER',
+      columnName: 'CARGOS_HANDOVER_STATUS_02',
+      className: 'cell-filter cell-filter-green',
+    },
+    {
+      columnLabel: '运输前复核',
+      columnName: 'CARGOS_HANDOVER_STATUS_03',
       className: 'cell-filter cell-filter-green',
     },
     {
@@ -142,12 +167,17 @@ const tableColumnsMap: {
       className: 'cell-filter cell-filter-green',
     },
     {
-      columnLabel: '拉下',
+      columnLabel: '关闭舱门',
+      columnName: '关闭舱门',
+      className: 'cell-filter cell-filter-green',
+    },
+    {
+      columnLabel: '拉下登记',
       columnName: 'CARGOS_OFFLOAD',
       className: 'cell-filter cell-filter-green',
     },
     {
-      columnLabel: '拉回',
+      columnLabel: '拉回确认',
       columnName: 'OFFLOAD_CONFIRM',
       className: 'cell-filter cell-filter-green',
     },
@@ -168,7 +198,7 @@ const tableColumnsMap: {
     },
     {
       columnLabel: '机下交接',
-      columnName: 'CARGOS_HANDOVER_STATUS',
+      columnName: 'CARGOS_HANDOVER_STATUS_01',
       className: 'cell-filter cell-filter-cyan',
     },
     {
@@ -183,7 +213,7 @@ const tableColumnsMap: {
     },
     {
       columnLabel: '出库',
-      columnName: 'FSU_DLV',
+      columnName: 'FSUDLV',
       className: 'cell-filter cell-filter-cyan',
     },
   ],
@@ -209,7 +239,7 @@ const tableColumnsMap: {
     {
       columnLabel: '品名',
       columnName: 'typeCode',
-      width: 160,
+      width: 300,
       showOverflowTooltip: true,
     },
     { columnLabel: '特货信息', columnName: 'speCargoInfo', needCount: 1 },
@@ -227,13 +257,13 @@ const tableColumnsMap: {
     { columnLabel: '最新位置', columnName: 'execPosition' },
     { columnLabel: '处理结果', columnName: 'execResult' },
     { columnLabel: '处理时间', columnName: 'execTime', width: 130 },
-    { columnLabel: '中转出航班号', columnName: 'transferFlightNO' },
-    {
-      columnLabel: '中转航班起飞时间',
-      columnName: 'transferFlightDepTime',
-      width: 130,
-    },
-    { columnLabel: '装载序号', columnName: 'queueNo' },
+    // { columnLabel: '中转出航班号', columnName: 'transferFlightNO' },
+    // {
+    //   columnLabel: '中转航班起飞时间',
+    //   columnName: 'transferFlightDepTime',
+    //   width: 130,
+    // },
+    // { columnLabel: '装载序号', columnName: 'queueNo' },
   ],
   ArrivalWaybillGoods: [
     {
@@ -248,7 +278,7 @@ const tableColumnsMap: {
       width: 100,
       needFilters: 1,
     },
-    { columnLabel: '中转', columnName: 'transMark', needFilters: 1 },
+    // { columnLabel: '中转', columnName: 'transMark', needFilters: 1 },
     { columnLabel: '拉下', columnName: 'pullMark', needFilters: 1, width: 60 },
     {
       columnLabel: '退运',
@@ -278,7 +308,7 @@ const tableColumnsMap: {
     },
     {
       columnLabel: '出库',
-      columnName: 'FSU_DLV',
+      columnName: 'FSUDLV',
       className: 'cell-filter cell-filter-cyan',
     },
     {
@@ -291,11 +321,11 @@ const tableColumnsMap: {
       columnName: 'ACC_CHECK',
       className: 'cell-filter cell-filter-green',
     },
-    {
-      columnLabel: '拒运',
-      columnName: 'ACC_CHECK_2',
-      className: 'cell-filter cell-filter-green',
-    },
+    // {
+    //   columnLabel: '拒运',
+    //   columnName: 'ACC_CHECK_2',
+    //   className: 'cell-filter cell-filter-green',
+    // },
     {
       columnLabel: '安检',
       columnName: '安检',
@@ -307,13 +337,23 @@ const tableColumnsMap: {
       className: 'cell-filter cell-filter-green',
     },
     {
-      columnLabel: '待运区',
-      columnName: 'WAT_LOC',
+      columnLabel: '预配载',
+      columnName: 'LS_CARGO',
       className: 'cell-filter cell-filter-green',
     },
+    // {
+    //   columnLabel: '待运区',
+    //   columnName: 'WAT_LOC',
+    //   className: 'cell-filter cell-filter-green',
+    // },
     {
       columnLabel: '货站交接',
-      columnName: 'CARGOS_DEP_ULD_HANDOVER',
+      columnName: 'CARGOS_HANDOVER_STATUS_02',
+      className: 'cell-filter cell-filter-green',
+    },
+    {
+      columnLabel: '运输前复核',
+      columnName: 'CARGOS_HANDOVER_STATUS_03',
       className: 'cell-filter cell-filter-green',
     },
     {
@@ -327,12 +367,17 @@ const tableColumnsMap: {
       className: 'cell-filter cell-filter-green',
     },
     {
-      columnLabel: '拉下',
+      columnLabel: '关闭舱门',
+      columnName: '关闭舱门',
+      className: 'cell-filter cell-filter-green',
+    },
+    {
+      columnLabel: '拉下登记',
       columnName: 'CARGOS_OFFLOAD',
       className: 'cell-filter cell-filter-green',
     },
     {
-      columnLabel: '拉回',
+      columnLabel: '拉回确认',
       columnName: 'OFFLOAD_CONFIRM',
       className: 'cell-filter cell-filter-green',
     },

src/views/realTime/hooks/useTrackData.ts

@@ -35,15 +35,25 @@ const trackNodesMap = {
     },
     {
       name: '加货',
-      nodeCode: 'LS_CARGO',
+      nodeCode: 'ACC_BUP',
     },
     {
-      name: '待运区',
-      nodeCode: 'WAT_LOC',
+      name: '预配载',
+      nodeCode: 'LS_CARGO',
     },
+    // {
+    //   name: '待运区',
+    //   nodeCode: 'WAT_LOC',
+    // },
     {
       name: '货站交接',
-      nodeCode: 'CARGOS_DEP_ULD_HANDOVER',
+      // nodeCode: 'CARGOS_DEP_ULD_HANDOVER',
+      nodeCode: 'CARGOS_HANDOVER_STATUS_02',
+    },
+    {
+      name: '运输前复核',
+      nodeCode: 'CARGOS_HANDOVER_STATUS_03',
+      labelWidth: 70,
     },
     {
       name: '机下交接',
@@ -54,11 +64,15 @@ const trackNodesMap = {
       nodeCode: '装载完成',
     },
     {
-      name: '拉下',
+      name: '关闭舱门',
+      nodeCode: '关闭舱门',
+    },
+    {
+      name: '拉下登记',
       nodeCode: 'CARGOS_OFFLOAD',
     },
     {
-      name: '拉回',
+      name: '拉回确认',
       nodeCode: 'OFFLOAD_CONFIRM',
     },
     // {
@@ -77,7 +91,7 @@ const trackNodesMap = {
     },
     {
       name: '机下交接',
-      nodeCode: 'CARGOS_HANDOVER_STATUS',
+      nodeCode: 'CARGOS_HANDOVER_STATUS_01',
     },
     {
       name: '货站交接',
@@ -89,7 +103,7 @@ const trackNodesMap = {
     },
     {
       name: '出库',
-      nodeCode: 'FSU_DLV',
+      nodeCode: 'FSUDLV',
     },
   ],
   internationalDeparture: [],