修改节点编码

src/views/realTime/hooks/useTrackData.ts

@@ -5,25 +5,19 @@ import { CommonData, MaybeRef } from '~/common'
 interface TrackNode {
   name: string
   nodeCode: string
-  active: boolean
+  flag: boolean
   labelWidth?: number
   descriptions: string[]
-  sync?: boolean
 }
-interface CombinedTrackNode {
-  active: boolean
-  labelWidth?: number
-  children: [TrackNode, TrackNode]
-}
-interface TrackAirport<T = TrackNode> {
+interface TrackAirport {
   airport: string
   isDeparture: boolean
-  trackSteps: T[]
+  trackSteps: TrackNode[]
 }
-interface TrackAirline<T = TrackNode> {
+interface TrackAirline {
   flightNO: string
   flightDate: string
-  airports: TrackAirport<T>[]
+  airports: TrackAirport[]
 }
 
 const trackNodesMap = {
@@ -38,13 +32,12 @@ const trackNodesMap = {
     // },
     {
       name: '安检',
-      nodeCode: '安检',
+      nodeCode: 'SECURITY_CHECK',
       // nodeCode: 'SECURITY', // 临时-复制加货
     },
     {
       name: '加货',
       nodeCode: 'ACC_BUP',
-      sync: true,
     },
     {
       name: '预配载',
@@ -111,7 +104,7 @@ const trackNodesMap = {
     },
     {
       name: '出库',
-      nodeCode: 'FSUDLV',
+      nodeCode: 'FSU_DLV',
     },
   ],
   internationalDeparture: [
@@ -121,7 +114,7 @@ const trackNodesMap = {
     },
     {
       name: '海关',
-      nodeCode: 'MTREL_out',
+      nodeCode: 'MTREL',
     },
     {
       name: '运抵',
@@ -137,11 +130,7 @@ const trackNodesMap = {
     },
     {
       name: '理货',
-      nodeCode: 'ACC_BUP',
-    },
-    {
-      name: '实配',
-      nodeCode: 'LS_CARGO',
+      nodeCode: 'CARTON_LIST',
     },
     // {
     //   name: '待运区',
@@ -168,6 +157,10 @@ const trackNodesMap = {
       nodeCode: 'CARGOS_OFFLOAD',
     },
     // {
+    //   name: '实配',
+    //   nodeCode: 'LS_CARGO',
+    // },
+    // {
     //   name: '退运',
     //   nodeCode: '',
     // },
@@ -187,7 +180,7 @@ const trackNodesMap = {
     },
     {
       name: '理货',
-      nodeCode: 'RCF报',
+      nodeCode: 'RCF',
     },
     // {
     //   name: '快件运抵',
@@ -195,11 +188,11 @@ const trackNodesMap = {
     // },
     {
       name: '海关放行',
-      nodeCode: 'MTREL_in',
+      nodeCode: 'MTREL',
     },
     {
       name: '出库',
-      nodeCode: 'DLV报',
+      nodeCode: 'DLV',
     },
   ],
   internationalDepartureTransfer: [
@@ -209,7 +202,7 @@ const trackNodesMap = {
     },
     {
       name: '海关',
-      nodeCode: 'MTREL_out',
+      nodeCode: 'MTREL',
     },
     {
       name: '运抵',
@@ -225,7 +218,7 @@ const trackNodesMap = {
     },
     {
       name: '理货',
-      nodeCode: 'ACC_BUP',
+      nodeCode: 'CARTON_LIST',
     },
     {
       name: '实配',
@@ -255,7 +248,7 @@ export function useTrackData(name: string, trackData: MaybeRef<CommonData[]>) {
     return unref(trackData)
   })
 
-  const trackAirlines = ref<TrackAirline<TrackNode | CombinedTrackNode>[]>([])
+  const trackAirlines = ref<TrackAirline[]>([])
   const getTrackAirlines = () => {
     const airlines = unref(computedTrackData).reduce(
       (
@@ -280,24 +273,25 @@ export function useTrackData(name: string, trackData: MaybeRef<CommonData[]>) {
             ...trackNodesMap.departure,
             ...trackNodesMap.internationalDeparture,
             ...trackNodesMap.internationalDepartureTransfer,
-          ].some(node => node.nodeCode === nodeCode) ||
+          ].some((node) => node.nodeCode === nodeCode) ||
           (name.includes('Departure') &&
             ![
               ...trackNodesMap.arrival,
               ...trackNodesMap.internationalArrival,
-            ].some(node => node.nodeCode === nodeCode))
+            ].some((node) => node.nodeCode === nodeCode))
         const airport = isDeparture
           ? String(departureAirport ?? '')
           : String(arriveAirport ?? '')
         const trackNode = {
-          active: Boolean(
-            // execPosition ||
-            //   ConsignmentItemPackagingQuantityQuantity ||
-            execResult || execTime
+          flag: Boolean(
+            execPosition ||
+              ConsignmentItemPackagingQuantityQuantity ||
+              execResult ||
+              execTime
           ),
           descriptions: [
-            // String(execPosition ?? ''),
-            // String(ConsignmentItemPackagingQuantityQuantity ?? ''),
+            String(execPosition ?? ''),
+            String(ConsignmentItemPackagingQuantityQuantity ?? ''),
             execResult ? '通过' : '未通过',
             datetimeToTime(execTime, flightDate),
           ],
@@ -312,7 +306,7 @@ export function useTrackData(name: string, trackData: MaybeRef<CommonData[]>) {
             : isInternational
             ? 'internationalArrival'
             : 'arrival'
-        ].map(node => {
+        ].map((node) => {
           if (node.nodeCode === nodeCode) {
             return {
               ...node,
@@ -321,22 +315,22 @@ export function useTrackData(name: string, trackData: MaybeRef<CommonData[]>) {
           } else {
             return {
               ...node,
-              active: false,
-              descriptions: ['', ''],
+              flag: false,
+              descriptions: [],
             }
           }
         })
         const airline = airlines.find(
-          airline =>
+          (airline) =>
             airline.flightNO === flightNO &&
             airline.flightDate === airline.flightDate
         )
         if (airline) {
           const trackAirport = airline.airports.find(
-            trackAirport => trackAirport.airport === airport
+            (trackAirport) => trackAirport.airport === airport
           )
           if (trackAirport) {
-            trackAirport.trackSteps = trackAirport.trackSteps.map(node => {
+            trackAirport.trackSteps = trackAirport.trackSteps.map((node) => {
               if (node.nodeCode === nodeCode) {
                 node = {
                   ...node,
@@ -369,44 +363,22 @@ export function useTrackData(name: string, trackData: MaybeRef<CommonData[]>) {
       },
       [] as TrackAirline[]
     )
-    trackAirlines.value = airlines.map(airline => {
+    trackAirlines.value = airlines.map((airline) => {
       const dealedAirports = airline.airports.map((airport, index) => ({
         ...airport,
-        trackSteps: airport.trackSteps.reduce((prevSteps, node, i, steps) => {
-          if (
-            node.active ||
+        trackSteps: airport.trackSteps.filter(
+          (node, i, steps) =>
+            node.flag ||
             (index > 0
               ? ['IMP_TALLY', 'FSUDLV'].includes(node.nodeCode) &&
                 steps.some(
-                  node =>
-                    ['IMP_TALLY', 'FSUDLV'].includes(node.nodeCode) &&
-                    node.active
+                  (node) =>
+                    ['IMP_TALLY', 'FSUDLV'].includes(node.nodeCode) && node.flag
                 )
               : !['CARGOS_OFFLOAD', 'OFFLOAD_CONFIRM', 'BILL_RETURN'].includes(
                   node.nodeCode
                 ))
-          ) {
-            if (node.sync && prevSteps.length > 0) {
-              const lastNode = prevSteps.pop() as TrackNode | CombinedTrackNode
-              if ('nodeCode' in lastNode) {
-                const active = node.active || lastNode.active
-                const labelWidth =
-                  Math.max(node.labelWidth ?? 0, lastNode.labelWidth ?? 0) ||
-                  undefined
-                prevSteps.push({
-                  active,
-                  labelWidth,
-                  children: [lastNode, node],
-                })
-              } else {
-                prevSteps.push(lastNode, node)
-              }
-            } else {
-              prevSteps.push(node)
-            }
-          }
-          return prevSteps
-        }, [] as (TrackNode | CombinedTrackNode)[]),
+        ),
       }))
       const sortedAirports =
         name.includes('Departure') === airline.airports[0].isDeparture
@@ -424,10 +396,7 @@ export function useTrackData(name: string, trackData: MaybeRef<CommonData[]>) {
   })
 
   const trackBoxStyle = computed(
-    () => (
-      airports: TrackAirport<TrackNode | CombinedTrackNode>[],
-      index: number
-    ) => {
+    () => (airports: TrackAirport[], index: number) => {
       const style: CSSProperties = {}
       const totalLength = airports.reduce((pre, current) => {
         return pre + current.trackSteps.length - 1