From 65e08f7e190c20d61842b17f1b7200d9a59a3a38 Mon Sep 17 00:00:00 2001
From: duanliang <duanliang>
Date: Fri, 25 Apr 2025 13:14:44 +0800
Subject: [PATCH] 25

---
 src/views/scenic/components/big-map.vue   | 60 ++++++++++++++---------
 src/views/vehicles/components/big-map.vue | 55 +++++++++++++--------
 2 files changed, 70 insertions(+), 45 deletions(-)

diff --git a/src/views/scenic/components/big-map.vue b/src/views/scenic/components/big-map.vue
index e312af7..4f433f0 100644
--- a/src/views/scenic/components/big-map.vue
+++ b/src/views/scenic/components/big-map.vue
@@ -232,31 +232,43 @@ let tabsIndex = ref(0)
   			list.value.map((item, i) => {
   				console.log(item,'item')
   			  if (item.lng && item.lat) {
-  			    if (item.status == '行驶') {
-  					if(item.accstatus==1){
-						addMarker(shipIcon, [item.lng, item.lat], [36, 50])
+  			 //    if (item.status == '行驶') {
+  				// 	if(item.type==1){
+						// addMarker(shipIcon, [item.lng, item.lat], [36, 50])
   						
-  					}else{
-  						addMarker(carIcon, [item.lng, item.lat], [36, 50])
-  					}
-  			    }
-  			    if (item.status == '离线') {
-  					if(item.accstatus==1){
-  						addMarker(shipOfflineIcon, [item.lng, item.lat], [36, 50])
-  					}else{
-  						
-						addMarker(carOfflineIcon, [item.lng, item.lat], [36, 50])
-  					}
-  			      
-  			    }
-  			    if (item.status == '静止') {
-  			      
-  				  if(item.accstatus==1){
-					  addMarker(shipStopIcon, [item.lng, item.lat], [36, 50])
-  				  }else{
-  				  	addMarker(carStopIcon, [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])
+			 		
+			 	}else{
+			 		addMarker(carIcon, [item.lng, item.lat], [36, 50])
+			 	}
+			 }else{
+				 if (item.status == '离线') {
+				 	if(item.type==1){
+				 		addMarker(shipOfflineIcon, [item.lng, item.lat], [36, 50])
+				 	}else{
+				 		
+				 		addMarker(carOfflineIcon, [item.lng, item.lat], [36, 50])
+				 	}
+				   
+				 }
+				 if (item.status == '静止') {
+				   
+				   if(item.type==1){
+				 	  addMarker(shipStopIcon, [item.lng, item.lat], [36, 50])
+				   }else{
+				   	addMarker(carStopIcon, [item.lng, item.lat], [36, 50])
+				   }
+				 }
+			 }
+  			
+				
   			    marker.value.addEventListener('click', (e) => {
   					e.sim = e.target.sim
   					currentMarker.value = carOverlays.value.find(
diff --git a/src/views/vehicles/components/big-map.vue b/src/views/vehicles/components/big-map.vue
index caa8277..325bc4c 100644
--- a/src/views/vehicles/components/big-map.vue
+++ b/src/views/vehicles/components/big-map.vue
@@ -217,34 +217,47 @@ import PubSub from 'pubsub-js'
 			  
 		  }else{
 			list.value.map((item, i) => {
-				console.log(item,'item')
+				// console.log(item,'item')
+				
 			  if (item.lng && item.lat) {
-			    if (item.status == '行驶') {
-					if(item.accstatus==1){
+				  console.log(item,2255555555)
+			  //   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])
 						
 					}else{
 						addMarker(carIcon, [item.lng, item.lat], [36, 50])
 					}
-			    }
-			    if (item.status == '离线') {
-					if(item.accstatus==1){
-						addMarker(shipOfflineIcon, [item.lng, item.lat], [36, 50])
-						
-					}else{
-						addMarker(carOfflineIcon, [item.lng, item.lat], [36, 50])
+				}else{
+					if (item.status == '离线') {
+						if(item.type==1){
+							addMarker(shipOfflineIcon, [item.lng, item.lat], [36, 50])
+							
+						}else{
+							addMarker(carOfflineIcon, [item.lng, item.lat], [36, 50])
+						}
+					  
 					}
-			      
-			    }
-			    if (item.status == '静止') {
-			      
-				  if(item.accstatus==1){
-					  addMarker(shipStopIcon, [item.lng, item.lat], [36, 50])
-				  	
-				  }else{
-				  	 addMarker(carStopIcon, [item.lng, item.lat], [36, 50])
-				  }
-			    }
+					if (item.status == '静止') {
+					  
+					  if(item.type==1){
+						  addMarker(shipStopIcon, [item.lng, item.lat], [36, 50])
+					  	
+					  }else{
+					  	 addMarker(carStopIcon, [item.lng, item.lat], [36, 50])
+					  }
+					}
+				}
 			    marker.value.addEventListener('click', (e) => {
 					e.sim = e.target.sim
 					currentMarker.value = carOverlays.value.find(