运单跟踪节点修改

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

@@ -9,13 +9,14 @@
               <div v-for="(item, i) in group" :key="i" class="info-item">
                 <div>{{ item.label }}：</div>
                 <el-tooltip
-                  v-if="computedFlightInfo(item) && item.showOverflowTooltip"
+                  :disabled="
+                    !computedFlightInfo(item) || !item.showOverflowTooltip
+                  "
                   :content="computedFlightInfo(item)"
                   effect="light"
                 >
                   <div>{{ computedFlightInfo(item) }}</div>
                 </el-tooltip>
-                <div v-else>{{ computedFlightInfo(item) }}</div>
               </div>
             </div>
             <div v-if="index < flightInfoItems.length - 1" class="icon-box">

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

@@ -133,38 +133,6 @@ const flightInfoItemsMap = {
     ],
   ],
 }
-const simulateFlightInfoMap = {
-  departure: {
-    C0: '深圳机场',
-    C1: '2021-12-24',
-    C2: '19 : 30 : 25',
-    C3: '012',
-    C4: '0',
-    C5: '0',
-    C6: '0',
-    C7: '0',
-    C8: '0',
-    C9: '0',
-    C10: '南京机场',
-    C11: '2021-12-24',
-    C12: '22 : 25 : 25',
-  },
-  arrival: {
-    C0: '南京机场',
-    C1: '2021-12-24',
-    C2: '19 : 30 : 25',
-    C3: '0',
-    C4: '0',
-    C5: '0',
-    C6: '0',
-    C7: '0',
-    C8: '0',
-    C9: '深圳机场',
-    C10: '2021-12-24',
-    C11: '19 : 30 : 25',
-    C12: '012',
-  },
-}
 
 export function useFlightInfo(name: string, dataContent: CommonValue[]) {
   const flightInfoItems = ref<
@@ -214,20 +182,12 @@ export function useFlightInfo(name: string, dataContent: CommonValue[]) {
     } else if (item.getter) {
       return item.getter(flightInfo)
     } else if (item.key) {
-      return flightInfo[item.key]
+      return String(flightInfo[item.key] ?? '')
     } else {
       return ''
     }
   })
 
-  const getSimulateFlightInfo = () => {
-    const simulateFlightInfo =
-      simulateFlightInfoMap[
-        name.includes('Departure') ? 'departure' : 'arrival'
-      ]
-    Object.assign(flightInfo, simulateFlightInfo)
-  }
-
   const airportNameZhMap: { [code: string]: string } = reactive({})
   const getAirportNameZh = async (airportCode: string) => {
     try {

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

@@ -3,23 +3,20 @@
     <div class="waybill-info">
       <div class="waybill-info-title">运单基本信息</div>
       <div class="waybill-info-content flex">
-        <span
-          v-for="item in waybillInfoItems"
-          :key="item.key"
+        <div
+          v-for="(item, index) in waybillInfoItems"
+          :key="index"
           class="waybill-info-item"
         >
-          <span>{{ item.label }}：</span>
+          <div>{{ item.label }}：</div>
           <el-tooltip
-            v-if="item.key === 'typeCode'"
-            effect="light"
+            :disabled="!computedWaybillInfo(item) || !item.showOverflowTooltip"
             :content="computedWaybillInfo(item)"
+            effect="light"
           >
-            <span class="waybill-info-item-value">{{
-              computedWaybillInfo(item)
-            }}</span>
+            <div>{{ computedWaybillInfo(item) }}</div>
           </el-tooltip>
-          <span v-else>{{ computedWaybillInfo(item) }}</span>
-        </span>
+        </div>
       </div>
     </div>
     <div class="waybill-header flex">
@@ -298,7 +295,7 @@ const { cellClickHandler } = useTableCellClick(`${props.name}Goods`)
         color: #101116;
         margin-bottom: 10px;
         &-span:not(:last-of-type) {
-          margin-right: 30px;
+          margin-right: 8px;
         }
       }
     }

src/views/realTime/components/WaybillView/useWaybillInfo.ts

@@ -15,6 +15,7 @@ const waybillInfoItemsMap = {
     {
       label: '品名',
       key: 'typeCode',
+      showOverflowTooltip: true,
     },
     {
       label: '特货信息',
@@ -40,60 +41,44 @@ const waybillInfoItemsMap = {
   international: [
     {
       label: '运单',
-      key: 'stockCode,',
+      key: 'stockCode',
     },
     {
       label: '运单类型',
-      key: 'stockType,',
+      key: 'stockType',
     },
     {
       label: '货代公司',
-      key: 'cargoCompany,',
+      key: 'cargoCompany',
     },
     {
       label: '品名',
-      key: 'typeCode,',
+      key: 'typeCode',
+      showOverflowTooltip: true,
     },
     {
       label: '特货信息',
-      key: 'speCargoInfo,',
+      key: 'speCargoInfo',
     },
     {
       label: '始发机场',
-      key: 'departureAirport,',
+      key: 'departureAirport',
     },
     {
       label: '目的机场',
-      key: 'arriveAirport,',
+      key: 'arriveAirport',
     },
   ],
 }
 
-const simulateWaybillInfoMap = {
-  internal: {
-    C0: 'FA56888829',
-    C1: '深圳市联运通货有限公司',
-    C3: '电路板、手机外壳',
-    C4: '特',
-    C5: 'SZX',
-    C6: 'NKG',
-    C7: '7件',
-    C8: '82KG',
-  },
-  international: {
-    C0: 'FA56888829',
-    C1: '国际普货',
-    C2: '深圳市联运通货有限公司',
-    C3: '电路板、手机外壳',
-    C4: '特',
-    C5: 'SZX',
-    C6: 'NKG',
-  },
-}
-
 export function useWaybillInfo(name: string, dataContent: CommonValue[]) {
   const waybillInfoItems = ref<
-    { label: string; key?: string; getter?: (info: any) => string }[]
+    {
+      label: string
+      key?: string
+      getter?: (info: any) => string
+      showOverflowTooltip?: boolean
+    }[]
   >([])
   const getWaybillInfoItems = () => {
     waybillInfoItems.value =
@@ -131,19 +116,12 @@ export function useWaybillInfo(name: string, dataContent: CommonValue[]) {
     if (item.getter) {
       return item.getter(waybillInfo)
     } else if (item.key) {
-      return waybillInfo[item.key]
+      return String(waybillInfo[item.key] ?? '')
     } else {
       return ''
     }
   })
 
-  // const getSimulateWaybillInfo = () => {
-  //   const simulateWaybillInfo =
-  //     simulateWaybillInfoMap[
-  //       name.includes('International') ? 'international' : 'internal'
-  //     ]
-  //   Object.assign(waybillInfo, simulateWaybillInfo)
-  // }
   return {
     waybillInfoItems,
     waybillInfo,

src/views/realTime/hooks/useTable.ts

@@ -511,7 +511,7 @@ const tableColumnsMap: {
     },
     {
       columnLabel: '海关',
-      columnName: 'MTREL',
+      columnName: 'MTREL_out',
       className: 'cell-filter cell-filter-green',
     },
     {
@@ -651,7 +651,7 @@ const tableColumnsMap: {
     },
     {
       columnLabel: '海关放行',
-      columnName: 'MTREL',
+      columnName: 'MTREL_in',
       className: 'cell-filter cell-filter-green',
     },
     {

src/views/realTime/hooks/useTrackData.ts

@@ -91,7 +91,7 @@ const trackNodesMap = {
     },
     {
       name: '机下交接',
-      nodeCode: 'CARGOS_HANDOVER_STATUS_01',
+      nodeCode: 'CARGOS_HANDOVER_STATUS',
     },
     {
       name: '货站交接',
@@ -113,7 +113,7 @@ const trackNodesMap = {
     },
     {
       name: '海关',
-      nodeCode: 'MTREL',
+      nodeCode: 'MTREL_out',
     },
     {
       name: '运抵',
@@ -171,7 +171,7 @@ const trackNodesMap = {
     },
     {
       name: '海关放行',
-      nodeCode: 'MTREL',
+      nodeCode: 'MTREL_in',
     },
     {
       name: '出库',