From 7ae4b4b6679ba419cfd92d2a60ed603c2c8a446d Mon Sep 17 00:00:00 2001
From: xiebin <123456>
Date: Thu, 11 Aug 2022 16:59:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/land/cs.vue |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/src/views/land/cs.vue b/src/views/land/cs.vue
index 3584296..1ce9628 100644
--- a/src/views/land/cs.vue
+++ b/src/views/land/cs.vue
@@ -105,6 +105,7 @@
                 keyword: "",
             },
             query: {},
+            farm:{},
             value: true,
             farmingCount: 0,
             landVisible: false,
@@ -128,9 +129,19 @@
         }
     },
     computed: {
-        ...mapGetters(["userInfo"]),
+        ...mapGetters(["userInfo","$farmId"]),
     },
+    watch: {
+    '$farmId':{
+      handler (newName, oldName) {
+        this.farm.id = newName
+        //地块页面
+        this.onLoad()
+      }
+    }
+  },
     created () {
+        this.farm.id = this.$farmId
         this.onLoad(this.page)
     },
     methods: {
@@ -184,6 +195,7 @@
             if(typeof(page) == "undefined" ){
                 page = this.page
             }
+            Object.assign(params,{farmId:this.farm.id})
             getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
                 const data = res.data.data
                 this.page.total = data.total

--
Gitblit v1.9.3