实时视图-节点跟踪-时间格式修改

public/nodeCode.js

@@ -4,11 +4,13 @@ var NODE_CODE = {
   ACC_CHECK: '查验',
   ACC_BUP: '加货',
   LS_CARGO: '预配载',
+  FSUDEP: '预配载',
+  FSU_DEP: '预配载',
   CARGOS_HANDOVER_STATUS_02: '货站交接',
   CARGOS_HANDOVER_STATUS_03: '交接复核',
   出港货邮: '机下交接',
   装载完成: '装机完成',
-  关货舱门: '关货舱门',
+  货舱关闭: '关货舱门',
   CARGOS_OFFLOAD: '拉下登记',
   OFFLOAD_CONFIRM: '拉下确认',
   BILL_RETURN: '退运',
@@ -24,4 +26,4 @@ var NODE_CODE = {
   RCS:'收运核单',
   MTREL_in:'海关放行',
   RCF报:'理货',
-}
+}

src/utils/validate.ts

@@ -1,3 +1,5 @@
+import { CommonValue } from '~/common'
+
 /**
  * @param {string} path
  * @returns {Boolean}
@@ -138,7 +140,7 @@ export function parseTime(time: any, cFormat: string) {
 export function translateDataToTreeAll(arr, parentKey, key) {
   const map = {}
   const result = []
-  arr.forEach((element) => {
+  arr.forEach(element => {
     const id = element[key]
     const pid = element[parentKey]
     if (map[id]) {
@@ -167,3 +169,24 @@ export function translateDataToTreeAll(arr, parentKey, key) {
   })
   return result
 }
+
+export function datetimeToTime(
+  datetimeValue: CommonValue,
+  currentDate: CommonValue
+) {
+  if (typeof datetimeValue !== 'string' || !datetimeValue) {
+    return ''
+  }
+  if (typeof currentDate !== 'string') {
+    return ''
+  }
+  const [date, time] = datetimeValue.trim().split(/[T|\s]+/)
+  let clipTime = time.slice(0, -3)
+  if (date !== currentDate) {
+    const days =
+      (new Date(date).getTime() - new Date(currentDate).getTime()) /
+      (24 * 60 * 60 * 1000)
+    clipTime += ` (${days > 0 ? '+' : ''}${days})`
+  }
+  return clipTime
+}

src/views/dataQuery/components/DataQueryView/index.vue

@@ -180,7 +180,7 @@ const { columnChecked } = useTableColumnSet(tableColumns)
 const formatter: CommonTableFormatter = (row, column, cellValue, index) => {
   const value = String(cellValue ?? '').trim()
   if (column.property.includes('Time')) {
-    return value.replace(/(T|\s)+/, '\n')
+    return value.replace(/[T|\s]+/, '\n')
   }
   return value
 }

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

@@ -1,6 +1,6 @@
+import { datetimeToTime } from '@/utils/validate'
 import { Ref } from 'vue'
 import { CommonTableFormatter } from '~/common'
-import { CellRenderProps } from '../../type'
 
 export function useFormatter(flag: Ref<boolean>) {
   const tableColumnFormatter = (columnLabel: string) => {
@@ -30,11 +30,20 @@ export function useFormatter(flag: Ref<boolean>) {
         }
       }
     }
-    if (property.includes('Time') && typeof cellValue === 'string') {
-      return cellValue
-        .trim()
-        .slice(5, -3)
-        .replace(/(T|\s)+/, '\n')
+    if (property.includes('Time')) {
+      if (
+        ['planDepartureTime', 'acLandingTime', 'planLandingTime'].includes(
+          property
+        ) &&
+        typeof cellValue === 'string'
+      ) {
+        return cellValue
+          .trim()
+          .slice(5, -3)
+          .replace(/[T|\s]+/, '\n')
+      } else {
+        return datetimeToTime(cellValue, row.flightDate)
+      }
     }
     if (property === 'jiahuo') {
       return cellValue ? '是' : '否'

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

@@ -10,6 +10,7 @@
       <SimpleTable
         :data="tableData"
         :columns="tableColumns"
+        height="300px"
         :column-props="{ formatter }"
       />
     </div>
@@ -28,6 +29,7 @@ import {
   CommonValue,
 } from '~/common'
 import { ellipsisCell } from '@/components/SimpleTable/customRender'
+import { datetimeToTime } from '@/utils/validate'
 
 const props = defineProps({
   flag: {
@@ -172,10 +174,12 @@ watch(
   }
 )
 
+const flightDate = computed(() => props.dataContent[0])
+
 const formatter: CommonTableFormatter = (row, column, cellValue, index) => {
   const value = String(cellValue ?? '').trim()
   if (column.property.includes('Time')) {
-    return value.replace(/(T|\s)+/, '\n')
+    return datetimeToTime(value, flightDate.value)
   }
   if (column.property === 'nodeCode') {
     if (props.name.includes('InternationalDeparture') && value === 'LS_CARGO') {
@@ -190,6 +194,6 @@ const formatter: CommonTableFormatter = (row, column, cellValue, index) => {
 <style scoped lang="scss">
 .dialog-content {
   padding: 0 22px;
-  min-height: 300px;
+  height: 322px;
 }
 </style>

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

@@ -93,7 +93,8 @@ import { useTableStyle } from '../../hooks/useTableStyle'
 import { useTableCellClick } from '../../hooks/useTableCellClick'
 import { useFlightInfo } from './useFlightInfo'
 import { useLoop } from '@/hooks/useLoop'
-import { CommonTableFormatter } from '~/common'
+import { CommonTableFormatter, CommonValue } from '~/common'
+import { datetimeToTime } from '@/utils/validate'
 
 const props = defineProps({
   name: {
@@ -168,7 +169,7 @@ const tableFormatter: CommonTableFormatter = (
       'pullSure',
     ].includes(column.property)
   ) {
-    return value.slice(5, -3).replace(/(T|\s)+/, '\n')
+    return datetimeToTime(value, flightDate as CommonValue)
   }
   if (column.property === 'nodeCode') {
     if (props.name.includes('InternationalDeparture') && value === 'LS_CARGO') {

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

@@ -108,8 +108,9 @@ import { useTableExport } from '../../hooks/useTableExport'
 import { useTableStyle } from '../../hooks/useTableStyle'
 import { useTableCellClick } from '../../hooks/useTableCellClick'
 import { useWaybillInfo } from './useWaybillInfo'
-import { CommonData, CommonTableFormatter } from '~/common'
+import { CommonData, CommonTableFormatter, CommonValue } from '~/common'
 import { useLoop } from '@/hooks/useLoop'
+import { datetimeToTime } from '@/utils/validate'
 
 const props = defineProps({
   name: {
@@ -249,15 +250,7 @@ const tableData = computed(() => {
 const formatter: CommonTableFormatter = (row, column, cellValue, index) => {
   const value = String(cellValue ?? '').split('\n')
   if (value[2]) {
-    const [date, time] = value[2].split('T')
-    let clipTime = time.slice(0, -3)
-    if (date !== flightDate) {
-      const days =
-        (new Date(date).getTime() - new Date(flightDate as string).getTime()) /
-        (24 * 60 * 60 * 1000)
-      clipTime += ` (${days > 0 ? '+' : ''}${days})`
-    }
-    value[2] = clipTime
+    value[2] = datetimeToTime(value[2], flightDate as CommonValue)
   }
   return value.join('\n')
 }

src/views/realTime/hooks/useTrackData.ts

@@ -1,3 +1,4 @@
+import { datetimeToTime } from '@/utils/validate'
 import { CSSProperties } from 'vue'
 import { CommonData, MaybeRef } from '~/common'
 
@@ -215,18 +216,6 @@ export function useTrackData(name: string, trackData: MaybeRef<CommonData[]>) {
           execTime,
         }
       ) => {
-        let clipTime = ''
-        if (typeof execTime === 'string') {
-          const [date, time] = execTime.split('T')
-          clipTime = time.slice(0, -3)
-          if (date !== flightDate) {
-            const days =
-              (new Date(date).getTime() -
-                new Date(flightDate as string).getTime()) /
-              (24 * 60 * 60 * 1000)
-            clipTime += ` (${days > 0 ? '+' : ''}${days})`
-          }
-        }
         const isDeparture =
           trackNodesMap.departure
             .concat(trackNodesMap.internationalDeparture)
@@ -248,7 +237,7 @@ export function useTrackData(name: string, trackData: MaybeRef<CommonData[]>) {
             String(execPosition ?? ''),
             String(ConsignmentItemPackagingQuantityQuantity ?? ''),
             execResult ? '通过' : '未通过',
-            clipTime,
+            datetimeToTime(execTime, flightDate),
           ],
         }
         const nodeList = trackNodesMap[