From d4acc4ccec0ddc751830bcdd4408eccb82caf83d Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Fri, 27 May 2022 14:54:39 +0800 Subject: [PATCH 01/38] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visual/communityParty/gridParty.vue | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/src/views/modules/visual/communityParty/gridParty.vue b/src/views/modules/visual/communityParty/gridParty.vue index 180fc9382..226d0e430 100644 --- a/src/views/modules/visual/communityParty/gridParty.vue +++ b/src/views/modules/visual/communityParty/gridParty.vue @@ -522,31 +522,40 @@ export default { const featureInfo = feature.values_.properties.info this.userId = feature.values_.properties.info.id let coordinate = [featureInfo.longitude, featureInfo.latitude] + let {name, gridName, houseName, mobile, idCard, gzdw, rhzk, icResiUser} = feature.values_.properties.info + name = name ? name : '--' + gridName = gridName ? gridName : '--' + houseName = houseName ? houseName : '--' + mobile = mobile ? mobile : '--' + idCard = idCard ? idCard : '--' + gzdw = gzdw ? gzdw : '--' + rhzk = rhzk ? rhzk : '--' let showData = `
个人信息
姓名: - `+ feature.values_.properties.info.name + ` + `+ name + `
所属网格: - `+ feature.values_.properties.info.gridName + ` + `+ gridName + `
所属房屋: - `+ feature.values_.properties.info.houseName + ` + `+ houseName + `
手机号: - `+ feature.values_.properties.info.mobile + ` + `+ mobile + `
身份证号: - `+ feature.values_.properties.info.idCard + ` + `+ idCard + `
工作单位: - `+ feature.values_.properties.info.gzdw + ` + `+ gzdw + `
人户状况: - `+ feature.values_.properties.info.rhzk + ` + `+ rhzk + `
` - this.$refs.map.handleShowPopup(showData, coordinate, true) + const isShowMore = icResiUser ? true : false + this.$refs.map.handleShowPopup(showData, coordinate, isShowMore) }, lookMore(e) { this.userId = this.userId From 28d0e46296f4a350d53ca1bcd6246ea8932fc8e9 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Fri, 27 May 2022 15:43:00 +0800 Subject: [PATCH 02/38] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visual/communityParty/gridParty.vue | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/views/modules/visual/communityParty/gridParty.vue b/src/views/modules/visual/communityParty/gridParty.vue index 226d0e430..a328b2c69 100644 --- a/src/views/modules/visual/communityParty/gridParty.vue +++ b/src/views/modules/visual/communityParty/gridParty.vue @@ -496,25 +496,25 @@ export default { }, // 获取位置信息 - getMapData () { - const url = '/epmetuser/icVolunteerPoly/mapData' + async getMapData () { + const url = "/epmetuser/icVolunteerPoly/mapData" let params = { agencyId: this.agencyId, code: this.eduCode } - window.app.ajax.post( - url, - params, - (data, rspMsg) => { + const { data, code, internalMsg } = await requestPost(url, params) + if (code === 0) { this.unitMapList = data this.loadMap() this.isfirstInit = false this.$refs.map.handleClosePopup() - }, - (rspMsg, data) => { - this.$message.error(rspMsg) - } - ) + } else { + this.$message.error(internalMsg) + this.unitMapList = [] + this.loadMap() + this.isfirstInit = false + this.$refs.map.handleClosePopup() + } }, //点击项目 async clickProject (feature) { From fc26b298a0718ce3bbe04b50506d7aa37ad8b312 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 27 May 2022 16:07:54 +0800 Subject: [PATCH 03/38] =?UTF-8?q?bug=E4=BB=A5=E5=8F=8A=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/plugins/change/changedeath.vue | 2 +- .../plugins/change/changerelocation.vue | 2 +- .../modules/plugins/change/changewelfare.vue | 2 +- ...factagencyuserhousedaily-add-or-update.vue | 240 ++++++++++++++++++ .../stats/factagencyuserhousedaily.vue | 126 +++++++++ 5 files changed, 369 insertions(+), 3 deletions(-) create mode 100644 src/views/modules/plugins/stats/factagencyuserhousedaily-add-or-update.vue create mode 100644 src/views/modules/plugins/stats/factagencyuserhousedaily.vue diff --git a/src/views/modules/plugins/change/changedeath.vue b/src/views/modules/plugins/change/changedeath.vue index 57c8fdeba..725c58069 100644 --- a/src/views/modules/plugins/change/changedeath.vue +++ b/src/views/modules/plugins/change/changedeath.vue @@ -88,7 +88,7 @@ diff --git a/src/views/modules/plugins/change/changerelocation.vue b/src/views/modules/plugins/change/changerelocation.vue index 2c917a4ed..57faca640 100644 --- a/src/views/modules/plugins/change/changerelocation.vue +++ b/src/views/modules/plugins/change/changerelocation.vue @@ -186,7 +186,7 @@ diff --git a/src/views/modules/plugins/change/changewelfare.vue b/src/views/modules/plugins/change/changewelfare.vue index 459fac9f9..921f93f3d 100644 --- a/src/views/modules/plugins/change/changewelfare.vue +++ b/src/views/modules/plugins/change/changewelfare.vue @@ -79,7 +79,7 @@ diff --git a/src/views/modules/plugins/stats/factagencyuserhousedaily-add-or-update.vue b/src/views/modules/plugins/stats/factagencyuserhousedaily-add-or-update.vue new file mode 100644 index 000000000..60e91f4bc --- /dev/null +++ b/src/views/modules/plugins/stats/factagencyuserhousedaily-add-or-update.vue @@ -0,0 +1,240 @@ + + + diff --git a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue new file mode 100644 index 000000000..42e37b0ce --- /dev/null +++ b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue @@ -0,0 +1,126 @@ + + + From 54d2455e25231cbcbba09e7c3d3631563548dda4 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Fri, 27 May 2022 16:20:13 +0800 Subject: [PATCH 04/38] bug --- src/views/modules/visual/communityParty/gridParty.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/modules/visual/communityParty/gridParty.vue b/src/views/modules/visual/communityParty/gridParty.vue index a328b2c69..bd73c11ca 100644 --- a/src/views/modules/visual/communityParty/gridParty.vue +++ b/src/views/modules/visual/communityParty/gridParty.vue @@ -365,6 +365,8 @@ export default { const _arr = this.selectAgency[this.selectAgency.length - 1].split('-') const orgType = _arr[1] !== 'grid' ? 'agency': 'grid' this.pageNo = 1 + this.pageSize = 10; + this.eduList = [] this.getEduList(isClick && _code || '') this.getMapData(isClick && _code || '') } From 62c5cf8ed92d0ad37d49cca4b8c2878cefaec8e0 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Fri, 27 May 2022 17:06:44 +0800 Subject: [PATCH 05/38] dd --- src/views/modules/communityParty/members/cpts/record.vue | 5 +++-- src/views/modules/communityParty/members/index.vue | 2 +- src/views/modules/visual/communityParty/community.vue | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/views/modules/communityParty/members/cpts/record.vue b/src/views/modules/communityParty/members/cpts/record.vue index 4236f0e88..cc7d8795a 100644 --- a/src/views/modules/communityParty/members/cpts/record.vue +++ b/src/views/modules/communityParty/members/cpts/record.vue @@ -64,7 +64,7 @@
{{ scope.row.startDate + ' - ' + scope.row.endDate }}
- +