From 55e3ab06123882d4d4c69c444473375d7f458d5a Mon Sep 17 00:00:00 2001 From: aixianling Date: Thu, 5 May 2022 18:22:27 +0800 Subject: [PATCH] BUG 29505 --- .../AppCommunityManage/components/Add.vue | 2 +- .../AppSpecialAdjustment/components/Add.vue | 4 ++-- .../AppSpecialDisabled/components/Add.vue | 6 ++--- .../apps/AppSpecialDrug/components/Add.vue | 4 ++-- .../apps/AppSpecialMental/components/Add.vue | 4 ++-- .../apps/AppSpecialPrison/components/Add.vue | 4 ++-- .../apps/grid/AppGridMap/components/list.vue | 23 +++++++++---------- .../grid/AppGridMember/components/add.vue | 2 +- 8 files changed, 24 insertions(+), 25 deletions(-) diff --git a/project/sass/apps/AppCommunityManage/components/Add.vue b/project/sass/apps/AppCommunityManage/components/Add.vue index 6fe36b5e..648ab1e4 100644 --- a/project/sass/apps/AppCommunityManage/components/Add.vue +++ b/project/sass/apps/AppCommunityManage/components/Add.vue @@ -123,7 +123,7 @@ export default { methods: { beforeSelectTree() { this.treeObj.checkedKeys = []; - this.instance.post(`/app/appgirdinfo/listAllByTop`).then((res) => { + this.instance.post(`/app/appgirdinfo/listAll`).then((res) => { if (res.code == 0) { this.treeObj.treeList = this.format(res.data) if (this.form.girdInfoList.length) { diff --git a/project/sass/apps/AppSpecialAdjustment/components/Add.vue b/project/sass/apps/AppSpecialAdjustment/components/Add.vue index 64c3922c..d7d0c2df 100644 --- a/project/sass/apps/AppSpecialAdjustment/components/Add.vue +++ b/project/sass/apps/AppSpecialAdjustment/components/Add.vue @@ -134,7 +134,7 @@ export default { } } } - + let IdNumberPass = (rule, value, callback) => { if (value) { if (this.idCardNoUtil.checkIdCardNo(value)) { @@ -315,7 +315,7 @@ export default { }, getGridList() { - this.instance.post(`/app/appgirdinfo/listAllByTop`).then((res) => { + this.instance.post(`/app/appgirdinfo/listAll`).then((res) => { if (res.code == 0) { this.treeObj.treeList = this.format(res.data) if (this.formData.girdId) { diff --git a/project/sass/apps/AppSpecialDisabled/components/Add.vue b/project/sass/apps/AppSpecialDisabled/components/Add.vue index 5948f99a..32d8322c 100644 --- a/project/sass/apps/AppSpecialDisabled/components/Add.vue +++ b/project/sass/apps/AppSpecialDisabled/components/Add.vue @@ -134,7 +134,7 @@ export default { } } } - + let IdNumberPass = (rule, value, callback) => { if (value) { if (this.idCardNoUtil.checkIdCardNo(value)) { @@ -146,7 +146,7 @@ export default { callback(new Error('请输入身份证号')) } } - + let regIcome = (rule, value, callback) => { if (value) { const reg = /^([0-9]{1,5})(\.[0-9]{1,3}){0,1}$/ @@ -325,7 +325,7 @@ export default { }, getGridList() { - this.instance.post(`/app/appgirdinfo/listAllByTop`).then((res) => { + this.instance.post(`/app/appgirdinfo/listAll`).then((res) => { if (res.code == 0) { this.treeObj.treeList = this.format(res.data) if (this.formData.girdId) { diff --git a/project/sass/apps/AppSpecialDrug/components/Add.vue b/project/sass/apps/AppSpecialDrug/components/Add.vue index dfcdfdd3..9057ae61 100644 --- a/project/sass/apps/AppSpecialDrug/components/Add.vue +++ b/project/sass/apps/AppSpecialDrug/components/Add.vue @@ -134,7 +134,7 @@ export default { } } } - + let IdNumberPass = (rule, value, callback) => { if (value) { if (this.idCardNoUtil.checkIdCardNo(value)) { @@ -324,7 +324,7 @@ export default { }, getGridList() { - this.instance.post(`/app/appgirdinfo/listAllByTop`).then((res) => { + this.instance.post(`/app/appgirdinfo/listAll`).then((res) => { if (res.code == 0) { this.treeObj.treeList = this.format(res.data) if (this.formData.girdId) { diff --git a/project/sass/apps/AppSpecialMental/components/Add.vue b/project/sass/apps/AppSpecialMental/components/Add.vue index f10f7b0f..5599e20c 100644 --- a/project/sass/apps/AppSpecialMental/components/Add.vue +++ b/project/sass/apps/AppSpecialMental/components/Add.vue @@ -134,7 +134,7 @@ export default { } } } - + let IdNumberPass = (rule, value, callback) => { if (value) { if (this.idCardNoUtil.checkIdCardNo(value)) { @@ -316,7 +316,7 @@ export default { }, getGridList() { - this.instance.post(`/app/appgirdinfo/listAllByTop`).then((res) => { + this.instance.post(`/app/appgirdinfo/listAll`).then((res) => { if (res.code == 0) { this.treeObj.treeList = this.format(res.data) if (this.formData.girdId) { diff --git a/project/sass/apps/AppSpecialPrison/components/Add.vue b/project/sass/apps/AppSpecialPrison/components/Add.vue index 1a742004..4a223de0 100644 --- a/project/sass/apps/AppSpecialPrison/components/Add.vue +++ b/project/sass/apps/AppSpecialPrison/components/Add.vue @@ -134,7 +134,7 @@ export default { } } } - + let IdNumberPass = (rule, value, callback) => { if (value) { if (this.idCardNoUtil.checkIdCardNo(value)) { @@ -335,7 +335,7 @@ export default { }, getGridList() { - this.instance.post(`/app/appgirdinfo/listAllByTop`).then((res) => { + this.instance.post(`/app/appgirdinfo/listAll`).then((res) => { if (res.code == 0) { this.treeObj.treeList = this.format(res.data) if (this.formData.girdId) { diff --git a/project/sass/apps/grid/AppGridMap/components/list.vue b/project/sass/apps/grid/AppGridMap/components/list.vue index 307e4178..2d5984d4 100644 --- a/project/sass/apps/grid/AppGridMap/components/list.vue +++ b/project/sass/apps/grid/AppGridMap/components/list.vue @@ -141,18 +141,17 @@ export default { if (val.girdLevel === '0') { this.getLeafNodes() - return false - } - - this.instance.post(`/app/appgirdinfo/queryChildGirdInfoByGirdId?girdId=${val.id}`).then((res) => { - if (res?.data) { - const arr = res.data.map(v => { - return { - id: v.id, - girdName: v.girdName, - points: v.points ? v.points.map(p => [p.lng, p.lat]) : [] - } - }).filter(v => v.points.length) + return false + } + this.instance.post(`/app/appgirdinfo/queryChildGirdInfoByGirdId?girdId=${val.id}`).then((res) => { + if (res?.data) { + const arr = res.data.map(v => { + return { + id: v.id, + girdName: v.girdName, + points: v.points ? v.points.map(p => [p.lng, p.lat]) : [] + } + }).filter(v => v.points.length) if (!arr.length) { return this.$message.error('该网格还未标绘') diff --git a/project/sass/apps/grid/AppGridMember/components/add.vue b/project/sass/apps/grid/AppGridMember/components/add.vue index 3c560d60..81ac9ded 100644 --- a/project/sass/apps/grid/AppGridMember/components/add.vue +++ b/project/sass/apps/grid/AppGridMember/components/add.vue @@ -401,7 +401,7 @@ export default { }, beforeSelectTree() { this.treeObj.checkedKeys = []; - this.instance.post(`/app/appgirdinfo/listAllByTop`, null, null).then((res) => { + this.instance.post(`/app/appgirdinfo/listAll`, null, null).then((res) => { if (res.code == 0) { this.treeObj.treeList = res.data; this.forms.girdInfoList.map((e) => {