Merge branch 'master' of http://www.sysuimars.cn:3000/feiniao/feiniao-pc-vue

src/views/Login.vue

@@ -90,7 +90,7 @@ const store = useStore();
 const router = useRouter();
 const form = reactive({
   "code": "",
-  "phone": "游客"
+  "phone": "13797066447"
 });
 const { phone, code } = toRefs(form);
 const ref_form = ref(null);

src/views/home/map/samplePointLayer.js

@@ -25,8 +25,8 @@ class SamplePointLayer {
     let vectorStyle = new KMap.VectorStyle();
     this.vectorStyle = vectorStyle;
     this.clusterSource = new Cluster({
-      distance: 15,
-      minDistance: 60,
+      distance: 10,
+      minDistance: 10,
     });
     this.mapRef = map
 
@@ -108,7 +108,7 @@ class SamplePointLayer {
       return res
     }
     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;
   }
@@ -266,12 +266,14 @@ toggleFilePoint(arr) {
     if(item.status == 3){
       imgSrc = require('@/assets/images/map/status/status-ch.png')
     }
+
     if(item.wys === '1'){
       scale = 0.3
       imgSrc = require('@/assets/images/map/status/wns.png')
     }
+
     if(item.farmId === 90263){
-      if(item.highYield !== 1){
+      if(item.noImg === 1){
         imgSrc = require('@/assets/images/map/status/defalut-icon.png')
         scale = 0.3
       }