Merge branch 'master' of http://192.168.0.105:10010/r/zhny-dsjdp

guanqb

2022-09-01 e94a9093e8ae56a00be8f8b78d65f244ae507fe8

Merge branch 'master' of http://192.168.0.105:10010/r/zhny-dsjdp

 src/views/home/index.vue

@@ -1387,7 +1387,7 @@

        setCenter (item) {
            this.ncListShow = false
            this.farmId = item.id
            // this.farmId = item.id
            this.AllDataUpdate()
            this.$refs.modalForm.setCenter(item.farmName)
        },
@@ -1410,7 +1410,12 @@
                    })
                    this.$refs.modalForm.addPolygon(brr, item)
                })

                this.farmNumArray = res.data.data
                // this.farmNumArray.unshift({
                //     id:"",
                //     farmName:"全农场"
                // })
            })
        },

@@ -1765,7 +1770,7 @@
            }
            params.tenantId = '000000'
            params.farmId = this.farmId
            pagePalnt(1, 10, Object.assign(params)).then((res) => {
            pagePalnt(1, 10000, Object.assign(params)).then((res) => {
                const data = res.data.data
                that.num = data.num
                this.farmPlanList = data.page

 src/views/manage/index.vue

@@ -1352,6 +1352,12 @@
                    bottom: "0%",
                    containLabel: true,
                },
                tooltip: {
                    trigger: "axis",
                    axisPointer: {
                        type: "shadow",
                    },
                },
                xAxis: {
                    type: "category",
                    boundaryGap: false,