diff --git a/src/views/scenic/components/big-map.vue b/src/views/scenic/components/big-map.vue index 13878cd..497d5d6 100644 --- a/src/views/scenic/components/big-map.vue +++ b/src/views/scenic/components/big-map.vue @@ -58,6 +58,7 @@ import { getGpsListApi, getGpsStatusListApi } from '@/api/scenic' import closeIcon from '@/assets/images/close.png' + import carIcon from '@/assets/images/car.png' import carStopIcon from '@/assets/images/car-stop.png' import carOfflineIcon from '@/assets/images/car-offline.png' @@ -219,7 +220,7 @@ lat: props.shipList[j].lat }) flag = true - break + continue } } } diff --git a/src/views/scenic/components/box-2.vue b/src/views/scenic/components/box-2.vue index 2913c32..efd99cf 100644 --- a/src/views/scenic/components/box-2.vue +++ b/src/views/scenic/components/box-2.vue @@ -312,7 +312,12 @@ import PubSub from 'pubsub-js' import carIcon from '@/assets/images/car.png' + import carStopIcon from '@/assets/images/car-stop.png' + import carOfflineIcon from '@/assets/images/car-offline.png' + import shipIcon from '@/assets/images/ship.png' + import shipStopIcon from '@/assets/images/ship-stop.png' + import shipOfflineIcon from '@/assets/images/ship-offline.png' import age from './age' import jam from './jam' @@ -382,13 +387,21 @@ lat: val.car.list[j].lat }) flag = true - break + continue } } } } else { val.car.list.map((item, i) => { - addMarker(carIcon, [item.lng, item.lat], [36, 50]) + if (item.status == '行驶') { + addMarker(carIcon, [item.lng, item.lat], [36, 50]) + } + if (item.status == '离线') { + addMarker(carOfflineIcon, [item.lng, item.lat], [36, 50]) + } + if (item.status == '静止') { + addMarker(carStopIcon, [item.lng, item.lat], [36, 50]) + } carOverlays.value[i] = marker.value }) } @@ -404,13 +417,21 @@ lat: val.ship.list[j].lat }) flag = true - break + continue } } } } else { val.ship.list.map((item, i) => { - addMarker(shipIcon, [item.lng, item.lat], [36, 50]) + if (item.status == '行驶') { + addMarker(shipIcon, [item.lng, item.lat], [36, 50]) + } + if (item.status == '离线') { + addMarker(shipOfflineIcon, [item.lng, item.lat], [36, 50]) + } + if (item.status == '静止') { + addMarker(shipStopIcon, [item.lng, item.lat], [36, 50]) + } shipOverlays.value[i] = marker.value }) }