设备号解析抽出

src/stores/ship-map/ship-map.ts

@@ -38,6 +38,7 @@ export const useShipMapStore = defineStore('shipMap', () => {
       mergeTarget: 'mergeTarget',
       mergeId: 'mergeId',
       targetName: 'targetName',
+      targetNameEn: 'targetNameEn',
       targetSourceJson: 'targetSource',
       shipId: 'shipArchiveId',
     }
@@ -469,11 +470,34 @@ export const useShipMapStore = defineStore('shipMap', () => {
   watch(() => state.warningOpen, (n) => {
     localStorage.setItem('warningOpen', n)
   }, {immediate: true})
+  const targetSourceFormat = (arr) => {
+    const extractArr = ['GLOBAL_AIS', 'HLX_AIS', 'HLX_AIS_RADAR']
+    const beidou = []
+    const Rardar = []
+    const mmsi = []
+    arr.map(s => {
+      if (!!s && s.trackDeviceNo != 0 && extractArr.some(
+        x => x === s.type
+      )) {
+        mmsi.push(s.trackDeviceNo ?? '')
+      } else if (!!s && s.trackDeviceNo != 0 && s.type == 'BEIDOU') {
+        beidou.push(s.trackDeviceNo ?? '')
+      } else {
+        !!s && s.trackId != 0 && Rardar.push(s.trackId ?? '')
+      }
+    })
+    return {
+      beidou: beidou,
+      radar: Rardar,
+      mmsi: mmsi
+    }
+  }
   return {
     ...toRefs(state),
     initMap,
     toShip,
     clickShip,
-    initShipFeature
+    initShipFeature,
+    targetSourceFormat,
   }
 })

src/views/web/track/archive.vue

@@ -122,7 +122,7 @@ const state: any = reactive({
   initialIndex: 0
 })
 const getTitle = (data) => {
-  return data[ShipMapStore.trackKeys.targetName] || data[ShipMapStore.trackKeys.mergeTarget]
+  return data[ShipMapStore.trackKeys.targetName] || data[ShipMapStore.trackKeys.targetNameEn] || data[ShipMapStore.trackKeys.mergeTarget]
 }
 const getShipImg = (data) => {
   const arr = []
@@ -149,37 +149,14 @@ const getNumbers = (data) => {
     radar: [],
     beidou: [],
     mmsi: [],
-    mergeTarget: data.mergeTarget
   }
   const s = data[ShipMapStore.trackKeys.targetSourceJson]
-  const {RadarbeidouNumber, faultRadarNum, faultmmsiNum} = filterShipNum(s)
-  obj.radar = faultRadarNum
-  obj.beidou = RadarbeidouNumber
-  obj.mmsi = faultmmsiNum
+  const {radar, beidou, mmsi} = ShipMapStore.targetSourceFormat(s)
+  obj.radar = radar
+  obj.beidou = beidou
+  obj.mmsi = mmsi
   return [obj]
 }
-const filterShipNum = (data) => {
-  const extractArr = ['GLOBAL_AIS', 'HLX_AIS', 'HLX_AIS_RADAR']
-  const beidou = []
-  const Rardar = []
-  const mmsi = []
-  data.map(s => {
-    if (!!s && s.trackDeviceNo != 0 && extractArr.some(
-        x => x === s.type
-    )) {
-      mmsi.push(s.trackDeviceNo ?? '')
-    } else if (!!s && s.trackDeviceNo != 0 && s.type == 'BEIDOU') {
-      beidou.push(s.trackDeviceNo ?? '')
-    } else {
-      !!s && s.trackId != 0 && Rardar.push(s.trackId ?? '')
-    }
-  })
-  return {
-    RadarbeidouNumber: beidou,
-    faultRadarNum: Rardar,
-    faultmmsiNum: mmsi,
-  }
-}
 </script>
 
 <style lang="scss" scoped>

src/views/web/track/track-point.vue

@@ -2,8 +2,8 @@
   <div class="track-point-overlay">
     <template v-if="ShipMapStore.trackHoverData">
       <div class="name">
-        <template v-if="ShipMapStore.trackHoverData[ShipMapStore.trackKeys.targetName]">
-          {{ShipMapStore.trackHoverData[ShipMapStore.trackKeys.targetName]}}
+        <template v-if="ShipMapStore.trackHoverData[ShipMapStore.trackKeys.targetName] || ShipMapStore.trackHoverData[ShipMapStore.trackKeys.targetNameEn]">
+          {{ShipMapStore.trackHoverData[ShipMapStore.trackKeys.targetName] || ShipMapStore.trackHoverData[ShipMapStore.trackKeys.targetNameEn]}}
         </template>
         <template v-else>
           船名号未知
@@ -102,10 +102,10 @@ const formatDataCpt = computed(() => {
   if (ShipMapStore.trackHoverData) {
     const s = ShipMapStore.trackHoverData[ShipMapStore.trackKeys.targetSourceJson]
     obj.source = getShipSourceNew(s)
-    const {RadarbeidouNumber, faultRadarNum, faultmmsiNum} = filterShipNum(s)
-    obj.radar = faultRadarNum
-    obj.beidou = RadarbeidouNumber
-    obj.mmsi = faultmmsiNum
+    const {radar, beidou, mmsi} = ShipMapStore.targetSourceFormat(s)
+    obj.radar = radar
+    obj.beidou = beidou
+    obj.mmsi = mmsi
   }
   return obj
 })
@@ -127,28 +127,6 @@ const getShipSourceNew = (data) => {
     return text
   })
 }
-const filterShipNum = (data) => {
-  const beidou = []
-  const Rardar = []
-  const mmsi = []
-
-  data.map(s => {
-    if (!!s && s.trackDeviceNo != 0 && extractArr.some(
-        x => x === s.type
-    )) {
-      mmsi.push(s.trackDeviceNo ?? '')
-    } else if (!!s && s.trackDeviceNo != 0 && s.type == 'BEIDOU') {
-      beidou.push(s.trackDeviceNo ?? '')
-    } else {
-      !!s && s.trackId != 0 && Rardar.push(s.trackId ?? '')
-    }
-  })
-  return {
-    RadarbeidouNumber: beidou,
-    faultRadarNum: Rardar,
-    faultmmsiNum: mmsi,
-  }
-}
 </script>
 
 <style scoped lang="scss">

src/views/web/warning/assistant.vue

@@ -13,8 +13,8 @@
         <div class="__hover" @click="onWarningInfo">查看详情</div>
       </div>
       <template v-for="item in infoCpt.dynamicShipList">
-        <div class="target" v-if="item.targetName">{{item.targetName}}（{{item.mergeTarget}}）</div>
-        <div class="target" v-else>{{item.mergeTarget}}</div>
+        <div class="target" v-if="item.targetName">{{item[ShipMapStore.trackKeys.targetName] || item[ShipMapStore.trackKeys.targetNameEn]}}（{{item[ShipMapStore.trackKeys.mergeTarget]}}）</div>
+        <div class="target" v-else>{{item[ShipMapStore.trackKeys.mergeTarget]}}</div>
       </template>
       <div class="content">
         <div class="img">

src/views/web/warning/index.vue

@@ -41,7 +41,7 @@
               <template v-for="ship in item.dynamicShipList">
                 <div class="target">
                   <SvgIcon name="warning" color="#FF0D0D"/>
-                  {{ ship[ShipMapStore.trackKeys.targetName] || ship[ShipMapStore.trackKeys.mergeTarget] }}
+                  {{getTitle(ship)}}
                   <SvgIcon name="track" color="#ffffff" class="__hover" style="margin-left: auto" @click="toTrack(ship, item)"/>
                   <SvgIcon name="focus" color="#ffffff" class="__hover" style="margin-left: 10px;" @click="ShipMapStore.toShip(ship[ShipMapStore.trackKeys.mergeTarget])"/>
                 </div>
@@ -316,6 +316,22 @@ const toTrack = (ship, warning) => {
     })
   }
 }
+const getTitle = (row) => {
+  const nums = ShipMapStore.targetSourceFormat(row[ShipMapStore.trackKeys.targetSourceJson])
+  let str = row[ShipMapStore.trackKeys.mergeTarget]
+  if (row[ShipMapStore.trackKeys.targetName]) {
+    str = row[ShipMapStore.trackKeys.targetName]
+  } else if (row[ShipMapStore.trackKeys.targetNameEn]) {
+    str = row[ShipMapStore.trackKeys.targetNameEn]
+  } else if (row[ShipMapStore.trackKeys.targetNameEn]) {
+    str = row[ShipMapStore.trackKeys.targetNameEn]
+  } else if (nums.beidou?.length > 0) {
+    str = nums.beidou.join(',')
+  } else if (nums.mmsi?.length > 0) {
+    str = nums.mmsi.join(',')
+  }
+  return str
+}
 const onClose = () => {
   emit('update:show', false)
   state.layers.area?.getSource().clear()