wangsisi 2 недель назад
Родитель
Сommit
ab163769c8

BIN
src/assets/images/map/status/wns.png


+ 6 - 1
src/views/home/index.vue

@@ -102,6 +102,10 @@
                     <img src="@/assets/images/map/status/status-ch.png" alt="" />
                     虫害异常
                 </div>
+                <div class="item">
+                    <img src="@/assets/images/map/status/wns.png" alt="" />
+                    万年树
+                </div>
             </div>
         </div>
     </div>
@@ -186,7 +190,8 @@ const getBlueRegionList = (callback) => {
     if(regionId.value===0){
         selectAll = 1
     }
-    VE_API.farm.blueRegionList({ farmId: organId.value, regionId: regionId.value,selectAll }).then(({ data }) => {
+    const areaId = selectAll?undefined:regionId.value
+    VE_API.farm.blueRegionList({ farmId: organId.value, regionId: areaId,selectAll }).then(({ data }) => {
         blueList.value = data.map((item) => {
             let color = "rgba(255, 255, 255, 0.5)"; //失效区域
             if (item.status === 2) {

+ 4 - 1
src/views/home/map/samplePointLayer.js

@@ -187,12 +187,15 @@ class SamplePointLayer {
     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')
+    }
     item["icon"] = imgSrc
     item["scale"] = scale
   }
 
   reset(farm, region){
-    console.log('farm',farm);
     this.clearCluster()
     this.initData(farm.id, region.id)
   }