XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

临时提交

Browse Source
This commit is contained in:
648540858
2024-08-24 00:18:54 +08:00
parent d2654660cb
commit 5a259aaa63
10 changed files with 122 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
web_src/src/components/dialog/channelCode.vue
View File

@@ -224,54 +224,9 @@ export default {
let parent = ''
if (this.activeKey === '1') {
parent = this.allVal[0].val
if (parent === '11' || parent === '12' || parent === '31') {
this.regionList = []
this.regionList.push({
// 数据库自增ID
commonRegionId: -1,
// 区域国标编号
deviceId: parent + '01',
// 区域名称
name: '市辖区',
// 父区域国标ID
commonRegionParentId: parent,
})
console.log(this.regionList)
return
} else if (parent === '50') {
this.regionList = [
{
// 数据库自增ID
commonRegionId: -1,
// 区域国标编号
deviceId: parent + '01',
// 区域名称
name: '市辖区',
// 父区域国标ID
commonRegionParentId: parent,
},
{
// 数据库自增ID
commonRegionId: -1,
// 区域国标编号
deviceId: parent + '02',
// 区域名称
name: '县',
// 父区域国标ID
commonRegionParentId: parent,
},
]
return
}
}
if (this.activeKey === '2') {
if (this.allVal[0].val === '11' || this.allVal[0].val === '12' || this.allVal[0].val === '31' || this.allVal[0].val === '50') {
parent = this.allVal[0].val
} else {
parent = this.allVal[0].val + this.allVal[1].val
}
console.log(parent)
parent = this.allVal[0].val + this.allVal[1].val
}
if (this.activeKey !== '0' && parent === '') {
this.$message.error('请先选择上级行政区划');

43
web_src/src/components/dialog/regionCode.vue
View File

@@ -200,56 +200,13 @@ export default {
let parent = ''
if (this.activeKey === '1') {
parent = this.allVal[0].val
if (parent === '11' || parent === '12' || parent === '31') {
this.regionList = []
this.regionList.push({
// 数据库自增ID
commonRegionId: -1,
// 区域国标编号
deviceId: parent + '01',
// 区域名称
name: '市辖区',
// 父区域国标ID
commonRegionParentId: parent,
})
console.log(this.regionList)
return
} else if (parent === '50') {
this.regionList = [
{
// 数据库自增ID
commonRegionId: -1,
// 区域国标编号
deviceId: parent + '01',
// 区域名称
name: '市辖区',
// 父区域国标ID
commonRegionParentId: parent,
},
{
// 数据库自增ID
commonRegionId: -1,
// 区域国标编号
deviceId: parent + '02',
// 区域名称
name: '县',
// 父区域国标ID
commonRegionParentId: parent,
},
]
return
}
}
if (this.activeKey === '2') {
if (this.allVal[1].val === ""){
parent = ""
}else if (this.allVal[0].val === '11' || this.allVal[0].val === '12' || this.allVal[0].val === '31' || this.allVal[0].val === '50') {
parent = this.allVal[0].val
} else {
parent = this.allVal[0].val + this.allVal[1].val
}
}
if (this.activeKey !== '0' && parent === '') {
this.$message.error('请先选择上级行政区划');