From 082613d446e29e4ec1c16bfaa52345106a498b23 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 08 Nov 2022 09:03:49 +0800
Subject: [PATCH] 农事操作隐藏后四个，地图模式2d改为3d

---
 src/views/mapPattern/index.vue |   43 +++++++++++++++++++++++++++----------------
 1 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/src/views/mapPattern/index.vue b/src/views/mapPattern/index.vue
index 485ce09..d178ba1 100644
--- a/src/views/mapPattern/index.vue
+++ b/src/views/mapPattern/index.vue
@@ -59,7 +59,7 @@
 
         <div class="farm-land">
             <div class="title">
-                <span>地块 · {{ this.pageLand.total }}种</span>
+                <span>地块 · {{ this.pageLand.total }}个</span>
             </div>
             <div class="content">
                 <div
@@ -162,12 +162,12 @@
     data () {
         return {
             page: {
-                pageSize: 10,
+                pageSize: 100,
                 currentPage: 1,
                 total: 0,
             },
             pageLand: {
-                pageSize: 10,
+                pageSize: 100,
                 currentPage: 1,
                 total: 0,
             },
@@ -199,9 +199,17 @@
 
     },
     computed: {
-        ...mapGetters(["userInfo"]),
+        ...mapGetters(["userInfo", "$farmId"]),
     },
     created () {
+        if (this.$farmId == 0){
+          if (sessionStorage.getItem("myFarmId")){
+            this.$store.commit("SET_FARMID",JSON.parse(sessionStorage.getItem("myFarmId")))
+          }
+        }
+        window.addEventListener('beforeunload', () => {
+          sessionStorage.setItem('myFarmId', JSON.stringify(this.$farmId))
+        })
         //获取种样品列表
         this.getFarmPlantList(this.page)
         //获取地块列表
@@ -216,7 +224,8 @@
     methods: {
         //获取种养品列表
         getFarmPlantList (page, params = {}) {
-            params['farmId'] = this.userInfo.farmId
+            params['farmId'] = this.$farmId
+            params['status'] = 1
             this.loading = true
             getList(
                 page.currentPage,
@@ -254,8 +263,11 @@
                     }
                 })
 
-                this.plotPlantBreed = arr
+                arr.forEach((e)=>{
+                    e.area = e.area.toFixed(3)
+                })
 
+                this.plotPlantBreed = arr
 
                 this.loading = false
 
@@ -266,7 +278,8 @@
         },
         //获取地块列表
         getLandList (page, params = {}) {
-            params['farmId'] = this.userInfo.farmId
+          const that = this
+            params['farmId'] = this.$farmId
             params['tenantId'] = this.userInfo.tenant_id
             this.loading = true
             getLandList(
@@ -286,8 +299,7 @@
                         arr.forEach(it => {
                             brr.push(it.split(' '))
                         })
-
-                        this.$refs.plotMap.addPlotPolygon(brr, item)
+                      that.$refs.plotMap.addPlotPolygon(brr, item)
                     }
                 })
 
@@ -299,38 +311,38 @@
         },
         //返回上一页
         goToBack () {
+            this.$EventBus.$emit("getFarmObj", this.farmInfo);
             this.$router.go(-1)
         },
         //获取农场信息
         getFarmInfo () {
             var that = this
-            getDetails(this.userInfo.farmId).then(res => {
+            getDetails(this.$farmId).then(res => {
                 that.farmInfo = res.data.data
             })
         },
         //获取统计面积信息
         getLandCount () {
-            selectCount(this.userInfo.farmId).then(res => {
+            selectCount(this.$farmId).then(res => {
                 this.landAreaInfo = res.data.data
             })
         },
         //获取地块轮廓统计信息
         getLandIsAreaStatistic () {
-            getLandIsAreaStatistic(this.userInfo.farmId).then(res => {
-                console.log(res)
+            getLandIsAreaStatistic(this.$farmId).then(res => {
                 this.landIsAreaStatistic = res.data.data
             })
         },
 
         // 地块定位
         setCenter (item) {
-            this.$refs.plotMap.setPlotCenter(item.landName)
+            console.log(item)
+            this.$refs.plotMap.setPlotCenter(item)
         },
 
         plotDetailsPopupShow (params) {
             this.currentPlotDetails = params
             this.currentPlotName = params.landName
-
             let arr = []
 
             this.farmPlantList.forEach((item, index) => {
@@ -351,7 +363,6 @@
             }
 
             if (this.$refs.showCP) {
-                console.log(1)
                 let isSelf = this.$refs.showCP.contains(e.target)
                 if (!isSelf) {
                     this.plotClickNum = 0

--
Gitblit v1.9.3