Merge remote-tracking branch 'origin/master'

xiebin

2022-08-30 0bc3c246857eb2b9c2ef1f803a7d5b4043451d84

 src/views/mapPattern/index.vue

@@ -303,6 +303,7 @@
        },
        //返回上一页
        goToBack () {
            this.$EventBus.$emit("getFarmObj", this.farmInfo);
            this.$router.go(-1)
        },
        //获取农场信息
@@ -355,7 +356,6 @@
            }

            if (this.$refs.showCP) {
                console.log(1)
                let isSelf = this.$refs.showCP.contains(e.target)
                if (!isSelf) {
                    this.plotClickNum = 0