| 
					
				 | 
			
			
				@@ -67,9 +67,9 @@ class SamplePointLayer { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   getIconStyle(feature){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     let style = new Style({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       image: new Icon({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        // src: feature.get('icon'), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        src: require(`@/assets/images/map/${feature.get('iconName')}-icon.png`), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        scale:0.25, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        src: feature.get('icon'), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        // src: require(`@/assets/images/map/${feature.get('iconName')}-icon.png`), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        scale:feature.get('scale'), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     return style 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -168,17 +168,22 @@ class SamplePointLayer { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   getIcon(item){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    // let imgSrc = require(`@/assets/images/map/${item.iconName}-icon.png`) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    // if(item.status == 9){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    //   imgSrc = require('@/assets/images/map/active-icon.png') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    // } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    // if(item.status == 2){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    //   imgSrc = require('@/assets/status/status_szyc.png') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    // } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    // if(item.status == 3){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    //   imgSrc = require('@/assets/status/status_bcyc.png') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    // } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    // item["icon"] = imgSrc 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    console.log(item) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    let imgSrc = require(`@/assets/images/map/${item.iconName}-icon.png`) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    let scale = 0.25 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    if(item.status == 1){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      imgSrc = require('@/assets/images/map/active-icon.png') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    if(item.status == 2){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      imgSrc = require('@/assets/status/status_szyc.png') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      scale = 0.8 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    if(item.status == 3){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      imgSrc = require('@/assets/status/status_bcyc.png') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      scale = 0.8 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    item["icon"] = imgSrc 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    item["scale"] = scale 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   reset(farm, region){ 
			 |