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

25

Browse Source
This commit is contained in:
duanliang
2025-04-25 13:14:44 +08:00
parent 8a29b3a6e7
commit 65e08f7e19
2 changed files with 70 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -232,16 +232,25 @@ let tabsIndex = ref(0)
list.value.map((item, i) => { list.value.map((item, i) => {
console.log(item,'item') console.log(item,'item')
if (item.lng && item.lat) { if (item.lng && item.lat) {
if (item.status == '行驶') { // if (item.status == '行驶') {
if(item.accstatus==1){ // if(item.type==1){
// addMarker(shipIcon, [item.lng, item.lat], [36, 50])
// }else{
// addMarker(carIcon, [item.lng, item.lat], [36, 50])
// }
// }
if (item.accStatus == 1) {
if(item.type==1){
addMarker(shipIcon, [item.lng, item.lat], [36, 50]) addMarker(shipIcon, [item.lng, item.lat], [36, 50])
}else{ }else{
addMarker(carIcon, [item.lng, item.lat], [36, 50]) addMarker(carIcon, [item.lng, item.lat], [36, 50])
} }
} }else{
if (item.status == '离线') { if (item.status == '离线') {
if(item.accstatus==1){ if(item.type==1){
addMarker(shipOfflineIcon, [item.lng, item.lat], [36, 50]) addMarker(shipOfflineIcon, [item.lng, item.lat], [36, 50])
}else{ }else{
@@ -251,12 +260,15 @@ let tabsIndex = ref(0)
} }
if (item.status == '静止') { if (item.status == '静止') {
if(item.accstatus==1){ if(item.type==1){
addMarker(shipStopIcon, [item.lng, item.lat], [36, 50]) addMarker(shipStopIcon, [item.lng, item.lat], [36, 50])
}else{ }else{
addMarker(carStopIcon, [item.lng, item.lat], [36, 50]) addMarker(carStopIcon, [item.lng, item.lat], [36, 50])
} }
} }
}
marker.value.addEventListener('click', (e) => { marker.value.addEventListener('click', (e) => {
e.sim = e.target.sim e.sim = e.target.sim
currentMarker.value = carOverlays.value.find( currentMarker.value = carOverlays.value.find(

25
src/views/vehicles/components/big-map.vue
View File

@@ -217,18 +217,30 @@ import PubSub from 'pubsub-js'
}else{ }else{
list.value.map((item, i) => { list.value.map((item, i) => {
console.log(item,'item') // console.log(item,'item')
if (item.lng && item.lat) { if (item.lng && item.lat) {
if (item.status == '行驶') { console.log(item,2255555555)
if(item.accstatus==1){ // if (item.status == '行驶') {
// console.log(item,'8888888888888888')
// if(item.type==1){
// addMarker(shipIcon, [item.lng, item.lat], [36, 50])
// }else{
// addMarker(carIcon, [item.lng, item.lat], [36, 50])
// }
// }
if (item.accStatus == 1) {
if(item.type==1){
addMarker(shipIcon, [item.lng, item.lat], [36, 50]) addMarker(shipIcon, [item.lng, item.lat], [36, 50])
}else{ }else{
addMarker(carIcon, [item.lng, item.lat], [36, 50]) addMarker(carIcon, [item.lng, item.lat], [36, 50])
} }
} }else{
if (item.status == '离线') { if (item.status == '离线') {
if(item.accstatus==1){ if(item.type==1){
addMarker(shipOfflineIcon, [item.lng, item.lat], [36, 50]) addMarker(shipOfflineIcon, [item.lng, item.lat], [36, 50])
}else{ }else{
@@ -238,13 +250,14 @@ import PubSub from 'pubsub-js'
} }
if (item.status == '静止') { if (item.status == '静止') {
if(item.accstatus==1){ if(item.type==1){
addMarker(shipStopIcon, [item.lng, item.lat], [36, 50]) addMarker(shipStopIcon, [item.lng, item.lat], [36, 50])
}else{ }else{
addMarker(carStopIcon, [item.lng, item.lat], [36, 50]) addMarker(carStopIcon, [item.lng, item.lat], [36, 50])
} }
} }
}
marker.value.addEventListener('click', (e) => { marker.value.addEventListener('click', (e) => {
e.sim = e.target.sim e.sim = e.target.sim
currentMarker.value = carOverlays.value.find( currentMarker.value = carOverlays.value.find(