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

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

@@ -149,6 +149,14 @@ const flightStateOptions = ref([
     value: 'canceled',
   },
 ])
+onMounted(() => {
+  if (props.name.includes('InternationalDeparture')) {
+    flightStateOptions.value.push({
+      label: '机场地服',
+      value: 'groundService',
+    })
+  }
+})
 const flightWarningOptions = ref([
   {
     label: '全部航班',

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

@@ -56,10 +56,10 @@
       }
       .el-table__body {
         .el-table__row {
-          &.bg-gray .el-table__cell {
+          &.bg-gray:not(.current-row, .hover-row) .el-table__cell {
             background-color: #d2d6df;
           }
-          &.bg-light .el-table__cell {
+          &.bg-light:not(.current-row, .hover-row) .el-table__cell {
             background-color: #eef3d6;
           }
           &.underline-red {
@@ -69,13 +69,13 @@
             height: 50px;
             flex-direction: column;
             &.cell-warning {
-              background-color: #f6cda5;
+              background-color: #f6cda5 !important;
             }
             &.cell-alarm {
-              background-color: #f38080;
+              background-color: #f38080 !important;
             }
             &.cell-success {
-              background-color: #46af43;
+              background-color: #46af43 !important;
             }
             &.cell-click .el-table__cell-text {
               color: #2d67e3;

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

@@ -38,6 +38,7 @@
         ref="tableRef"
         :columns="tableColumns"
         :data="tableData"
+        row-key="rowKey"
         sequence
         highlight-current-row
         scrollbar-always-on
@@ -270,6 +271,8 @@ const flightStateFilter = computed<{} | { [x: string]: string[] }>(() => {
       return { hasLanded: ['N'] }
     case 'canceled':
       return { flightState: ['CAN'] }
+    case 'groundService':
+      return { groundService: ['Y'] }
     default:
       return {}
   }

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

@@ -1,6 +1,6 @@
 import { Query } from '@/api/webApi'
 import { Ref } from 'vue'
-import { CommonData } from '~/common'
+import { CommonData, CommonValue } from '~/common'
 
 export function useFlightState(
   name: string,
@@ -49,6 +49,14 @@ export function useFlightState(
           row.warningState = getWarningState(row)
         }
       }
+      if (
+        name.includes('InternationalDeparture') &&
+        !(['CA', 'ZH', 'CZ', 'O3', '5X', 'FX', 'DO'] as CommonValue[]).includes(
+          row.IATACode
+        )
+      ) {
+        row.groundService = 'Y'
+      }
       if (
         name.includes('ArrivalAirport') &&
         typeof row.planLandingTime === 'string'

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

@@ -35,17 +35,17 @@ const flightInfoItemsMap = {
       //   label: '中转进运单/货物数',
       //   key: "transInfo",
       // },
-      {
-        label: '已配载集装器',
-        key: 'stowage_Yes',
-        showOverflowTooltip: true,
-      },
+      // {
+      //   label: '已配载集装器',
+      //   key: 'stowage_Yes',
+      //   showOverflowTooltip: true,
+      // },
       {
         label: '交接复核集装器数',
         key: 'depotJoin',
       },
       {
-        label: '已装载集装器/运单数/重量',
+        label: '已配载集装器/运单数/重量',
         key: 'loadPlane',
       },
       {

src/views/realTime/hooks/useTrackData.ts

@@ -307,12 +307,21 @@ export function useTrackData(name: string, trackData: MaybeRef<CommonData[]>) {
       [] as TrackAirline[]
     )
     trackAirlines.value = airlines.map(airline => {
+      const dealedAirports = airline.airports.map(airport => ({
+        ...airport,
+        trackSteps: airport.trackSteps.filter(
+          node =>
+            node.flag ||
+            !['CARGOS_OFFLOAD', 'OFFLOAD_CONFIRM'].includes(node.nodeCode)
+        ),
+      }))
+      const sortedAirports =
+        name.includes('Departure') === airline.airports[0].isDeparture
+          ? dealedAirports
+          : dealedAirports.reverse()
       return {
         ...airline,
-        airports:
-          name.includes('Departure') === airline.airports[0].isDeparture
-            ? airline.airports
-            : airline.airports.reverse(),
+        airports: sortedAirports,
       }
     })
   }