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 1/5] 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 2/5] 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 3/5] =?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 4/5] 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 5/5] =?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