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

src/views/BasicsData/airportCompany/index.vue

@@ -89,6 +89,7 @@ import DataTable from "@/components/tableTemp/index.vue";
 import Minheader from "@/components/minheader/index.vue";
 import Dialog from "@/components/dialog/index.vue";
 import { Query, GeneralDataReception } from "@/api/webApi";
+import * as _ from "lodash";
 import { ElMessage } from "element-plus";
 const formRules = useElement().formRules;
 const page = ref<number>(0); //分页参数
@@ -103,6 +104,7 @@ const flag = ref<Boolean>(false); //弹窗开关
 const type = ref<String>(""); //判断是否删除
 const msgTitle = ref<String>("新增机场公司维护"); //弹窗标题
 const tableOptionser = ref([]); //弹窗下拉
+const tableOptionCopys = ref([]); //弹窗下拉
 const tableColsCopys = reactive([]); //弹窗
 const tableForm = reactive({
   companyName: "",
@@ -162,6 +164,13 @@ const btnClick = (row, index, param) => {
     tableForm.parentID = index.parentID;
     tableForm.companyDesc = index.companyDesc;
     tableForm.companyID = index.companyID;
+    tableOptionser.value = [];
+    tableOptionCopys.value.forEach((element) => {
+      if (element.k !== index.companyName) {
+        tableOptionser.value.push(element);
+      }
+    });
+    console.log(tableOptionser);
   } else if (param === 3) {
     msgTitle.value = "删除机场公司维护";
     flag.value = true;
@@ -186,6 +195,7 @@ const getSelectData = async (id, name) => {
   });
   if (code == 0) {
     tableOptionser.value = returnData.listValues;
+    tableOptionCopys.value = _.cloneDeep(returnData.listValues);
   } else {
     tableOptionser.value = [];
   }

src/views/BasicsData/airportInfo/airportInfoChild/index.vue

@@ -47,7 +47,7 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col>
+              <!-- <el-col>
                 <el-form-item
                   label="区域编码"
                   size="default"
@@ -59,7 +59,7 @@
                     placeholder="请输入区域编码"
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
               <!-- <el-col>
                 <el-form-item
                   label="机场三字码"

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

@@ -86,17 +86,16 @@ const emit = defineEmits(['formDataChange'])
 const formData = reactive({
   startDate: `${parseTime(new Date(), '{y}-{m}-{d}')} 00:00`,
   endDate: `${parseTime(new Date(), '{y}-{m}-{d}')} 23:59`,
-  flightStatus: null,
-  flightWarning: null,
-  waybillType: null,
+  flightStatus: '',
+  flightWarning: '',
+  waybillType: '',
 })
 watchEffect(() => {
-  Object.keys(formData).forEach(key => {
-    if (formData[key] === '') {
-      formData[key] = null
-    }
+  const formatFormData = {}
+  Object.entries(formData).forEach(([key, value]) => {
+    formatFormData[key] = value === '' ? null : value
   })
-  emit('formDataChange', formData)
+  emit('formDataChange', formatFormData)
 })
 
 const datePreTitle = (title: string) => {
@@ -106,7 +105,7 @@ const datePreTitle = (title: string) => {
 const flightStatusOptions = ref([
   {
     label: '全部航班',
-    value: null,
+    value: '',
   },
   {
     label: '已起飞',
@@ -124,7 +123,7 @@ const flightStatusOptions = ref([
 const flightWarningOptions = ref([
   {
     label: '全部航班',
-    value: null,
+    value: '',
   },
   {
     label: '正常航班',
@@ -142,7 +141,7 @@ const flightWarningOptions = ref([
 const waybillTypeOptions = ref([
   {
     label: '全部运单',
-    value: null,
+    value: '',
   },
   {
     label: '国际货物',

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

@@ -67,34 +67,15 @@
             border-bottom: 2px solid #e83f82;
           }
           .el-table-v2__row-cell {
-            position: relative;
-            .el-table-v2__cell-text {
-              .cell-text {
-                position: relative;
-                z-index: 1;
-              }
-              .cell-background {
-                content: '';
-                width: 100%;
-                height: 100%;
-                position: absolute;
-                top: 0;
-                left: 0;
-                z-index: 0;
-                display: none;
-              }
-              &.cell-warning .cell-background {
-                display: block;
-                background-color: #f6cda5;
-              }
-              &.cell-alarm .cell-background {
-                display: block;
-                background-color: #f38080;
-              }
-              &.cell-click {
-                color: #2d67e3;
-                cursor: pointer;
-              }
+            &.cell-warning {
+              background-color: #f6cda5;
+            }
+            &.cell-alarm {
+              background-color: #f38080;
+            }
+            &.cell-click .el-table-v2__cell-text {
+              color: #2d67e3;
+              cursor: pointer;
             }
           }
         }

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

@@ -30,8 +30,10 @@
             :data="dealedTableData"
             :width="width"
             :height="height"
+            :fixed="name.includes('Departure')"
             :footer-height="60"
             :row-class="rowClassV2"
+            :cell-props="cellPropsGetter"
           >
             <template #header-cell="slot: HeaderCellSlotProps">
               <TableHeaderCell
@@ -44,11 +46,11 @@
               />
             </template>
             <template #cell="slot: CellSlotProps">
-              <div :class="cellClassV2(slot)" @click="cellClickHandlerV2(slot)">
-                <span class="cell-text">
-                  {{ slot.rowData[slot.column.columnName] }}
-                </span>
-                <div class="cell-background" />
+              <div
+                class="el-table-v2__cell-text"
+                @click="cellClickHandlerV2(slot)"
+              >
+                {{ slot.rowData[slot.column.columnName] }}
               </div>
             </template>
             <template #footer>
@@ -106,6 +108,9 @@ const UTCFlag = ref(true)
 const { tableColumns, tableData } = useAirportTable(props.name, formData)
 const { columnChecked } = useTableColumnSet(tableColumns)
 const { rowClassV2, cellClassV2 } = useTableStyle(props.name)
+const cellPropsGetter = params => ({
+  class: cellClassV2(params),
+})
 
 const tableDataCount = computed(() => ({
   waybillCount: tableData.value.length,

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

@@ -1,7 +1,12 @@
 import { Query } from '@/api/webApi'
 import { CommonData, CommonTableColumn } from '~/common'
 
-const columnGroupsMap = {
+const columnGroupsMap: {
+  [x: string]: {
+    groupName: string
+    children: { columnName: string; columnLabel: string; [x: string]: any }[]
+  }[]
+} = {
   departure: [
     {
       groupName: '航班相关',
@@ -9,6 +14,7 @@ const columnGroupsMap = {
         {
           columnName: 'flightNO',
           columnLabel: '航班号',
+          needFilters: 1,
         },
         {
           columnName: 'flightDate',
@@ -21,6 +27,7 @@ const columnGroupsMap = {
         {
           columnName: 'landingAirport',
           columnLabel: '目的站',
+          needFilters: 1,
         },
         {
           columnName: 'takeOffStand',
@@ -64,26 +71,50 @@ const columnGroupsMap = {
           columnName: 'C5',
           columnLabel: '收运核单\n(运单/件/重量)',
         },
+        {
+          columnName: 'C5_time',
+          columnLabel: '收运核单\n时间',
+        },
         {
           columnName: 'C6',
           columnLabel: '查验\n(拒运/查验)',
         },
+        {
+          columnName: 'C6_time',
+          columnLabel: '查验时间',
+        },
         {
           columnName: 'C7',
           columnLabel: '安检\n(运单/件)',
         },
+        {
+          columnName: 'C7_time',
+          columnLabel: '安检时间',
+        },
         {
           columnName: 'C8',
           columnLabel: '加货\n(运单/板卡/件/重量)',
         },
+        {
+          columnName: 'C8_time',
+          columnLabel: '加货时间',
+        },
         {
           columnName: 'C9',
           columnLabel: '待运区\n(板卡/件)',
         },
+        {
+          columnName: 'C9_time',
+          columnLabel: '待运区时间',
+        },
         {
           columnName: 'C10',
           columnLabel: '配载\n(板卡/件)',
         },
+        {
+          columnName: 'C10_time',
+          columnLabel: '配载时间',
+        },
         {
           columnName: 'C11',
           columnLabel: '计划交接\n时间',
@@ -92,26 +123,50 @@ const columnGroupsMap = {
           columnName: 'C12',
           columnLabel: '货站交接\n(板卡/件)',
         },
+        {
+          columnName: 'C12_time',
+          columnLabel: '货站交接\n时间',
+        },
         {
           columnName: 'C13',
           columnLabel: '运输前复核\n(板卡/件)',
         },
+        {
+          columnName: 'C13_time',
+          columnLabel: '运输前复核\n时间',
+        },
         {
           columnName: 'C14',
           columnLabel: '机下交接\n(板卡/件)',
         },
+        {
+          columnName: 'C14_time',
+          columnLabel: '机下交接\n时间',
+        },
         {
           columnName: 'C15',
           columnLabel: '装机\n(板卡/件)',
         },
+        {
+          columnName: 'C15_time',
+          columnLabel: '装机时间',
+        },
         {
           columnName: 'C16',
           columnLabel: '拉货登记\n(板卡/件)',
         },
+        {
+          columnName: 'C16_time',
+          columnLabel: '拉货登记\n时间',
+        },
         {
           columnName: 'C17',
           columnLabel: '拉回确认\n(板卡/件)',
         },
+        {
+          columnName: 'C17_time',
+          columnLabel: '拉回确认\n时间',
+        },
       ],
     },
   ],
@@ -122,6 +177,7 @@ const columnGroupsMap = {
         {
           columnName: 'flightNO',
           columnLabel: '航班号',
+          needFilters: 1,
         },
         {
           columnName: 'flightDate',
@@ -134,6 +190,7 @@ const columnGroupsMap = {
         {
           columnName: 'landingAirport',
           columnLabel: '目的站',
+          needFilters: 1,
         },
         {
           columnName: 'landingStand',
@@ -169,288 +226,103 @@ const columnGroupsMap = {
           columnName: 'C5',
           columnLabel: '卸机\n(板/箱/卡)',
         },
+        {
+          columnName: 'C5_time',
+          columnLabel: '卸机时间',
+        },
         {
           columnName: 'C6',
           columnLabel: '机下交接\n(板/箱/卡)',
         },
+        {
+          columnName: 'C6_time',
+          columnLabel: '机下交接\n时间',
+        },
         {
           columnName: 'C7',
           columnLabel: '货站交接\n(板/箱/卡)',
         },
         {
-          columnName: 'C8',
-          columnLabel: '理货\n(板卡/运单/件/重量)',
+          columnName: 'C7_time',
+          columnLabel: '货站交接\n时间',
+        },
+        {
+          columnName: 'C8_time',
+          columnLabel: '理货时间',
         },
         {
           columnName: 'C9',
           columnLabel: '出库\n(批/运单/件)',
         },
+        {
+          columnName: 'C9_time',
+          columnLabel: '出库时间',
+        },
       ],
     },
   ],
 }
 
 const simulateTableDataMap = {
-  DepartureAirport: [
-    {
-      flightNO: 'ZH3423',
-      flightDate: '2022/09/10',
-      planDepartureTime: '22/09/10 12:01',
-      landingAirport: '-NGK-PEK',
-      takeOffStand: '84',
-      inFlightNO: 'HU2451',
-      planLandingTime: '2022/09/10 11:01',
-      C1: '锂2/冷1',
-      C2: '365/536',
-      C3: '1/2',
-      C4: '',
-      C5: '364/534/1254KG',
-      C6: '0/7',
-      C7: '364/534',
-      C8: '8/365/536/1254KG',
-      C9: '8/536',
-      C10: '8/536',
-      C11: '11:45',
-      C12: '8/536',
-      C13: '8/536',
-      C14: '8/536',
-      C15: '8/536',
-      C16: '0/358/5',
-      C17: '0/5',
-    },
-    {
-      flightNO: 'CA1512',
-      flightDate: '2022/09/10',
-      planDepartureTime: '22/09/10 12:01',
-      landingAirport: '-NGK-PEK',
-      takeOffStand: '84',
-      inFlightNO: 'HU2451',
-      planLandingTime: '2022/09/10 11:01',
-      C1: '锂2/冷1',
-      C2: '365/536',
-      C3: '1/2',
-      C4: '',
-      C5: '364/534/1254KG',
-      C6: '0/7',
-      C7: '364/534',
-      C8: '8/365/536/1254KG',
-      C9: '4/243',
-      C10: '8/536',
-      C11: '11:45',
-      C12: '8/536',
-      C13: '8/536',
-      C14: '8/536',
-      C15: '8/536',
-      C16: '0/358/5',
-      C17: '0/5',
-    },
-    {
-      flightNO: 'ZH3456',
-      flightDate: '2022/09/10',
-      planDepartureTime: '22/09/10 12:01',
-      landingAirport: '-NGK-PEK',
-      takeOffStand: '84',
-      inFlightNO: 'HU2451',
-      planLandingTime: '2022/09/10 11:01',
-      C1: '锂2/冷1',
-      C2: '365/536',
-      C3: '1/2',
-      C4: '',
-      C5: '364/534/1254KG',
-      C6: '0/7',
-      C7: '364/534',
-      C8: '8/365/536/1254KG',
-      C9: '8/536',
-      C10: '5/357',
-      C11: '11:45',
-      C12: '8/536',
-      C13: '8/536',
-      C14: '8/536',
-      C15: '8/536',
-      C16: '0/358/5',
-      C17: '0/5',
-    },
-  ],
-  ArrivalAirport: [
-    {
-      flightNO: 'ZH3423',
-      flightDate: '2022/09/10',
-      planLandingTime: '22/09/10 12:01',
-      landingAirport: 'NKG-PEK-',
-      landingStand: '84',
-      C1: '锂2/冷1',
-      C2: '363/543',
-      C3: '',
-      C4: '0/6',
-      C5: '8/8/8',
-      C6: '8/8/8',
-      C7: '8/8/8',
-      C8: '8/363/537/1254KG',
-      C9: '3/363/537',
-    },
-    {
-      flightNO: 'CA1512',
-      flightDate: '2022/09/10',
-      planLandingTime: '22/09/10 12:01',
-      landingAirport: 'NKG-PEK-',
-      landingStand: '84',
-      C1: '锂2/冷1',
-      C2: '363/543',
-      C3: '',
-      C4: '',
-      C5: '8/8/8',
-      C6: '8/8/8',
-      C7: '8/8/8',
-      C8: '8/363/537/1254KG',
-      C9: '3/363/537',
-    },
-    {
-      flightNO: 'ZH3456',
-      flightDate: '2022/09/10',
-      planLandingTime: '22/09/10 12:01',
-      landingAirport: 'NKG-PEK-',
-      landingStand: '84',
-      C1: '锂2/冷1',
-      C2: '363/543',
-      C3: '',
-      C4: '',
-      C5: '8/8/8',
-      C6: '8/8/8',
-      C7: '8/8/8',
-      C8: '8/363/537/1254KG',
-      C9: '3/363/537',
-    },
-  ],
-  InternationalDepartureAirport: [
-    {
-      flightNO: 'ZH3423',
-      flightDate: '2022/09/10',
-      planDepartureTime: '22/09/10 12:01',
-      landingAirport: '-NGK-PEK',
-      takeOffStand: '84',
-      inFlightNO: 'HU2451',
-      planLandingTime: '2022/09/10 11:01',
-      C1: '锂2/冷1',
-      C2: '365/536',
-      C3: '1/2',
-      C4: '',
-      C5: '364/534/1254KG',
-      C6: '0/7',
-      C7: '364/534',
-      C8: '8/365/536/1254KG',
-      C9: '8/536',
-      C10: '8/536',
-      C11: '11:45',
-      C12: '8/536',
-      C13: '8/536',
-      C14: '8/536',
-      C15: '8/536',
-      C16: '0/358/5',
-      C17: '0/5',
-    },
-    {
-      flightNO: 'CA1512',
-      flightDate: '2022/09/10',
-      planDepartureTime: '22/09/10 12:01',
-      landingAirport: '-NGK-PEK',
-      takeOffStand: '84',
-      inFlightNO: 'HU2451',
-      planLandingTime: '2022/09/10 11:01',
-      C1: '锂2/冷1',
-      C2: '365/536',
-      C3: '1/2',
-      C4: '',
-      C5: '364/534/1254KG',
-      C6: '0/7',
-      C7: '364/534',
-      C8: '8/365/536/1254KG',
-      C9: '4/243',
-      C10: '8/536',
-      C11: '11:45',
-      C12: '8/536',
-      C13: '8/536',
-      C14: '8/536',
-      C15: '8/536',
-      C16: '0/358/5',
-      C17: '0/5',
-    },
-    {
-      flightNO: 'ZH3456',
-      flightDate: '2022/09/10',
-      planDepartureTime: '22/09/10 12:01',
-      landingAirport: '-NGK-PEK',
-      takeOffStand: '84',
-      inFlightNO: 'HU2451',
-      planLandingTime: '2022/09/10 11:01',
-      C1: '锂2/冷1',
-      C2: '365/536',
-      C3: '1/2',
-      C4: '',
-      C5: '364/534/1254KG',
-      C6: '0/7',
-      C7: '364/534',
-      C8: '8/365/536/1254KG',
-      C9: '8/536',
-      C10: '5/357',
-      C11: '11:45',
-      C12: '8/536',
-      C13: '8/536',
-      C14: '8/536',
-      C15: '8/536',
-      C16: '0/358/5',
-      C17: '0/5',
-    },
-  ],
-  InternationalArrivalAirport: [
-    {
-      flightNO: 'ZH3423',
-      flightDate: '2022/09/10',
-      planLandingTime: '22/09/10 12:01',
-      landingAirport: 'NKG-PEK-',
-      landingStand: '84',
-      C1: '锂2/冷1',
-      C2: '363/543',
-      C3: '',
-      C4: '0/6',
-      C5: '8/8/8',
-      C6: '8/8/8',
-      C7: '8/8/8',
-      C8: '8/363/537/1254KG',
-      C9: '3/363/537',
-    },
-    {
-      flightNO: 'CA1512',
-      flightDate: '2022/09/10',
-      planLandingTime: '22/09/10 12:01',
-      landingAirport: 'NKG-PEK-',
-      landingStand: '84',
-      C1: '锂2/冷1',
-      C2: '363/543',
-      C3: '',
-      C4: '',
-      C5: '8/8/8',
-      C6: '8/8/8',
-      C7: '8/8/8',
-      C8: '8/363/537/1254KG',
-      C9: '3/363/537',
-    },
-    {
-      flightNO: 'ZH3456',
-      flightDate: '2022/09/10',
-      planLandingTime: '22/09/10 12:01',
-      landingAirport: 'NKG-PEK-',
-      landingStand: '84',
-      C1: '锂2/冷1',
-      C2: '363/543',
-      C3: '',
-      C4: '',
-      C5: '8/8/8',
-      C6: '8/8/8',
-      C7: '8/8/8',
-      C8: '8/363/537/1254KG',
-      C9: '3/363/537',
-    },
-  ],
+  departure: Array.from({ length: 3 }, (_, i) => ({
+    flightNO: 'ZH3423',
+    flightDate: '2022/09/10',
+    planDepartureTime: '22/09/10 12:01',
+    landingAirport: '-NGK-PEK',
+    takeOffStand: '84',
+    inFlightNO: 'HU2451',
+    planLandingTime: '2022/09/10 11:01',
+    C1: '锂2/冷1',
+    C2: '365/536',
+    C3: '1/2',
+    C4: '',
+    C5: '364/534/1254KG',
+    C5_time: '12:02',
+    C6: '0/7',
+    C6_time: '12:02',
+    C7: '364/534',
+    C7_time: '12:02',
+    C8: '8/365/536/1254KG',
+    C8_time: '12:02',
+    C9: '8/536',
+    C9_time: '12:02',
+    C10: '8/536',
+    C10_time: '12:02',
+    C11: '11:45',
+    C12: i === 1 ? '4/243' : '8/536',
+    C12_time: '12:02',
+    C13: i === 2 ? '5/357' : '8/536',
+    C13_time: '12:02',
+    C14: '8/536',
+    C14_time: '12:02',
+    C15: '8/536',
+    C15_time: '12:02',
+    C16: '0/358/5',
+    C16_time: '12:02',
+    C17: '0/5',
+    C17_time: '12:02',
+  })),
+  arrival: Array.from({ length: 3 }, (_, i) => ({
+    flightNO: 'ZH3423',
+    flightDate: '2022/09/10',
+    planLandingTime: '22/09/10 12:01',
+    landingAirport: 'NKG-PEK-',
+    landingStand: '84',
+    C1: '锂2/冷1',
+    C2: '363/543',
+    C3: '',
+    C4: i === 0 ? '0/6' : '',
+    C5: '8/8/8',
+    C5_time: '12:02',
+    C6: '8/8/8',
+    C6_time: '12:02',
+    C7: '8/8/8',
+    C7_time: '12:02',
+    C8: '8/363/537/1254KG',
+    C8_time: '12:02',
+    C9: '3/363/537',
+    C9_time: '12:02',
+  })),
 }
 const headerClassMap = ['bg-yellow', 'bg-green', 'bg-cyan']
 
@@ -462,12 +334,12 @@ const computedWidth = (text: string) => {
     for (let i = 0; i < len; i++) {
       realLength += line.charCodeAt(i) > 255 ? 2 : 1
     }
-    if (width < (realLength + 2) * 10) {
-      width = (realLength + 2) * 10
+    if (width < realLength * 8) {
+      width = realLength * 8
     }
   })
   if (['航班号', '目的站'].includes(text)) {
-    width += 10
+    width += 8
   }
   return width
 }
@@ -480,18 +352,16 @@ export default function useAirportTable(name: string, formData: CommonData) {
       columnGroupsMap[name.includes('Departure') ? 'departure' : 'arrival']
     tableColumns.value = groups.reduce(
       (columns: CommonTableColumn[], group, groupIndex) => {
-        group.children.forEach(({ columnName, columnLabel }) => {
+        group.children.forEach(column => {
           columns.push({
-            key: columnName,
-            dataKey: columnName,
-            title: columnLabel,
-            columnName,
-            columnLabel,
+            key: column.columnName,
+            dataKey: column.columnName,
+            title: column.columnLabel,
             columnDescribe: '',
             dataType: '',
             listqueryTemplateID: null,
             needCount: null,
-            needFilters: ['航班号', '目的站'].includes(columnLabel) ? 1 : 0,
+            needFilters: null,
             needGroup: null,
             needSearch: null,
             needShow: 1,
@@ -499,11 +369,12 @@ export default function useAirportTable(name: string, formData: CommonData) {
             orderNumber: null,
             queryTemplateColumnSetID: null,
             queryTemplateID: null,
-            width: computedWidth(columnLabel),
+            width: computedWidth(column.columnLabel),
             flexGrow: 1,
             align: 'center',
             headerClass: headerClassMap[groupIndex],
             groupName: group.groupName,
+            ...column,
           })
         })
         return columns
@@ -550,7 +421,8 @@ export default function useAirportTable(name: string, formData: CommonData) {
     }
   }
   const getSimulateTableData = () => {
-    tableData.value = simulateTableDataMap[name]
+    tableData.value =
+      simulateTableDataMap[name.includes('Departure') ? 'departure' : 'arrival']
   }
   let queryLoop: number | null = null
   const startQuery = async () => {

src/views/realTime/hooks/useTable.ts

@@ -720,7 +720,7 @@ export default function useTable(
         returnData: { listValues },
         message,
       } = await Query<CommonData>({
-        id: DATACONTENT_ID[tableName],
+        id: DATACONTENT_ID[tableName.slice(0, 1).toLocaleLowerCase + tableName.slice(1)],
         dataContent,
       })
       if (Number(code) !== 0) {

src/views/realTime/hooks/useTableStyle.ts

@@ -1,15 +1,19 @@
-import { CommonTableColumn } from '~/common'
-import type { CellSlotProps } from '../type'
+import { Column } from 'element-plus'
+import { CommonData, CommonTableColumn, CommonValue } from '~/common'
 
 type RowClassGetter = (param: {
   columns: CommonTableColumn[]
   rowData: any
   rowIndex: number
 }) => string
-
-type CellClassGetter = (param: CellSlotProps) => string
-
-const defaultCellClassV2 = 'el-table-v2__cell-text'
+type CellClassGetter = (params: {
+  column: Column<CommonData>
+  columns: Column<CommonData>[]
+  columnIndex: number
+  cellData: CommonValue
+  rowData: CommonData
+  rowIndex: number
+}) => string
 
 export default function useTableStyle(tableName?: string) {
   const rowClass = ({ row, rowIndex }) => {
@@ -82,17 +86,18 @@ export default function useTableStyle(tableName?: string) {
     column,
     columns,
     columnIndex,
+    cellData,
     rowData,
     rowIndex,
   }) => {
-    const classes: string[] = [defaultCellClassV2]
-    if (['4/243', '0/6'].includes(rowData[column.columnName])) {
+    const classes: string[] = []
+    if ((['4/243', '0/6'] as any[]).includes(cellData)) {
       classes.push('cell-warning')
     }
-    if (['5/357'].includes(rowData[column.columnName])) {
+    if ((['5/357'] as any).includes(cellData)) {
       classes.push('cell-alarm')
     }
-    if (['flightNO'].includes(column.columnName)) {
+    if ((['flightNO'] as any).includes(column.dataKey)) {
       classes.push('cell-click')
     }
     return classes.join(' ')

src/views/realTime/hooks/useTrackData.ts

@@ -32,76 +32,274 @@ interface TrackNodeData {
   C3: CommonValue // 时间
 }
 
-const simulateDepartureTrackNodes = [
-  {
-    id: 1,
-    name: '收货核单',
-    flag: true,
-    descriptions: ['A32', '534件', '通过', '10:25'],
-  },
-  {
-    id: 2,
-    name: '安检',
-    flag: true,
-    descriptions: ['A32', '534件', '通过', '10:25'],
-  },
-  {
-    id: 3,
-    name: '理货',
-    flag: true,
-    descriptions: ['A32', '534件', '通过', '10:25'],
-  },
-  {
-    id: 4,
-    name: '待运区',
-    flag: true,
-    descriptions: ['A32', '534件', '通过', '10:25'],
-  },
-  {
-    id: 5,
-    name: '货站交接',
-    flag: true,
-    descriptions: ['A32', '534件', '通过', '10:25'],
-  },
-  {
-    id: 6,
-    name: '机下交接',
-    flag: false,
-    descriptions: ['A32', '534件', '通过', '10:25'],
-  },
-  {
-    id: 7,
-    name: '装机',
-    flag: false,
-    descriptions: ['A32', '534件', '通过', '10:25'],
-  },
-]
-const simulateArrivalTrackNodes = [
-  {
-    id: 1,
-    name: '收货核单',
-    flag: true,
-    descriptions: ['A32', '534件', '通过', '10:25'],
-  },
-  {
-    id: 2,
-    name: '机下交接',
-    flag: true,
-    descriptions: ['A32', '534件', '通过', '10:25'],
-  },
-  {
-    id: 3,
-    name: '货站交接',
-    flag: true,
-    descriptions: ['A32', '534件', '通过', '10:25'],
-  },
-  {
-    id: 4,
-    name: '提取',
-    flag: false,
-    descriptions: ['A32', '534件', '通过', '10:25'],
-  },
-]
+const simulateTrackNodesMap = {
+  departure: [
+    {
+      name: '收货核单',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+    {
+      name: '安检',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+    {
+      name: '理货',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+    {
+      name: '待运区',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+    {
+      name: '货站交接',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+    {
+      name: '机下交接',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+    {
+      name: '装机',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+  ],
+  departure2: [
+    {
+      name: '收货核单',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+    {
+      name: '安检',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+    {
+      name: '理货',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+    {
+      name: '待运区',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+    {
+      name: '货站交接',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+    {
+      name: '机下交接',
+      flag: false,
+      descriptions: [],
+    },
+    {
+      name: '装机',
+      flag: false,
+      descriptions: [],
+    },
+  ],
+  arrival: [
+    {
+      name: '收货核单',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+    {
+      name: '机下交接',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+    {
+      name: '货站交接',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+    {
+      name: '提取',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+  ],
+  arrival2: [
+    {
+      name: '收货核单',
+      flag: false,
+      descriptions: [],
+    },
+    {
+      name: '机下交接',
+      flag: false,
+      descriptions: [],
+    },
+    {
+      name: '货站交接',
+      flag: false,
+      descriptions: [],
+    },
+    {
+      name: '提取',
+      flag: false,
+      descriptions: [],
+    },
+  ],
+  internationalDeparture: [
+    {
+      name: '入园',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+    {
+      name: '海关',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+    {
+      name: '运抵',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+    {
+      name: '安检',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+    {
+      name: '收运核单',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+    {
+      name: '理货',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+    {
+      name: '拉下',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+    {
+      name: '待运区',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+    {
+      name: '货站交接',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+    {
+      name: '机下交接',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+    {
+      name: '装机',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+  ],
+  internationalDeparture2: [
+    {
+      name: '拉下',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+    {
+      name: '待运区',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+    {
+      name: '货站交接',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+    {
+      name: '机下交接',
+      flag: false,
+      descriptions: [],
+    },
+    {
+      name: '装机',
+      flag: false,
+      descriptions: [],
+    },
+  ],
+  internationalArrival: [
+    {
+      name: '卸机',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+    {
+      name: '机下交接',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+    {
+      name: '货站交接',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+    {
+      name: '理货',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+    {
+      name: '海关',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+    {
+      name: '出库',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+    {
+      name: '退运',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+  ],
+  internationalArrival2: [
+    {
+      name: '卸机',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+    {
+      name: '机下交接',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+    {
+      name: '货站交接',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+    {
+      name: '理货',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+    {
+      name: '运抵',
+      flag: true,
+      descriptions: ['A32', '534件', '通过', '10:25'],
+    },
+  ],
+}
 
 export default function useTrackData(
   trackName: string,
@@ -180,28 +378,44 @@ export default function useTrackData(
   // })
 
   const getSimulateTrackData = () => {
-    const length = trackName.endsWith('Waybill') ? 2 : 1
-    trackAirlines.value = Array.from({ length }, (_, index) => {
+    const length = trackName.includes('Waybill') ? 2 : 1
+    trackAirlines.value = Array.from({ length }, (_, airlineIndex) => {
       const length = trackName.includes('International') ? 1 : 2
       return {
-        flightNO: index < 1 ? 'CA1001' : 'CA1003',
+        flightNO: airlineIndex < 1 ? 'CA1001' : 'CA1003',
         flightDate: '2022/09/10',
-        airports: Array.from({ length }, (_, i) => ({
-          airport: i < 1 ? '深圳机场' : '南京机场',
+        airports: Array.from({ length }, (_, airportIndex) => ({
+          airport: airportIndex < 1 ? '深圳机场' : '南京机场',
           isDeparture: trackName.includes('Departure')
-            ? i < 1
+            ? airportIndex < 1
               ? 1
               : 0
-            : i < 1
+            : airportIndex < 1
             ? 0
             : 1,
-          trackSteps: trackName.includes('Departure')
-            ? i < 1
-              ? simulateDepartureTrackNodes
-              : simulateArrivalTrackNodes
-            : i < 1
-            ? simulateArrivalTrackNodes
-            : simulateDepartureTrackNodes,
+          trackSteps: trackName.includes('International')
+            ? trackName.includes('Departure')
+              ? airlineIndex < 1
+                ? simulateTrackNodesMap.internationalDeparture
+                : simulateTrackNodesMap.internationalDeparture2
+              : airlineIndex < 1
+              ? simulateTrackNodesMap.internationalArrival
+              : simulateTrackNodesMap.internationalArrival2
+            : trackName.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,
         })),
       }
     })