lixuefeng/fengjie-datascreen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:完善景区首页-车船状态区分

Browse Source
This commit is contained in:
zjc
2025-03-11 12:53:35 +08:00
parent 7690fbac95
commit a63ace50c4
2 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/scenic/components/big-map.vue
View File

@@ -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
}
}
}

29
src/views/scenic/components/box-2.vue
View File

@@ -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
})
}