26

src/views/monitor/components/box-2.vue

@@ -277,7 +277,13 @@
     })
   }
   const onInput = debounce((e) => {
-    getVideoRegions('search')
+	  
+	  if(e){
+		  getVideoRegions('search')
+	  }else{
+		  getVideoRegions()
+	  }
+    
   }, 500)
   const clearHlsRefs = () => {
     if (hlsRefs.length > 0) {
@@ -514,6 +520,9 @@
 	if(search=='search'){
 		regionList.value.forEach((item,index)=>{
 			item.show = true
+			item.resourcesList.forEach((r,i)=>{
+				r.show = true
+			})
 		})
 	}
 	

src/views/scenic/components/big-map.vue

@@ -260,10 +260,10 @@ let tabsIndex = ref(0)
 				 }
 				 if (item.status == '静止') {
 				   if(item.type==1){
-				   	addMarker(shipIcon, [item.lng, item.lat], [36, 50])
+				   	addMarker(shipOfflineIcon, [item.lng, item.lat], [36, 50])
 				   	
 				   }else{
-				   	addMarker(carIcon, [item.lng, item.lat], [36, 50])
+				   	addMarker(carOfflineIcon, [item.lng, item.lat], [36, 50])
 				   }
 				   // if(item.type==1){
 				 	 //  addMarker(shipStopIcon, [item.lng, item.lat], [36, 50])

src/views/vehicles/components/big-map.vue

@@ -231,7 +231,7 @@ import PubSub from 'pubsub-js'
 					// }
 			  //   }
 				if (item.accStatus == 1) {
-					
+					console.log(item,9999999999)
 					if(item.type==1){
 						addMarker(shipIcon, [item.lng, item.lat], [36, 50])
 						
@@ -250,10 +250,10 @@ import PubSub from 'pubsub-js'
 					}
 					if (item.status == '静止') {
 					  if(item.type==1){
-					  	addMarker(shipIcon, [item.lng, item.lat], [36, 50])
+					  	addMarker(shipOfflineIcon, [item.lng, item.lat], [36, 50])
 					  	
 					  }else{
-					  	addMarker(carIcon, [item.lng, item.lat], [36, 50])
+					  	addMarker(carOfflineIcon, [item.lng, item.lat], [36, 50])
 					  }
 					  // if(item.type==1){
 						 //  addMarker(shipStopIcon, [item.lng, item.lat], [36, 50])