From b8ef6f8946de7dc00d9711eb6ba9d1aefe24cde1 Mon Sep 17 00:00:00 2001
From: guanqb <18720758508@163.com>
Date: Wed, 31 Aug 2022 11:09:28 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhny_web
---
src/views/land/cs.vue | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/views/land/cs.vue b/src/views/land/cs.vue
index b6ca830..0e0d4a9 100644
--- a/src/views/land/cs.vue
+++ b/src/views/land/cs.vue
@@ -143,14 +143,24 @@
watch: {
'$farmId': {
handler (newName, oldName) {
- this.farm.id = newName
+ // this.farm.id = newName
//地块页面
- this.onLoad()
+ setTimeout(() => {
+ this.onLoad()
+ }, 100);
+
}
}
},
created () {
- this.farm.id = this.$farmId
+ this.$EventBus.$on('getFarmObj', (farmObj)=>{
+ // this.$nextTick(() => {
+ // this.$EventBus.$emit("setFarmId", farmObj.id);
+ // });
+ setTimeout(() => {
+ this.$EventBus.$emit("setFarmId", farmObj.id);
+ }, 100);
+ })
this.onLoad(this.page)
},
methods: {
@@ -204,7 +214,7 @@
if (typeof (page) == "undefined") {
page = this.page
}
- Object.assign(params, { farmId: this.farm.id })
+ Object.assign(params, { farmId: this.$farmId })
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data
this.page.total = data.total
@@ -322,7 +332,7 @@
left: 1;
bottom: 0;
margin: auto;
- width: 80px;
+ width: 120px;
height: 24px;
line-height: 24px;
border: 1px solid #64c3a4;
--
Gitblit v1.9.3