2.20问题部分修改

public/config.js

@@ -192,17 +192,19 @@ var DATACONTENT_ID = {
   departureFlightInfo: 1803511, // 国内离港航班基础信息
   departureFlightWaybill: 1803513, // 国内离港航班运单
   departureFlightContainer: 1803530, // 国内离港航班集装器
+  departureFlightContainerWaybill: 1803518, // 国内离港航班-集装器内运单
   arrivalFlightInfo: 1803509, // 国内进港航班基础信息
   arrivalFlightWaybill: 1803510, // 国内进港航班运单
+  arrivalFlightContainer: 1803617, // 国内进港航班集装器
+  arrivalFlightContainerWaybill: 1803620, // 国内进港航班-集装器内运单
   internationalDepartureFlightInfo: 1803528, // 国际离港航班基础信息
   internationalDepartureFlightWaybill: 1803529, // 国际离港航班运单
   internationalDepartureFlightContainer: 1803530, // 国际离港航班集装器
+  internationalDepartureFlightContainerWaybill: 1803531, // 国际离港航班-集装器内运单
   internationalArrivalFlightInfo: 1803526, // 国际进港航班基础信息
   internationalArrivalFlightWaybill: 1803527, // 国际进港航班运单
-  departureFlightContainerWaybill: 1803518, // 国内离港航班-集装器内运单
-  // arrivalFlightContainerWaybill: 1803519, // 国内进港航班-集装器内运单
-  internationalDepartureFlightContainerWaybill: 1803531, // 国际离港航班-集装器内运单
-  // arrivalFlightContainerWaybill: 1803519, // 国际进港航班-集装器内运单
+  internationalArrivalFlightContainer: 1803618, // 国际进港航班集装器
+  internationalArrivalFlightContainerWaybill: 1803619, // 国际进港航班-集装器内运单
   airportNameZh: 1803517, // 机场中文名
   // 运单
   departureWaybillInfo: 1803520, // 国内离港运单基础信息

src/components/TableHeaderCell/index.vue

@@ -60,8 +60,16 @@
         :width="224"
         class="table-header-cell-popover"
         placement="bottom"
-        @show="expand = true"
-        @hide="expand = false"
+        @show="
+          () => {
+            expand = true
+          }
+        "
+        @hide="
+          () => {
+            expand = false
+          }
+        "
       >
         <el-button-group size="small" type="default" class="select-buttons">
           <el-button @click="selectAll">全选</el-button>
@@ -79,7 +87,7 @@
           :teleported="false"
         >
           <el-option
-            v-for="(option, index) in filterOptions"
+            v-for="(option, index) in groupedOptions"
             :key="option.value + index"
             :value="option.value"
             :label="option.label"
@@ -92,6 +100,7 @@
 
 <script setup lang="ts">
 import { PropType } from 'vue'
+import _ from 'lodash'
 import { CaretBottom, Sort, SortUp, SortDown } from '@element-plus/icons-vue'
 import { ClickOutside as vClickOutside } from 'element-plus'
 
@@ -112,7 +121,7 @@ const props = defineProps({
     default: 'arrow',
   },
   filterOptions: {
-    type: Array as PropType<{ label: string, value: string }[]>,
+    type: Array as PropType<{ value: string, label: string }[]>,
   },
   filterValues: {
     type: Array<string>,
@@ -126,9 +135,31 @@ const props = defineProps({
   },
 })
 
-const emit = defineEmits(['update:filterValues','update:sortRule'])
+const emit = defineEmits(['update:filterValues', 'update:sortRule'])
 
 const selections = ref<string[]>([])
+const groupedOptions = computed(() => {
+  if (props.filterOptions) {
+    const selected = selections.value.map(value => {
+      const sameOption = props.filterOptions?.find(option => option.value === value)
+      if (sameOption) {
+        return sameOption
+      } else {
+        return {
+          value,
+          label: value
+        }
+      }
+    })
+    const unselected = props.filterOptions.filter(option => !selections.value.includes(option.value))
+    return [
+      ..._.orderBy(selected, o => o.value),
+      ..._.orderBy(unselected, o => o.value)
+    ]
+  } else {
+    return []
+  }
+})
 const expand = ref(false)
 const active = computed(() => !!props.filterValues?.length)
 const filterable = computed(() => !!props.filterOptions)
@@ -138,10 +169,10 @@ watchEffect(() => {
   }
 })
 watchEffect(() => {
-   emit('update:filterValues', selections.value)
+  emit('update:filterValues', selections.value)
 })
 const selectAll = () => {
-  selections.value.push(...props.filterOptions!.reduce((pre:string[], { value }) => {
+  selections.value.push(...props.filterOptions!.reduce((pre: string[], { value }) => {
     if (!selections.value.includes(value)) {
       pre.push(value)
     }
@@ -183,14 +214,18 @@ const sortChange = () => {
   align-items: center;
   text-align: center;
   line-height: 14px;
+
   &.table-header-cell-space-between {
     justify-content: space-between;
   }
+
   .filter-button-wrapper {
     flex: 1;
     cursor: pointer;
+
     .filter-button {
       position: relative;
+
       &::after {
         content: '';
         display: block;
@@ -200,9 +235,11 @@ const sortChange = () => {
         left: -2px;
         border-bottom: 1px solid #101116;
       }
+
       &:hover {
         color: #2d7cff;
       }
+
       &-active,
       &:hover {
         &::after {
@@ -211,6 +248,7 @@ const sortChange = () => {
       }
     }
   }
+
   .button-wrapper {
     width: 14px;
     height: 100%;
@@ -219,6 +257,7 @@ const sortChange = () => {
     justify-content: space-around;
     align-items: center;
     position: relative;
+
     &::after {
       content: '';
       display: block;
@@ -229,6 +268,7 @@ const sortChange = () => {
       background-color: #000000;
       opacity: 0.1;
     }
+
     > div {
       z-index: 1;
       flex: 1;
@@ -237,11 +277,14 @@ const sortChange = () => {
       align-items: center;
       cursor: pointer;
     }
+
     .filter-arrow {
       transition: 0.3s transform;
+
       &.arrow-expand {
         transform: rotate(-180deg);
       }
+
       &.arrow-active {
         color: #2d7cff;
         font-weight: bold;
@@ -256,6 +299,7 @@ const sortChange = () => {
 
 .select-buttons {
   margin-bottom: 10px;
+
   .el-button {
     margin-right: 10px;
   }

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

@@ -181,13 +181,13 @@ const waybillTypeOptions = ref([
     value: '',
   },
   {
-    label: '国际货物',
+    label: '国际普货',
     value: 'normal',
   },
-  {
-    label: '国际快件',
-    value: 'fast',
-  },
+  // {
+  //   label: '国际快件',
+  //   value: 'fast',
+  // },
 ])
 </script>
 

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

@@ -75,6 +75,9 @@
             &.cell-success {
               background-color: #46af43 !important;
             }
+            &.cell-striking {
+              background-color: #d89834 !important;
+            }
             &.cell-click .el-table__cell-text {
               color: #2d67e3;
               cursor: pointer;

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

@@ -6,17 +6,17 @@
         <CountBox
           :count-number="airportCount.flightNum"
           label="今日计划航班数"
-          :length="4"
+          :length="3"
         />
         <CountBox
           :count-number="airportCount.finishFlightNum"
           label="已完成航班数"
-          :length="4"
+          :length="3"
         />
         <CountBox
           :count-number="airportCount.weight"
           :label="`已${isDeparture ? '装载' : '卸载'}重量（吨）`"
-          :length="8"
+          :length="4"
         />
       </div>
       <div class="airport-settings">
@@ -126,8 +126,8 @@ const getAirportCount = async () => {
     const { flightNum, finishFlightNum, weight } = listValues[0]
     airportCount.flightNum = flightNum ?? 0
     airportCount.finishFlightNum = finishFlightNum ?? 0
-    // airportCount.weight = weight ? Math.ceil(weight / 1000) : 0 // 向上取整
-    airportCount.weight = weight ? parseFloat((weight / 1000).toFixed(2)) : 0 // 四舍五入保留两位
+    airportCount.weight = weight ? Math.ceil(weight / 1000) : 0 // 向上取整
+    // airportCount.weight = weight ? parseFloat((weight / 1000).toFixed(2)) : 0 // 四舍五入保留两位
   } catch (error) {
     console.error(error)
   }

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

@@ -49,6 +49,12 @@ const columnGroupsMap: {
           needFilters: 1,
           fixed: true,
         },
+        {
+          columnName: 'planeType',
+          columnLabel: '机型',
+          needFilters: 1,
+          fixed: true,
+        },
         {
           columnName: 'takeOffStand',
           columnLabel: '停机位',
@@ -264,6 +270,11 @@ const columnGroupsMap: {
           width: 100,
           needFilters: 1,
         },
+        {
+          columnName: 'planeType',
+          columnLabel: '机型',
+          needFilters: 1,
+        },
         {
           columnName: 'landingStand',
           columnLabel: '停机位',
@@ -381,6 +392,12 @@ const columnGroupsMap: {
           needFilters: 1,
           fixed: true,
         },
+        {
+          columnName: 'planeType',
+          columnLabel: '机型',
+          needFilters: 1,
+          fixed: true,
+        },
         {
           columnName: 'takeOffStand',
           columnLabel: '停机位',
@@ -631,6 +648,11 @@ const columnGroupsMap: {
           width: 100,
           needFilters: 1,
         },
+        {
+          columnName: 'planeType',
+          columnLabel: '机型',
+          needFilters: 1,
+        },
         {
           columnName: 'landingStand',
           columnLabel: '停机位',

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

@@ -90,12 +90,12 @@ const tableColumnsMap = {
       customRender: ellipsisCell,
     },
     {
-      columnLabel: '进港报文货物件数',
+      columnLabel: '运单件数',
       columnName: 'messageCargos_in',
       needCount: 1,
     },
     {
-      columnLabel: '进港实际货物件数',
+      columnLabel: '理货件数',
       columnName: 'acCargos_in',
       needCount: 1,
     },

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

@@ -25,7 +25,7 @@
           </template>
         </div>
       </div>
-      <div v-if="name.includes('Departure')" class="container-list">
+      <div class="container-list">
         <SimpleTable
           :data="containerTableData"
           :columns="containerTableColumns"
@@ -169,6 +169,11 @@ const tableFormatter: CommonTableFormatter = (
       'planeDown',
       'loadPlane',
       'pullSure',
+      'dlv',
+      'jxjj',
+      'hzjj',
+      'unload',
+      'anjian',
     ].includes(column.property)
   ) {
     const splitValue = value.split('_')

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

@@ -17,6 +17,10 @@ const flightInfoItemsMap = {
         label: '实际起飞时间',
         getter: info => info.acDepartureTime?.replace('T', ' ') ?? '',
       },
+      {
+        label: '机型',
+        key: 'planeType',
+      },
       {
         label: '停机位',
         key: 'takeOffStand',
@@ -86,6 +90,10 @@ const flightInfoItemsMap = {
         label: '实际起飞时间',
         getter: info => info.acDepartureTime?.replace('T', ' ') ?? '',
       },
+      {
+        label: '机型',
+        key: 'planeType',
+      },
     ],
     [
       {

src/views/realTime/hooks/useTable.ts

@@ -26,9 +26,9 @@ const tableColumnsMap: {
       countMode: 'all',
     },
     { columnLabel: '目的地', columnName: 'destination' },
-    { columnLabel: '配载运单', columnName: 'list', width: 60 },
-    { columnLabel: '件数', columnName: 'number', width: 60, needCount: 1 },
-    { columnLabel: '重量', columnName: 'weight', width: 60, needCount: 1 },
+    { columnLabel: '配载运单', columnName: 'list' },
+    { columnLabel: '件数', columnName: 'number', needCount: 1 },
+    { columnLabel: '重量', columnName: 'weight', needCount: 1 },
     {
       columnLabel: '拉下',
       columnName: 'pull',
@@ -252,8 +252,47 @@ const tableColumnsMap: {
     { columnLabel: '发往位置描述', columnName: 'C13' },
     { columnLabel: '集装器编号', columnName: 'C14' },
   ],
+  ArrivalFlightContainer: [
+    {
+      columnLabel: '集装器编号',
+      columnName: 'stowageNo',
+      width: 120,
+      needCount: 1,
+      countMode: 'all',
+    },
+    { columnLabel: '目的地', columnName: 'destination' },
+    { columnLabel: '配载运单', columnName: 'list' },
+    { columnLabel: '件数', columnName: 'number', needCount: 1 },
+    { columnLabel: '重量', columnName: 'weight', needCount: 1 },
+    {
+      columnLabel: '理货',
+      columnName: 'tally',
+      className: 'cell-filter cell-filter-yellow',
+    },
+    {
+      columnLabel: '出库',
+      columnName: 'dlv',
+      className: 'cell-filter cell-filter-yellow',
+    },
+    {
+      columnLabel: '机下交接',
+      columnName: 'jxjj',
+      className: 'cell-filter cell-filter-yellow',
+    },
+    {
+      columnLabel: '货站交接',
+      columnName: 'hzjj',
+      className: 'cell-filter cell-filter-yellow',
+    },
+    {
+      columnLabel: '卸机',
+      columnName: 'unload',
+      className: 'cell-filter cell-filter-yellow',
+    },
+  ],
   ArrivalFlightWaybill: [
     { columnLabel: '运单号', columnName: 'stockCode', width: 120 },
+    { columnLabel: '集装器数量', columnName: 'stowageNum' },
     {
       columnLabel: '品名',
       columnName: 'typeCode',
@@ -448,9 +487,9 @@ const tableColumnsMap: {
       countMode: 'all',
     },
     { columnLabel: '目的地', columnName: 'destination' },
-    { columnLabel: '配载运单', columnName: 'list', width: 60 },
-    { columnLabel: '件数', columnName: 'number', width: 60, needCount: 1 },
-    { columnLabel: '重量', columnName: 'weight', width: 60, needCount: 1 },
+    { columnLabel: '配载运单', columnName: 'list' },
+    { columnLabel: '件数', columnName: 'number', needCount: 1 },
+    { columnLabel: '重量', columnName: 'weight', needCount: 1 },
     {
       columnLabel: '拉下',
       columnName: 'pull',
@@ -634,8 +673,52 @@ const tableColumnsMap: {
     { columnLabel: '发往位置描述', columnName: 'C13' },
     { columnLabel: '集装器编号', columnName: 'C14' },
   ],
+  InternationalArrivalFlightContainer: [
+    {
+      columnLabel: '集装器编号',
+      columnName: 'stowageNo',
+      width: 120,
+      needCount: 1,
+      countMode: 'all',
+    },
+    { columnLabel: '目的地', columnName: 'destination' },
+    { columnLabel: '配载运单', columnName: 'list' },
+    { columnLabel: '件数', columnName: 'number', needCount: 1 },
+    { columnLabel: '重量', columnName: 'weight', needCount: 1 },
+    {
+      columnLabel: '理货',
+      columnName: 'tally',
+      className: 'cell-filter cell-filter-yellow',
+    },
+    {
+      columnLabel: '出库',
+      columnName: 'dlv',
+      className: 'cell-filter cell-filter-yellow',
+    },
+    {
+      columnLabel: '机下交接',
+      columnName: 'jxjj',
+      className: 'cell-filter cell-filter-yellow',
+    },
+    {
+      columnLabel: '货站交接',
+      columnName: 'hzjj',
+      className: 'cell-filter cell-filter-yellow',
+    },
+    {
+      columnLabel: '卸机',
+      columnName: 'unload',
+      className: 'cell-filter cell-filter-yellow',
+    },
+    {
+      columnLabel: '安检',
+      columnName: 'anjian',
+      className: 'cell-filter cell-filter-yellow',
+    },
+  ],
   InternationalArrivalFlightWaybill: [
     { columnLabel: '运单号', columnName: 'stockCode', width: 120 },
+    { columnLabel: '集装器数量', columnName: 'stowageNum' },
     {
       columnLabel: '品名',
       columnName: 'typeCode',

src/views/realTime/hooks/useTableStyle.ts

@@ -81,6 +81,20 @@ export function useTableStyle(tableName?: string) {
           classes.push('cell-warning')
         }
       }
+      if (['securityYes', 'securityTime'].includes(column.property)) {
+        const { receiveSure, securityYes } = row
+        let receiveNum = 0,
+          securityNum = 0
+        if (typeof receiveSure === 'string') {
+          receiveNum = Number(receiveSure.split('/')[1]) || 0
+        }
+        if (typeof securityYes === 'string') {
+          securityNum = Number(securityYes.split('/')[1]) || 0
+        }
+        if (receiveNum !== securityNum) {
+          classes.push('cell-striking')
+        }
+      }
     }
 
     if (tableName?.includes('FlightContainer')) {

src/views/realTime/hooks/useTrackData.ts

@@ -306,14 +306,16 @@ export function useTrackData(name: string, trackData: MaybeRef<CommonData[]>) {
       [] as TrackAirline[]
     )
     trackAirlines.value = airlines.map(airline => {
-      const dealedAirports = airline.airports.map(airport => ({
+      const dealedAirports = airline.airports.map((airport, index) => ({
         ...airport,
         trackSteps: airport.trackSteps.filter(
           node =>
             node.flag ||
-            !['CARGOS_OFFLOAD', 'OFFLOAD_CONFIRM', 'BILL_RETURN'].includes(
-              node.nodeCode
-            )
+            (index > 0
+              ? ['IMP_TALLY', 'FSUDLV'].includes(node.nodeCode)
+              : !['CARGOS_OFFLOAD', 'OFFLOAD_CONFIRM', 'BILL_RETURN'].includes(
+                  node.nodeCode
+                ))
         ),
       }))
       const sortedAirports =
@@ -342,6 +344,7 @@ export function useTrackData(name: string, trackData: MaybeRef<CommonData[]>) {
             (airports[index].trackSteps.length - 1) / totalLength
           })`
         : '100%'
+      style.minWidth = '300px'
       return style
     }
   )