|
@@ -61,35 +61,35 @@
|
|
|
<span>未知</span>
|
|
|
</template>
|
|
|
</div>
|
|
|
- <div>融合批次号:<span>{{ value.data[ShipMapStore.trackKeys.mergeTarget] }}</span></div>
|
|
|
+ <div>融合批次号: <span>{{ value.data[ShipMapStore.trackKeys.mergeTarget] }}</span></div>
|
|
|
</template>
|
|
|
</template>
|
|
|
<template v-else>
|
|
|
- <div>北斗号:<span>{{ value.archiveParams.data?.beidouId }}</span></div>
|
|
|
- <div>MMSI:<span>{{ value.archiveParams.data?.mmsi }}</span></div>
|
|
|
+ <div>北斗号: <span>{{ value.archiveParams.data?.beidouId }}</span></div>
|
|
|
+ <div>MMSI: <span>{{ value.archiveParams.data?.mmsi }}</span></div>
|
|
|
</template>
|
|
|
</div>
|
|
|
<div class="line"/>
|
|
|
<div class="other">
|
|
|
<template v-if="value.archiveParams.tab == 1">
|
|
|
- <div>经度:{{ Number(value.data[ShipMapStore.trackKeys.lon]).toFixed(6) }}</div>
|
|
|
- <div>纬度:{{ Number(value.data[ShipMapStore.trackKeys.lat]).toFixed(6) }}</div>
|
|
|
- <div>船迹向:{{ Number(value.data[ShipMapStore.trackKeys.course]).toFixed(2) }}°</div>
|
|
|
+ <div>经度: {{ Number(value.data[ShipMapStore.trackKeys.lon]).toFixed(6) }}</div>
|
|
|
+ <div>纬度: {{ Number(value.data[ShipMapStore.trackKeys.lat]).toFixed(6) }}</div>
|
|
|
+ <div>船迹向: {{ Number(value.data[ShipMapStore.trackKeys.course]).toFixed(2) }}°</div>
|
|
|
<!-- <div>船艏向:{{ value.data.[ShipMapStore.trackKeys.targetName] ? (Number(value.data.targetHeading.toFixed(2) + '°')) : '未知' }}</div>-->
|
|
|
- <div>航速:{{ Number(value.data[ShipMapStore.trackKeys.speed]).toFixed(1) }}节</div>
|
|
|
+ <div>航速: {{ Number(value.data[ShipMapStore.trackKeys.speed]).toFixed(1) }}节</div>
|
|
|
</template>
|
|
|
<template v-else>
|
|
|
- <div>船舶类型:{{ DictionaryStore.shipTypeMap.get(value.archiveParams.data?.type) }}</div>
|
|
|
- <div>持证类型:{{ DictionaryStore.certTypeMap.get(value.archiveParams.data?.certType) }}</div>
|
|
|
- <div>最大航速:{{ value.archiveParams.data?.maxSpeed }}</div>
|
|
|
- <div>船长:{{ value.archiveParams.data?.length }}</div>
|
|
|
- <div>船宽:{{ value.archiveParams.data?.width }}</div>
|
|
|
- <div>重点船舶:{{ DictionaryStore.certTypeMap.get(value.archiveParams.data?.important) }}</div>
|
|
|
+ <div>船舶类型: {{ DictionaryStore.shipTypeMap.get(value.archiveParams.data?.type) }}</div>
|
|
|
+ <div>持证类型: {{ DictionaryStore.certTypeMap.get(value.archiveParams.data?.certType) }}</div>
|
|
|
+ <div>最大航速: {{ value.archiveParams.data?.maxSpeed }}</div>
|
|
|
+ <div>船长: {{ value.archiveParams.data?.length }}</div>
|
|
|
+ <div>船宽: {{ value.archiveParams.data?.width }}</div>
|
|
|
+ <div>重点船舶: {{ DictionaryStore.certTypeMap.get(value.archiveParams.data?.important) }}</div>
|
|
|
</template>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="update">
|
|
|
- 更新时间:{{ $util.YMDHms(value.data[ShipMapStore.trackKeys.mergeTime]) }}
|
|
|
+ 更新时间: {{ $util.YMDHms(value.data[ShipMapStore.trackKeys.mergeTime]) }}
|
|
|
</div>
|
|
|
</div>
|
|
|
</DragWindow>
|
|
@@ -151,7 +151,7 @@ const getNumbers = (data) => {
|
|
|
mmsi: [],
|
|
|
mergeTarget: data.mergeTarget
|
|
|
}
|
|
|
- const s = JSON.parse(data[ShipMapStore.trackKeys.targetSourceJson])
|
|
|
+ const s = data[ShipMapStore.trackKeys.targetSourceJson]
|
|
|
const {RadarbeidouNumber, faultRadarNum, faultmmsiNum} = filterShipNum(s)
|
|
|
obj.radar = faultRadarNum
|
|
|
obj.beidou = RadarbeidouNumber
|
|
@@ -164,14 +164,14 @@ const filterShipNum = (data) => {
|
|
|
const Rardar = []
|
|
|
const mmsi = []
|
|
|
data.map(s => {
|
|
|
- if (!!s && s.track_device_no != 0 && extractArr.some(
|
|
|
+ if (!!s && s.trackDeviceNo != 0 && extractArr.some(
|
|
|
x => x === s.type
|
|
|
)) {
|
|
|
- mmsi.push(s.track_device_no ?? '')
|
|
|
- } else if (!!s && s.track_device_no != 0 && s.type == 'BEIDOU') {
|
|
|
- beidou.push(s.track_device_no ?? '')
|
|
|
+ mmsi.push(s.trackDeviceNo ?? '')
|
|
|
+ } else if (!!s && s.trackDeviceNo != 0 && s.type == 'BEIDOU') {
|
|
|
+ beidou.push(s.trackDeviceNo ?? '')
|
|
|
} else {
|
|
|
- !!s && s.track_id != 0 && Rardar.push(s.track_id ?? '')
|
|
|
+ !!s && s.trackId != 0 && Rardar.push(s.trackId ?? '')
|
|
|
}
|
|
|
})
|
|
|
return {
|