瀏覽代碼

feat:添加全部区域显示

wangsisi 2 周之前
父節點
當前提交
ea746872a5
共有 3 個文件被更改,包括 15 次插入3 次删除
  1. 4 0
      src/components/navigation.vue
  2. 5 1
      src/views/home/index.vue
  3. 6 2
      src/views/home/map/samplePointLayer.js

+ 4 - 0
src/components/navigation.vue

@@ -45,6 +45,10 @@ function gardenOrganId(farmId){
     organId.value = farmId
     VE_API.region.list({farmId}).then(res =>{
         options.value = res.data
+        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)

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

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

+ 6 - 2
src/views/home/map/samplePointLayer.js

@@ -93,7 +93,11 @@ class SamplePointLayer {
 
   initData(farmId, regionId){
     let that = this
-    VE_API.image.pointByRegionId({farmId,regionId}).then(({data})=>{
+    let selectAll = undefined
+    if(regionId===0){
+        selectAll = 1
+    }
+    VE_API.image.pointByRegionId({farmId,regionId,selectAll}).then(({data})=>{
       let features = []
       for(let item of data){
         item.iconName='defalut'
@@ -106,7 +110,7 @@ class SamplePointLayer {
       });
       that.clusterSource.setSource(source)
       setTimeout(()=>{
-        that.mapRef.fit(this.treeClusterLayer.source.getExtent(), {padding:[100,100,100,100]})
+        that.mapRef.fit(that.clusterSource.source.getExtent(), {padding:[100,100,100,100]})
       },100)
     })
   }