| 
														
															@@ -25,8 +25,8 @@ class SamplePointLayer { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     let vectorStyle = new KMap.VectorStyle(); 
														 | 
														
														 | 
														
															     let vectorStyle = new KMap.VectorStyle(); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     this.vectorStyle = vectorStyle; 
														 | 
														
														 | 
														
															     this.vectorStyle = vectorStyle; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     this.clusterSource = new Cluster({ 
														 | 
														
														 | 
														
															     this.clusterSource = new Cluster({ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-      distance: 15, 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-      minDistance: 60, 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+      distance: 10, 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+      minDistance: 10, 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     }); 
														 | 
														
														 | 
														
															     }); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     this.mapRef = map 
														 | 
														
														 | 
														
															     this.mapRef = map 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -97,7 +97,7 @@ class SamplePointLayer { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															       return res 
														 | 
														
														 | 
														
															       return res 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     } 
														 | 
														
														 | 
														
															     } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     for(let item of features){ 
														 | 
														
														 | 
														
															     for(let item of features){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-      res = res.get('status') > item.get('status') ? res : item 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+      res = res.get('status') > item.get('status') && item.get('noImg') === 0 && item.get('wys') === 1 ? res : item 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     } 
														 | 
														
														 | 
														
															     } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     return res; 
														 | 
														
														 | 
														
															     return res; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															   } 
														 | 
														
														 | 
														
															   } 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -211,12 +211,14 @@ class SamplePointLayer { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     if(item.status == 3){ 
														 | 
														
														 | 
														
															     if(item.status == 3){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															       imgSrc = require('@/assets/images/map/status/status-ch.png') 
														 | 
														
														 | 
														
															       imgSrc = require('@/assets/images/map/status/status-ch.png') 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     } 
														 | 
														
														 | 
														
															     } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     if(item.wys === '1'){ 
														 | 
														
														 | 
														
															     if(item.wys === '1'){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															       scale = 0.3 
														 | 
														
														 | 
														
															       scale = 0.3 
														 | 
													
												
											
												
													
														| 
														 | 
														
															       imgSrc = require('@/assets/images/map/status/wns.png') 
														 | 
														
														 | 
														
															       imgSrc = require('@/assets/images/map/status/wns.png') 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     } 
														 | 
														
														 | 
														
															     } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     if(item.farmId === 90263){ 
														 | 
														
														 | 
														
															     if(item.farmId === 90263){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-      if(item.highYield !== 1){ 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+      if(item.noImg === 1){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         imgSrc = require('@/assets/images/map/status/defalut-icon.png') 
														 | 
														
														 | 
														
															         imgSrc = require('@/assets/images/map/status/defalut-icon.png') 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         scale = 0.3 
														 | 
														
														 | 
														
															         scale = 0.3 
														 | 
													
												
											
												
													
														| 
														 | 
														
															       } 
														 | 
														
														 | 
														
															       } 
														 |