From 602cb0a2528afff995ec024b5ed2017c63e1663b Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Thu, 26 May 2022 16:04:05 +0800 Subject: [PATCH 1/5] bug --- .../visual/communityParty/gridParty.vue | 22 ++++++------------- .../visual/communityParty/memberInfo.vue | 6 ++++- .../visual/components/screen-map/index.vue | 12 +++++++++- 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/src/views/modules/visual/communityParty/gridParty.vue b/src/views/modules/visual/communityParty/gridParty.vue index fbe6af59..6b6aa616 100644 --- a/src/views/modules/visual/communityParty/gridParty.vue +++ b/src/views/modules/visual/communityParty/gridParty.vue @@ -10,8 +10,7 @@ :options="propTree" :props="{ checkStrictly: true }" :show-all-levels="false" - :getCheckedNodes="getCheckedNodes" - clearable + :getCheckedNodes="getCheckedNodes" @change="handleCascader"> @@ -166,8 +165,9 @@ export default { ] await this.loadOrgData() await this.getWorkUserInfo() - this.loadMap() - this.isfirstInit = false + // this.loadMap() + this.getMapData() + // this.isfirstInit = false // 地图相关end }, methods: { @@ -189,7 +189,6 @@ export default { // }; const { data, code, msg } = await requestPost(url); if (code === 0) { - console.log('data-org----o', data) this.selectAgency = [`${data.agencyId}-${data.level}`] this.orgType = data.level this.agencyId = data.agencyId @@ -230,7 +229,6 @@ export default { }, // 组织点击事件 async handleCascader(val) { - console.log('val-vvv', val) const _arr = val[val.length - 1].split('-') const orgType = _arr[1] !== 'grid' ? 'agency': 'grid' this.agencyId = _arr[0] @@ -238,7 +236,6 @@ export default { this.orgType = orgType this.noEduInit = false this.agencyInfo = { ...this.orgData } - console.log('agencyInfo-----', this.agencyInfo) this.eduCode = '' await this.loadOrgData() this.getEduCount(_arr[0]) @@ -342,7 +339,6 @@ export default { } }; - console.log('zlcm') } else { element.isClick = false element.label = { @@ -400,7 +396,6 @@ export default { this.visibleLoading = false }, pieInitOks (dom) { - console.log('pies准备好了', dom) this.pieEduChartS = dom // this.pieInitState = true }, @@ -424,7 +419,6 @@ export default { this.showedUnitMoreInfo = true this.unitAclist = data.list this.$nextTick(() => { - console.log(this.unitAclist[0].demandRecId) this.$refs['unitdetailInfo'].getDetail(this.unitAclist[0].demandRecId) }) } else { @@ -511,10 +505,11 @@ export default { window.app.ajax.post( url, params, - (data, rspMsg) => { + (data, rspMsg) => { this.unitMapList = data - this.isfirstInit = false this.loadMap() + this.isfirstInit = false + this.$refs.map.handleClosePopup() }, (rspMsg, data) => { this.$message.error(rspMsg) @@ -526,9 +521,7 @@ export default { this.userId = '' const featureInfo = feature.values_.properties.info this.userId = feature.values_.properties.info.id - console.log('feature.values_.properties.info:::', JSON.stringify(feature.values_.properties.info)) let coordinate = [featureInfo.longitude, featureInfo.latitude] - console.log(feature.values_.properties.info) let showData = `
个人信息
姓名： @@ -557,7 +550,6 @@ export default { }, lookMore(e) { this.userId = this.userId - console.log('userId:', this.userId) this.showedMoreInfo = true } }, diff --git a/src/views/modules/visual/communityParty/memberInfo.vue b/src/views/modules/visual/communityParty/memberInfo.vue index ed06439a..1b07df9c 100644 --- a/src/views/modules/visual/communityParty/memberInfo.vue +++ b/src/views/modules/visual/communityParty/memberInfo.vue @@ -29,6 +29,10 @@ 需求类型： {{ info.categoryName }}
+
+ 上报类型： + {{ info.reportTypeName }} +
上报人： {{ info.reportUserName }} @@ -171,7 +175,7 @@ export default { margin-bottom: 0; .list { display: block; - width: 50%; + width: auto; .item { display: flex; width: 100%; diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue index e1490b41..b5ef77fb 100644 --- a/src/views/modules/visual/components/screen-map/index.vue +++ b/src/views/modules/visual/components/screen-map/index.vue @@ -33,7 +33,8 @@
更多>>>> + id="popup-goMore" + class="popup-goMore">更多>>>>
@@ -745,6 +746,12 @@ const vueGis = { //把 overlay 显示到指定的 x,y坐标 }, + // 关闭弹窗 + handleClosePopup() { + this.overlay.setPosition(undefined); + document.getElementById("popup-closer").blur(); + return false; + }, //取随机数 getRndBetween (lowerLimit, upperLimit) { @@ -888,6 +895,9 @@ export default vueGis; .popup-content { width: 300px; } +.popup-goMore{ + margin: 20px 0; +} .ol-popup-closer:after { content: "✖"; // color: rgba(1, 17, 104, 1); From dc198c233d875f7b495831aa914ed751cb8a31a1 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Thu, 26 May 2022 17:23:02 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/partymember/icpartyorg-add-or-update.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/modules/partymember/icpartyorg-add-or-update.vue b/src/views/modules/partymember/icpartyorg-add-or-update.vue index 2d1505f5..20aa0eb8 100644 --- a/src/views/modules/partymember/icpartyorg-add-or-update.vue +++ b/src/views/modules/partymember/icpartyorg-add-or-update.vue @@ -443,16 +443,16 @@ dataRule() { return { partyOrgName: [ - {required: true, message: this.$t('validate.required'), trigger: 'blur'} + {required: true, message: "党组织名称不能为空", trigger: 'blur'} ], mySelectOrg: [ - {required: true, message: this.$t('validate.required'), trigger: 'blur'} + {required: true, message: "上级党组织不能为空", trigger: 'blur'} ], partyOrgType: [ - {required: true, message: this.$t('validate.required'), trigger: 'blur'} + {required: true, message: "党组织类型不能为空", trigger: 'blur'} ], agencyId: [ - {required: true, message: this.$t('validate.required'), trigger: 'blur'} + {required: true, message: "行政组织不能为空", trigger: 'blur'} ] } } From dd266a5555c4a65a799d361843b860f20992de48 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Thu, 26 May 2022 17:33:56 +0800 Subject: [PATCH 3/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/partymember/lookMember.vue | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/src/views/modules/partymember/lookMember.vue b/src/views/modules/partymember/lookMember.vue index 974e8dc1..4d2197a8 100644 --- a/src/views/modules/partymember/lookMember.vue +++ b/src/views/modules/partymember/lookMember.vue @@ -6,7 +6,6 @@ - Date: Thu, 26 May 2022 18:09:12 +0800 Subject: [PATCH 4/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/partymember/icpartyorg-add-or-update.vue | 5 +++-- src/views/modules/partymember/icpartyorgtree.vue | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/views/modules/partymember/icpartyorg-add-or-update.vue b/src/views/modules/partymember/icpartyorg-add-or-update.vue index 20aa0eb8..b530b455 100644 --- a/src/views/modules/partymember/icpartyorg-add-or-update.vue +++ b/src/views/modules/partymember/icpartyorg-add-or-update.vue @@ -128,7 +128,8 @@ customerId: '', staffId:'', orgPidName: '', - agencyName:'' + agencyName:'', + pid: '' }, orgListVisible: false, agencyListVisible:false, @@ -230,7 +231,7 @@ }, // 获取党组织列表 getOrgList() { - return this.$http.get('/resi/partymember/icPartyOrg/getTreelist', {params: {agencyId: this.agencyId}}).then(({data: res}) => { + return this.$http.get('/resi/partymember/icPartyOrg/getTreelist', {params: {agencyId: this.agencyId, orgPid: this.dataForm.id ? this.dataForm.pid : ''}}).then(({data: res}) => { if (res.code !== 0) { return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败') } diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue index 5b44d05c..1e132a6f 100644 --- a/src/views/modules/partymember/icpartyorgtree.vue +++ b/src/views/modules/partymember/icpartyorgtree.vue @@ -29,7 +29,7 @@ size="small" class="div-table-button--add">新增下级 修改 @@ -106,13 +106,15 @@ this.tableLoading = false }, // 新增 / 修改 - addOrUpdateHandle (id, orgId, orgPids) { + addOrUpdateHandle (id, orgId, orgPids, pid) { + console.log('pid:::::', pid) this.addOrUpdateVisible = true this.$nextTick(() => { this.$refs.addOrUpdate.dataForm.id = id // 新增下级需要传 this.$refs.addOrUpdate.dataForm.orgId = orgId // 党组织 this.$refs.addOrUpdate.dataForm.orgPids = orgPids + this.$refs.addOrUpdate.dataForm.pid = pid this.$refs.addOrUpdate.init() }) From 9d540a6a1dd6226444546ddf28de4b85bde71665 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Fri, 27 May 2022 14:03:35 +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 6b6aa616..180fc938 100644 --- a/src/views/modules/visual/communityParty/gridParty.vue +++ b/src/views/modules/visual/communityParty/gridParty.vue @@ -445,7 +445,7 @@ export default { const url = "/gov/org/agency/maporg" let params = { orgId: this.orgId, - level: this.orgLevel + level: this.orgType } const { data, code, msg } = await requestPost(url, params) @@ -454,7 +454,7 @@ export default { this.orgData = data this.orgId = this.orgData.id - this.orgLevel = this.orgData.level + this.orgType = this.orgData.level this.parentPolygon = [] this.parentPolygon = data.children.map(item => { return {