fix：去掉全部区域

src/components/navigation.vue

@@ -55,10 +55,10 @@ function gardenOrganId(farmId){
     organId.value = farmId
     VE_API.region.list({farmId}).then(res =>{
         options.value = res.data
-        options.value.unshift({
-            id:0,
-            name:'全部区域'
-        })
+        // options.value.unshift({
+        //     id:0,
+        //     name:'全部区域'
+        // })
         areaId.value = res.data[0].id
         eventBus.emit('area:id',{areaId:areaId.value,farmId})
         sessionStorage.setItem('regionId',areaId.value)

src/views/home/index.vue

@@ -186,12 +186,12 @@ onUnmounted(() => {
 
 const blueList = ref([]);
 const getBlueRegionList = (callback) => {
-    let selectAll = undefined
-    if(regionId.value===0){
-        selectAll = 1
-    }
-    const areaId = selectAll?undefined:regionId.value
-    VE_API.farm.blueRegionList({ farmId: organId.value, regionId: areaId,selectAll }).then(({ data }) => {
+    // let selectAll = undefined
+    // if(regionId.value===0){
+    //     selectAll = 1
+    // }
+    // const areaId = selectAll?undefined:regionId.value
+    VE_API.farm.blueRegionList({ farmId: organId.value, regionId: regionId.value }).then(({ data }) => {
         blueList.value = data.map((item) => {
             let color = "rgba(255, 255, 255, 0.5)"; //失效区域
             if (item.status === 2) {

src/views/home/map/samplePointLayer.js

@@ -94,17 +94,18 @@ class SamplePointLayer {
   initData(farmId, regionId){
     let that = this
     let selectAll = undefined
-    if(regionId===0){
-        selectAll = 1
-    }
-    const areaId = selectAll?undefined:regionId
-    VE_API.variety.pointList({farmId,regionId:areaId,selectAll}).then(({data})=>{
+    // if(regionId===0){
+    //     selectAll = 1
+    // }
+    // const areaId = selectAll?undefined:regionId
+    VE_API.variety.pointList({farmId,regionId}).then(({data})=>{
       let features = []
       for(let item of data){
         item.iconName='defalut'
         that.getIcon(item)
         let point = newPoint(item);
         features.push(point)
+        // console.log('item.dyImg',item.dyImg);
       }
       const source = new VectorSource({
         features: features,

src/views/warningHome/map/mockFarmLayer.js

@@ -49,7 +49,7 @@ class MockFarmLayer {
                     const lby = {}
                     const jgjd = {
                         disease:'',
-                        grow:'花苞',
+                        grow:'谢花',
                         img:'https://birdseye-img.sysuimars.com/birdseye-look-mini/img_crop/bch/ch/cropped_DJI_20240707184352_0041_V_9.jpg',
                         name:'井冈基地',
                         mapId:2,
@@ -118,9 +118,11 @@ class MockFarmLayer {
                 that.setProperties(feature,f)
                 let text = "";
                 let fontColor = "#ffffff"
-                if(name==='井冈基地'){
-                    console.log('井冈基地',grow);
-                }
+                // console.log('name',name);
+                // if(name==='HS.89215'){
+                //     name = ''
+                //     console.log('111111',grow);
+                // }
                 if (disease) {
                     text = disease;
                     styles.push(that.textBgStyle("#EFEEEE","#EFEEEE"));
@@ -157,6 +159,11 @@ class MockFarmLayer {
         this.clusterSource.clear()
         let features = []
         for(let item of data){
+            // if(item.name==='HS.89215'){
+            //     item.name = ''
+            //     item.wkt = 'POINT(113.5081595 23.5320866)'
+            //     console.log('GZ.88209',item);
+            // }
             features.push(newPoint(item,"wkt","mock_farm_data"))
         }
         this.clusterSource.addFeatures(features)