From 4db5f85df9bd3c61df274c8118da738e958b6c85 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Tue, 14 Jun 2022 17:03:52 +0800 Subject: [PATCH 01/19] bug --- src/views/modules/partymember/icpartyorg-add-or-update.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/modules/partymember/icpartyorg-add-or-update.vue b/src/views/modules/partymember/icpartyorg-add-or-update.vue index a539e9521..04bbde23e 100644 --- a/src/views/modules/partymember/icpartyorg-add-or-update.vue +++ b/src/views/modules/partymember/icpartyorg-add-or-update.vue @@ -157,6 +157,7 @@ this.agencyId = localStorage.getItem('agencyId') this.dataForm.customerId = localStorage.getItem('customerId') this.dataForm.staffId = localStorage.getItem('staffId') + this.keyWords = '' //设置党组织类型 this.$nextTick(() => { From 49a6ce73ad6aedcf9eb238019a496768e4a20448 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Tue, 14 Jun 2022 17:46:25 +0800 Subject: [PATCH 02/19] dd --- src/views/modules/visual/communityParty/community.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue index fcd81bc4d..e8f825ace 100644 --- a/src/views/modules/visual/communityParty/community.vue +++ b/src/views/modules/visual/communityParty/community.vue @@ -301,7 +301,7 @@ export default { this.getCateCount(this.agencyId) - await this.getWorkUserInfo() + // await this.getWorkUserInfo() // await this.getMapUnitList(this.agencyId) }, watch: { @@ -613,7 +613,7 @@ export default { if (code === 0) { - this.orgData = data + this.agencyInfo = data this.orgId = this.orgData.id this.orgLevel = this.orgData.level this.parentPolygon = [] From 046d078fe58a7aeb39f5be097680074004464c7e Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Wed, 15 Jun 2022 09:44:47 +0800 Subject: [PATCH 03/19] =?UTF-8?q?=E4=B8=AD=E5=BF=83=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visual/communityParty/gridParty.vue | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/views/modules/visual/communityParty/gridParty.vue b/src/views/modules/visual/communityParty/gridParty.vue index abf51860e..34ceff04d 100644 --- a/src/views/modules/visual/communityParty/gridParty.vue +++ b/src/views/modules/visual/communityParty/gridParty.vue @@ -149,7 +149,6 @@ export default { async mounted() { await nextTick(100); // await this.getAgencyList() - await this.getWorkUserInfo() this.agencyId = this.$store.state.user.agencyId this.getEduCount(this.$store.state.user.agencyId) // 饼状统计图 this.getEduList() // 左下角列表数据 @@ -167,6 +166,7 @@ export default { await this.loadOrgData() // this.loadMap() this.getMapData() + await this.getWorkUserInfo() // this.isfirstInit = false // 地图相关end }, @@ -483,16 +483,25 @@ export default { params, (data, rspMsg) => { this.agencyInfo = data - if (!data.latitude) { + if (this.orgData.longitude) { // 中心点不从当前登录用户里面取，从mapOrg接口里面取 + this.agencyInfo.longitude = this.orgData.longitude + } + if (this.orgData.latitude) { // 中心点不从当前登录用户里面取，从mapOrg接口里面取 + this.agencyInfo.latitude = this.orgData.latitude + } + if (this.orgData.level) { // 中心点不从当前登录用户里面取，从mapOrg接口里面取 + this.agencyInfo.agencyLevel = this.orgData.level + } + if (!this.orgData.latitude) { this.agencyInfo.latitude = 36.072227 } - if (!data.longitude) { + if (!this.agencyInfo.longitude) { this.agencyInfo.longitude = 120.389455 } - if (!data.level) { + if (!this.orgData.level) { this.agencyInfo.level = 'street' } - this.agencyInfo.agencyLevel = this.agencyInfo.level + // this.agencyInfo.agencyLevel = this.agencyInfo.level }, (rspMsg, data) => { this.$message.error(rspMsg) From 49e40ea9bdbdeff2f3ac5728ebabfc9339618ee2 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Wed, 15 Jun 2022 09:51:28 +0800 Subject: [PATCH 04/19] bug --- src/views/modules/visual/communityParty/gridParty.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/modules/visual/communityParty/gridParty.vue b/src/views/modules/visual/communityParty/gridParty.vue index 34ceff04d..59433b357 100644 --- a/src/views/modules/visual/communityParty/gridParty.vue +++ b/src/views/modules/visual/communityParty/gridParty.vue @@ -490,7 +490,7 @@ export default { this.agencyInfo.latitude = this.orgData.latitude } if (this.orgData.level) { // 中心点不从当前登录用户里面取，从mapOrg接口里面取 - this.agencyInfo.agencyLevel = this.orgData.level + this.agencyInfo.agencyLevel = this.orgData.agencyLevel } if (!this.orgData.latitude) { this.agencyInfo.latitude = 36.072227 @@ -502,6 +502,7 @@ export default { this.agencyInfo.level = 'street' } // this.agencyInfo.agencyLevel = this.agencyInfo.level + // console.log(JSON.stringify(this.agencyInfo)) }, (rspMsg, data) => { this.$message.error(rspMsg) From 4613f734a34447013d0c2b8e755e85fb56c0e1d0 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Wed, 15 Jun 2022 10:02:11 +0800 Subject: [PATCH 05/19] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/visual/communityParty/gridParty.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/visual/communityParty/gridParty.vue b/src/views/modules/visual/communityParty/gridParty.vue index 59433b357..65d0919c6 100644 --- a/src/views/modules/visual/communityParty/gridParty.vue +++ b/src/views/modules/visual/communityParty/gridParty.vue @@ -492,13 +492,13 @@ export default { if (this.orgData.level) { // 中心点不从当前登录用户里面取，从mapOrg接口里面取 this.agencyInfo.agencyLevel = this.orgData.agencyLevel } - if (!this.orgData.latitude) { + if (!this.agencyInfo.latitude) { this.agencyInfo.latitude = 36.072227 } if (!this.agencyInfo.longitude) { this.agencyInfo.longitude = 120.389455 } - if (!this.orgData.level) { + if (!this.agencyInfo.level) { this.agencyInfo.level = 'street' } // this.agencyInfo.agencyLevel = this.agencyInfo.level From aed6d48870fff07ebb1fe1b6d3226fce01315b59 Mon Sep 17 00:00:00 2001 From: HAHA Date: Thu, 16 Jun 2022 09:05:11 +0800 Subject: [PATCH 06/19] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/cabaseinfo/caloudong.vue | 29 +++++++++++++++++++++ src/views/modules/cabaseinfo/capingfang.vue | 29 +++++++++++++++++++++ src/views/modules/cabaseinfo/carental.vue | 29 +++++++++++++++++++++ src/views/modules/cabaseinfo/caresident.vue | 29 +++++++++++++++++++++ src/views/modules/cabaseinfo/carotators.vue | 29 +++++++++++++++++++++ 5 files changed, 145 insertions(+) diff --git a/src/views/modules/cabaseinfo/caloudong.vue b/src/views/modules/cabaseinfo/caloudong.vue index 5a07d25f6..4f32e5937 100644 --- a/src/views/modules/cabaseinfo/caloudong.vue +++ b/src/views/modules/cabaseinfo/caloudong.vue @@ -16,6 +16,14 @@ clearable > + + + + {{ $t("query") }} @@ -145,9 +153,30 @@ export default { dataForm: { buildingName: "", communityName: "", + gridId:"" }, + caLouDongOptions:[] }; }, + methods:{ + getloudongOptions(){ + this.$http.post(`/opendata/caLoudong/getLouDongCascade`).then(resp => { + if(resp.data.code === 0){ + this.caLouDongOptions = resp.data.data + } + }).catch(error => { + this.$message.error(error) + }) + + }, + handlePartyChange(val) { + console.log('val------pp', val) + this.dataForm.gridId = val[val.length - 1] + }, + }, +created(){ + this.getloudongOptions() + }, components: { AddOrUpdate, }, diff --git a/src/views/modules/cabaseinfo/capingfang.vue b/src/views/modules/cabaseinfo/capingfang.vue index 694043076..13043d32d 100644 --- a/src/views/modules/cabaseinfo/capingfang.vue +++ b/src/views/modules/cabaseinfo/capingfang.vue @@ -16,6 +16,14 @@ clearable > + + + + {{ $t("query") }} @@ -145,9 +153,30 @@ export default { dataForm: { buildingName: "", communityName: "", + gridId:"" }, + caLouDongOptions:[] }; }, + methods:{ + getloudongOptions(){ + this.$http.post(`/opendata/caLoudong/getLouDongCascade`).then(resp => { + if(resp.data.code === 0){ + this.caLouDongOptions = resp.data.data + } + }).catch(error => { + this.$message.error(error) + }) + + }, + handlePartyChange(val) { + console.log('val------pp', val) + this.dataForm.gridId = val[val.length - 1] + }, + }, +created(){ + this.getloudongOptions() + }, components: { AddOrUpdate, }, diff --git a/src/views/modules/cabaseinfo/carental.vue b/src/views/modules/cabaseinfo/carental.vue index 0980e8039..317e299c0 100644 --- a/src/views/modules/cabaseinfo/carental.vue +++ b/src/views/modules/cabaseinfo/carental.vue @@ -22,6 +22,14 @@ placeholder="承租人姓名" clearable > + + + + {{ $t("query") }} @@ -146,9 +154,30 @@ export default { houseName: "", residentName: "", renterName: "", + gridId:"" }, + caLouDongOptions:[] }; }, + methods:{ + getloudongOptions(){ + this.$http.post(`/opendata/caLoudong/getLouDongCascade`).then(resp => { + if(resp.data.code === 0){ + this.caLouDongOptions = resp.data.data + } + }).catch(error => { + this.$message.error(error) + }) + + }, + handlePartyChange(val) { + console.log('val------pp', val) + this.dataForm.gridId = val[val.length - 1] + }, + }, +created(){ + this.getloudongOptions() + }, components: { AddOrUpdate, }, diff --git a/src/views/modules/cabaseinfo/caresident.vue b/src/views/modules/cabaseinfo/caresident.vue index 0cba7cd8b..68010a88e 100644 --- a/src/views/modules/cabaseinfo/caresident.vue +++ b/src/views/modules/cabaseinfo/caresident.vue @@ -19,6 +19,14 @@ clearable > + + + + {{ $t("query") }} @@ -137,9 +145,30 @@ export default { idCard: "", residentName: "", telephone: "", + gridId:"" }, + caLouDongOptions:[] }; }, + methods:{ + getloudongOptions(){ + this.$http.post(`/opendata/caLoudong/getLouDongCascade`).then(resp => { + if(resp.data.code === 0){ + this.caLouDongOptions = resp.data.data + } + }).catch(error => { + this.$message.error(error) + }) + + }, + handlePartyChange(val) { + console.log('val------pp', val) + this.dataForm.gridId = val[val.length - 1] + }, + }, +created(){ + this.getloudongOptions() + }, components: { AddOrUpdate, }, diff --git a/src/views/modules/cabaseinfo/carotators.vue b/src/views/modules/cabaseinfo/carotators.vue index c171dad8d..6f7ba14ee 100644 --- a/src/views/modules/cabaseinfo/carotators.vue +++ b/src/views/modules/cabaseinfo/carotators.vue @@ -18,6 +18,14 @@ placeholder="联系方式" clearable > + + + + {{ $t("query") }} @@ -131,9 +139,30 @@ export default { idCard: "", residentName: "", telephone: "", + gridId:"" }, + caLouDongOptions:[] }; }, + methods:{ + getloudongOptions(){ + this.$http.post(`/opendata/caLoudong/getLouDongCascade`).then(resp => { + if(resp.data.code === 0){ + this.caLouDongOptions = resp.data.data + } + }).catch(error => { + this.$message.error(error) + }) + + }, + handlePartyChange(val) { + console.log('val------pp', val) + this.dataForm.gridId = val[val.length - 1] + }, + }, +created(){ + this.getloudongOptions() + }, components: { AddOrUpdate, }, From 137384dfa00bfe2cba8e4cfc44c7cd3f7dfc830c Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Thu, 16 Jun 2022 11:10:58 +0800 Subject: [PATCH 07/19] dd --- src/views/main-shuju/main.vue | 2 +- src/views/main.vue | 2 +- src/views/modules/visual/communityParty/community.vue | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/main-shuju/main.vue b/src/views/main-shuju/main.vue index 8d4f0bc2c..4abb6808f 100644 --- a/src/views/main-shuju/main.vue +++ b/src/views/main-shuju/main.vue @@ -123,7 +123,7 @@ export default { localStorage.setItem("customerName", data.customerName || ""); } } else { - this.$message.error(rspMsg); + this.$message.error(msg); } }, }, diff --git a/src/views/main.vue b/src/views/main.vue index f12112f35..eb6f306e1 100644 --- a/src/views/main.vue +++ b/src/views/main.vue @@ -159,7 +159,7 @@ export default { localStorage.setItem("customerName", data.customerName || ""); } } else { - this.$message.error(rspMsg); + this.$message.error(msg); } }, }, diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue index e8f825ace..34cff4b25 100644 --- a/src/views/modules/visual/communityParty/community.vue +++ b/src/views/modules/visual/communityParty/community.vue @@ -530,6 +530,7 @@ export default { this.unitTableData = data.list.map((item, index) => { return { ...item, + index: index + 1, urlIndex: index } }) From 8c68e3e13b0a674f3752da0b962a3e95f8b30e0d Mon Sep 17 00:00:00 2001 From: HAHA Date: Thu, 16 Jun 2022 15:36:09 +0800 Subject: [PATCH 08/19] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A4=BE=E5=8C=BA?= =?UTF-8?q?=E8=A1=97=E9=81=93=E7=BD=91=E6=A0=BC=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/cabaseinfo/caloudong.vue | 18 ++++++++++++++++++ src/views/modules/cabaseinfo/capingfang.vue | 18 ++++++++++++++++++ src/views/modules/cabaseinfo/carental.vue | 18 ++++++++++++++++++ src/views/modules/cabaseinfo/caresident.vue | 18 ++++++++++++++++++ src/views/modules/cabaseinfo/carotators.vue | 18 ++++++++++++++++++ 5 files changed, 90 insertions(+) diff --git a/src/views/modules/cabaseinfo/caloudong.vue b/src/views/modules/cabaseinfo/caloudong.vue index 4f32e5937..62af00f46 100644 --- a/src/views/modules/cabaseinfo/caloudong.vue +++ b/src/views/modules/cabaseinfo/caloudong.vue @@ -49,6 +49,24 @@ align="center" width="50" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Date: Thu, 16 Jun 2022 16:20:27 +0800 Subject: [PATCH 09/19] dd --- src/views/modules/visual/communityParty/party.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/modules/visual/communityParty/party.vue b/src/views/modules/visual/communityParty/party.vue index 016d7e59d..534391913 100644 --- a/src/views/modules/visual/communityParty/party.vue +++ b/src/views/modules/visual/communityParty/party.vue @@ -317,6 +317,7 @@ export default { // return // } if (params.seriesIndex == 0 || params.seriesIndex == 2) { + console.log('请求了吗') this.ageCode = '' // this.getUnitList(this.agencyId) this.getAgeList() @@ -378,7 +379,7 @@ export default { // this.getEduList() // return // } - this.clickEduPie(params.dataIndex) + // this.clickEduPie(params.dataIndex) if (params.seriesIndex == 0 || params.seriesIndex == 2) { this.eduCode = '' this.getEduList() From 0e267d89622dc232a84235fc74ae0a6e3c3e41ae Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Thu, 16 Jun 2022 16:56:42 +0800 Subject: [PATCH 10/19] bug --- .../partymember/icpartyorg-add-or-update.vue | 32 ++++++++++++------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/src/views/modules/partymember/icpartyorg-add-or-update.vue b/src/views/modules/partymember/icpartyorg-add-or-update.vue index 04bbde23e..93c020d7c 100644 --- a/src/views/modules/partymember/icpartyorg-add-or-update.vue +++ b/src/views/modules/partymember/icpartyorg-add-or-update.vue @@ -145,12 +145,6 @@ agencyOrgList:[] } }, - // mounted () { - // setTimeout(() => { - // console.log(':::::::::::::::::::::::') - // this.initMap() - // }, 800); - // }, methods: { init() { this.visible = true @@ -159,10 +153,10 @@ this.dataForm.staffId = localStorage.getItem('staffId') this.keyWords = '' //设置党组织类型 - - this.$nextTick(() => { + setTimeout(() => { this.$refs['dataForm'].resetFields() this.dataForm.latitude = '' + this.dataForm.agencyId = '' if (this.dataForm.id) { this.setPartyOrgType() this.getInfo() @@ -174,14 +168,17 @@ this.dataForm.orgPid = this.dataForm.orgId this.dataForm.orgPids = this.dataForm.orgPids ? this.dataForm.orgPids + ':' + this.dataForm.orgId : this.dataForm.orgId this.dataForm.partyOrgType = this.dataForm._partyOrgType - console.log(this.dataForm.partyOrgType, this.dataForm.orgPid, this.dataForm.orgPids) + this.setPartyOrgType_xzxj() this.getInfoAgencyLisy() } else { this.dataForm.mySelectOrg = '' } } - }) + }, 50); + // this.$nextTick(() => { + + // }) }, // 设置组织类型 新增党组织 setPartyOrgType_xzxj() { @@ -250,9 +247,22 @@ if(value == '5'){ // 支部 不选择行政组织 this.dataForm.agencyId = localStorage.getItem('agencyId') this.dataForm.agencyPids = '' + // 先清空数据 + this.orgList = [] + this.dataForm.mySelectOrg = '', // 我选中的当前党组织 + this.dataForm.orgPid = '', // 党组织的上级ID,没有上级时为0 + this.dataForm.orgPids = '' this.getOrgList() } else { - //根据组织类型获取行政组织 + // 先清空数据 + this.agencyOrgList = [] + this.dataForm.agencyId = '' + + // 先清空数据 + this.orgList = [] + this.dataForm.mySelectOrg = '', // 我选中的当前党组织 + this.dataForm.orgPid = '', // 党组织的上级ID,没有上级时为0 + this.dataForm.orgPids = '' this.getInfoAgencyLisy() } }, From 40457fc2cf51077f5f908bf197aa7da138f55adf Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Thu, 16 Jun 2022 17:00:37 +0800 Subject: [PATCH 11/19] bug --- src/views/modules/partymember/icpartyorgtree.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue index b7935dd09..776585349 100644 --- a/src/views/modules/partymember/icpartyorgtree.vue +++ b/src/views/modules/partymember/icpartyorgtree.vue @@ -1,5 +1,5 @@