航班视图表头修改

src/components/SimpleTable/index.vue

@@ -170,6 +170,7 @@ const props = withDefaults(
     style?: CSSProperties
     tableLayout?: Layout
     flexible?: boolean
+    scrollbarAlwaysOn?: boolean
     columnProps?: TableColumnProps<CommonData>
     columns: (CommonTableColumn & TableColumnProps<CommonData>)[]
   }>(),

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

@@ -1,7 +1,7 @@
 <template>
   <div class="common-switch switch-wrapper">
     <el-switch
-      v-model="flag"
+      :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/hooks/useTable.ts

@@ -34,11 +34,21 @@ const tableColumnsMap: {
       columnName: 'wait',
       className: 'cell-filter cell-filter-yellow',
     },
+    {
+      columnLabel: '预配载',
+      columnName: 'stowage',
+      className: 'cell-filter cell-filter-yellow',
+    },
     {
       columnLabel: '货站交接',
       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: [
     {
@@ -209,7 +224,7 @@ const tableColumnsMap: {
     {
       columnLabel: '品名',
       columnName: 'typeCode',
-      width: 160,
+      width: 300,
       showOverflowTooltip: true,
     },
     { columnLabel: '特货信息', columnName: 'speCargoInfo', needCount: 1 },
@@ -227,13 +242,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: [
     {