Merge branch 'master' of http://192.168.0.105:10010/r/zhny_web

guanqb

2022-08-31 b8ef6f8946de7dc00d9711eb6ba9d1aefe24cde1

 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;