BUG 29505

This commit is contained in:
aixianling
2022-05-05 18:22:27 +08:00
parent 84954bcc84
commit 55e3ab0612
8 changed files with 24 additions and 25 deletions

View File

@@ -123,7 +123,7 @@ export default {
methods: { methods: {
beforeSelectTree() { beforeSelectTree() {
this.treeObj.checkedKeys = []; this.treeObj.checkedKeys = [];
this.instance.post(`/app/appgirdinfo/listAllByTop`).then((res) => { this.instance.post(`/app/appgirdinfo/listAll`).then((res) => {
if (res.code == 0) { if (res.code == 0) {
this.treeObj.treeList = this.format(res.data) this.treeObj.treeList = this.format(res.data)
if (this.form.girdInfoList.length) { if (this.form.girdInfoList.length) {

View File

@@ -134,7 +134,7 @@ export default {
} }
} }
} }
let IdNumberPass = (rule, value, callback) => { let IdNumberPass = (rule, value, callback) => {
if (value) { if (value) {
if (this.idCardNoUtil.checkIdCardNo(value)) { if (this.idCardNoUtil.checkIdCardNo(value)) {
@@ -315,7 +315,7 @@ export default {
}, },
getGridList() { getGridList() {
this.instance.post(`/app/appgirdinfo/listAllByTop`).then((res) => { this.instance.post(`/app/appgirdinfo/listAll`).then((res) => {
if (res.code == 0) { if (res.code == 0) {
this.treeObj.treeList = this.format(res.data) this.treeObj.treeList = this.format(res.data)
if (this.formData.girdId) { if (this.formData.girdId) {

View File

@@ -134,7 +134,7 @@ export default {
} }
} }
} }
let IdNumberPass = (rule, value, callback) => { let IdNumberPass = (rule, value, callback) => {
if (value) { if (value) {
if (this.idCardNoUtil.checkIdCardNo(value)) { if (this.idCardNoUtil.checkIdCardNo(value)) {
@@ -146,7 +146,7 @@ export default {
callback(new Error('请输入身份证号')) callback(new Error('请输入身份证号'))
} }
} }
let regIcome = (rule, value, callback) => { let regIcome = (rule, value, callback) => {
if (value) { if (value) {
const reg = /^([0-9]{1,5})(\.[0-9]{1,3}){0,1}$/ const reg = /^([0-9]{1,5})(\.[0-9]{1,3}){0,1}$/
@@ -325,7 +325,7 @@ export default {
}, },
getGridList() { getGridList() {
this.instance.post(`/app/appgirdinfo/listAllByTop`).then((res) => { this.instance.post(`/app/appgirdinfo/listAll`).then((res) => {
if (res.code == 0) { if (res.code == 0) {
this.treeObj.treeList = this.format(res.data) this.treeObj.treeList = this.format(res.data)
if (this.formData.girdId) { if (this.formData.girdId) {

View File

@@ -134,7 +134,7 @@ export default {
} }
} }
} }
let IdNumberPass = (rule, value, callback) => { let IdNumberPass = (rule, value, callback) => {
if (value) { if (value) {
if (this.idCardNoUtil.checkIdCardNo(value)) { if (this.idCardNoUtil.checkIdCardNo(value)) {
@@ -324,7 +324,7 @@ export default {
}, },
getGridList() { getGridList() {
this.instance.post(`/app/appgirdinfo/listAllByTop`).then((res) => { this.instance.post(`/app/appgirdinfo/listAll`).then((res) => {
if (res.code == 0) { if (res.code == 0) {
this.treeObj.treeList = this.format(res.data) this.treeObj.treeList = this.format(res.data)
if (this.formData.girdId) { if (this.formData.girdId) {

View File

@@ -134,7 +134,7 @@ export default {
} }
} }
} }
let IdNumberPass = (rule, value, callback) => { let IdNumberPass = (rule, value, callback) => {
if (value) { if (value) {
if (this.idCardNoUtil.checkIdCardNo(value)) { if (this.idCardNoUtil.checkIdCardNo(value)) {
@@ -316,7 +316,7 @@ export default {
}, },
getGridList() { getGridList() {
this.instance.post(`/app/appgirdinfo/listAllByTop`).then((res) => { this.instance.post(`/app/appgirdinfo/listAll`).then((res) => {
if (res.code == 0) { if (res.code == 0) {
this.treeObj.treeList = this.format(res.data) this.treeObj.treeList = this.format(res.data)
if (this.formData.girdId) { if (this.formData.girdId) {

View File

@@ -134,7 +134,7 @@ export default {
} }
} }
} }
let IdNumberPass = (rule, value, callback) => { let IdNumberPass = (rule, value, callback) => {
if (value) { if (value) {
if (this.idCardNoUtil.checkIdCardNo(value)) { if (this.idCardNoUtil.checkIdCardNo(value)) {
@@ -335,7 +335,7 @@ export default {
}, },
getGridList() { getGridList() {
this.instance.post(`/app/appgirdinfo/listAllByTop`).then((res) => { this.instance.post(`/app/appgirdinfo/listAll`).then((res) => {
if (res.code == 0) { if (res.code == 0) {
this.treeObj.treeList = this.format(res.data) this.treeObj.treeList = this.format(res.data)
if (this.formData.girdId) { if (this.formData.girdId) {

View File

@@ -141,18 +141,17 @@ export default {
if (val.girdLevel === '0') { if (val.girdLevel === '0') {
this.getLeafNodes() this.getLeafNodes()
return false return false
} }
this.instance.post(`/app/appgirdinfo/queryChildGirdInfoByGirdId?girdId=${val.id}`).then((res) => {
this.instance.post(`/app/appgirdinfo/queryChildGirdInfoByGirdId?girdId=${val.id}`).then((res) => { if (res?.data) {
if (res?.data) { const arr = res.data.map(v => {
const arr = res.data.map(v => { return {
return { id: v.id,
id: v.id, girdName: v.girdName,
girdName: v.girdName, points: v.points ? v.points.map(p => [p.lng, p.lat]) : []
points: v.points ? v.points.map(p => [p.lng, p.lat]) : [] }
} }).filter(v => v.points.length)
}).filter(v => v.points.length)
if (!arr.length) { if (!arr.length) {
return this.$message.error('该网格还未标绘') return this.$message.error('该网格还未标绘')

View File

@@ -401,7 +401,7 @@ export default {
}, },
beforeSelectTree() { beforeSelectTree() {
this.treeObj.checkedKeys = []; 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) { if (res.code == 0) {
this.treeObj.treeList = res.data; this.treeObj.treeList = res.data;
this.forms.girdInfoList.map((e) => { this.forms.girdInfoList.map((e) => {