Browse Source

运单跟踪节点问题修改

zhongxiaoyu 2 years ago
parent
commit
ac33b5e9db
2 changed files with 13 additions and 16 deletions
  1. 6 6
      public/config.js
  2. 7 10
      src/views/realTime/hooks/useTrackData.ts

+ 6 - 6
public/config.js

@@ -4,7 +4,7 @@ var LOOP_INTERVAL = {
   flight: 15 * 1000,
   waybill: 15 * 1000,
   goods: 15 * 1000,
-};
+}
 
 // const PLATFROM_CONFIG = {
 //   baseNewUrl: "http://120.26.64.82:8083/", //登录前的http请求地址
@@ -217,11 +217,11 @@ var DATACONTENT_ID = {
   departureWaybillPull: 100101, // 国内离港运单拉下信息
   arrivalWaybillInfo: 1803520, // 国内进港运单基础信息
   arrivalWaybillGoods: 1803521, // 国内进港运单节点跟踪
-  internationalDepartureWaybillInfo: 1803520, // 国际离港运单基础信息
-  internationalDepartureWaybillGoods: 1803521, // 国际离港运单节点跟踪
+  internationalDepartureWaybillInfo: 1803642, // 国际离港运单基础信息
+  internationalDepartureWaybillGoods: 1803643, // 国际离港运单节点跟踪
   internationalDepartureWaybillPull: 100102, // 国际离港运单拉下信息
   internationalArrivalWaybillInfo: 1803520, // 国际进港运单基础信息
-  internationalArrivalWaybillGoods: 1803521, // 国际进港运单节点跟踪
+  internationalArrivalWaybillGoods: 1803641, // 国际进港运单节点跟踪
   // 货物
   goodsInfo: 100008, // 货物基础信息
   goodsAirline: 100009, // 货物航段
@@ -299,7 +299,7 @@ var DATACONTENT_ID = {
   modeCargostatistics: 1803626, //货量统计
   modePullgoods: 1803628, //拉货统计
   modePulltable: 1803631, //拉货统计表
-};
+}
 
 var SERVICE_ID = {
   /***-----账号管理------***/
@@ -334,4 +334,4 @@ var SERVICE_ID = {
 
   /***-----离港管理------***/
   departureScId: 8011, //发送报警预警日志信息
-};
+}

+ 7 - 10
src/views/realTime/hooks/useTrackData.ts

@@ -233,20 +233,17 @@ export function useTrackData(name: string, trackData: MaybeRef<CommonData[]>) {
           execTime,
         }
       ) => {
+        if (typeof nodeCode !== 'string' || nodeCode === '') {
+          return airlines
+        }
         const isDeparture =
           trackNodesMap.departure
             .concat(trackNodesMap.internationalDeparture)
             .some(node => node.nodeCode === nodeCode) ||
           (name.includes('Departure') &&
-            typeof nodeCode === 'string' &&
-            [
-              'MTEXDEC',
-              'NEW',
-              'ACC_CHECK',
-              'CARGOS_HANDOVER_STATUS_02',
-              'WAT_LOC',
-              'LS_CARGO',
-            ].includes(nodeCode))
+            !trackNodesMap.arrival
+              .concat(trackNodesMap.internationalArrival)
+              .some(node => node.nodeCode === nodeCode))
         const airport = isDeparture
           ? String(departureAirport ?? '')
           : String(arriveAirport ?? '')
@@ -357,7 +354,7 @@ export function useTrackData(name: string, trackData: MaybeRef<CommonData[]>) {
     })
   }
 
-  watch(trackData, () => {
+  watch(computedTrackData, () => {
     getTrackAirlines()
   })