From c7373a5f666533007b1ec16fba5703d7a53df138 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Tue, 5 Mar 2024 14:48:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E6=88=BF=E5=B1=8B=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=8E=A5=E5=8F=A3=E4=B8=8E=E5=B1=85=E6=B0=91=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/json/community-geo.json | 23 ++++++ src/api/screen-content-right.js | 10 ++- .../red-party-build/org-structure.vue | 2 +- src/views/next/screen-content-map/index.vue | 55 ++++++++++--- .../human-room-analysis/index.vue | 79 +++++++++++-------- vue.config.js | 2 +- 6 files changed, 120 insertions(+), 51 deletions(-) diff --git a/public/json/community-geo.json b/public/json/community-geo.json index 6c74705..dc07a2e 100644 --- a/public/json/community-geo.json +++ b/public/json/community-geo.json @@ -6,6 +6,7 @@ "id": "1326111460941660161", "communityId": "", "title": "龙桥村", + "ids":"", "center": [ 116.365309, 36.292286 @@ -348,6 +349,7 @@ "properties": { "id": "1326111578096959490", "communityId": "", + "ids":"", "title": "东孙庄村", "center": [ 116.364554, @@ -535,6 +537,7 @@ "properties": { "id": "1326111695084486657", "communityId": "111111111111111f", + "ids":"1532271777947037697", "title": "西子顺村", "center": [ 116.36317, @@ -1002,6 +1005,7 @@ "properties": { "id": "1326111784758706178", "communityId": "", + "ids":"1532271777947037697", "title": "宋子顺村", "center": [ 116.372955, @@ -1540,6 +1544,7 @@ "properties": { "id": "1326112068184604674", "communityId": "", + "ids":"1532271777947037697", "title": "大李子顺村", "center": [ 116.378919, @@ -1799,6 +1804,7 @@ "properties": { "id": "1326112148413251585", "communityId": "", + "ids":"", "title": "毕海洋村", "center": [ 116.387306, @@ -2202,6 +2208,7 @@ "properties": { "id": "1326112288473645057", "communityId": "", + "ids":"1532271777947037697", "title": "东子顺南村", "center": [ 116.401192, @@ -2541,6 +2548,7 @@ "properties": { "id": "1326112361689415682", "communityId": "", + "ids":"1532271777947037697", "title": "东子顺北村", "center": [ 116.400912, @@ -2772,6 +2780,7 @@ "properties": { "id": "1326110808777719809", "communityId": "111111111111111e", + "ids":"1532271719425134593", "title": "中土楼村", "center": [ 116.413903, @@ -2991,6 +3000,7 @@ "properties": { "id": "1326110591705710594", "communityId": "", + "ids":"1532271719425134593", "title": "北土楼村", "center": [ 116.425049, @@ -3265,6 +3275,7 @@ "type": "Feature", "properties": { "id": "1415836442222948354", + "ids":"", "communityId": "", "title": "山头村", "center": [ @@ -3436,6 +3447,7 @@ "type": "Feature", "properties": { "id": "1326112874065592322", + "ids":"", "communityId": "", "title": "前阮二村", "center": [ @@ -3575,6 +3587,7 @@ "type": "Feature", "properties": { "id": "1326112528199090178", + "ids":"", "communityId": "", "title": "上盆王村", "center": [ @@ -3719,6 +3732,7 @@ "properties": { "id": "1326112663385702401", "communityId": "", + "ids":"", "title": "下盆王村", "center": [ 116.406901, @@ -3874,6 +3888,7 @@ "properties": { "id": "1326112752862789633", "communityId": "", + "ids":"", "title": "前寨村", "center": [ 116.393848, @@ -4089,6 +4104,7 @@ "properties": { "id": "1326112968823308289", "communityId": "111111111111111g", + "ids":"", "title": "后寨村", "center": [ 116.402806, @@ -4264,6 +4280,7 @@ "properties": { "id": "1326113048682856450", "communityId": "", + "ids":"", "title": "凌庄村", "center": [ 116.389753, @@ -4403,6 +4420,7 @@ "properties": { "id": "1252822417739382786", "communityId": "111111111111111c", + "ids":"1532261710926598145", "title": "锦水园社区", "center": [ 116.435709, @@ -4475,6 +4493,7 @@ "id": "1252828177294721026", "communityId": "111111111111111a", "title": "玫瑰苑社区", + "ids":"1532271313693331457", "center": [ 116.420519, 36.274222 @@ -4553,6 +4572,7 @@ "properties": { "id": "1326111149745274881", "communityId": "111111111111111d", + "ids":"1532271394184998913", "title": "锦祥园社区", "center": [ 116.425272, @@ -4656,6 +4676,7 @@ "properties": { "id": "1326111230926028801", "communityId": "", + "ids":"", "title": "堡子村", "center": [ 116.408777, @@ -4743,6 +4764,7 @@ "properties": { "id": "1230411296424361986", "communityId": "111111111111111b", + "ids":"1532261098494078977", "title": "玫瑰湖社区", "center": [ 116.427136, @@ -4842,6 +4864,7 @@ "properties": { "id": "1252828788241235970", "communityId": "111111111111111d", + "ids":"", "title": "", "center": [ 116.425551, diff --git a/src/api/screen-content-right.js b/src/api/screen-content-right.js index 57ff681..f106902 100644 --- a/src/api/screen-content-right.js +++ b/src/api/screen-content-right.js @@ -47,11 +47,12 @@ export function getAreaHumanClassifyList (params) { } // 人房分析-居民分类人口统计-内网接口 替换上面接口 -export function getResidentClassifyStatistics () { +export function getResidentClassifyStatistics (data) { return request({ baseURL: intranetApiUrl, url: '/epmetuser/icresiuser/screenJinShui/resiTypeCensus', - method: 'POST' + method: 'POST', + data }) } @@ -65,11 +66,12 @@ export function getAreaRoomClassifyList (params) { } // 人房分析-房屋分类统计-内网接口 替换上面接口 -export function getHourseClassifyStatistics () { +export function getHourseClassifyStatistics (data) { return request({ baseURL: intranetApiUrl, url: '/gov/org/house/screenJinShui/houseTypeList', - method: 'POST' + method: 'POST', + data }) } diff --git a/src/views/next/screen-content-left/red-party-build/org-structure.vue b/src/views/next/screen-content-left/red-party-build/org-structure.vue index 93fa667..fcfca19 100644 --- a/src/views/next/screen-content-left/red-party-build/org-structure.vue +++ b/src/views/next/screen-content-left/red-party-build/org-structure.vue @@ -29,7 +29,7 @@ export default { return { griderList: [ { name: '娄西贤', position: '（网格指导员）' }, - { name: '尹书国', position: '（网格长）' } + { name: '郭泗柱', position: '（网格长）' } ], orgList: [ { diff --git a/src/views/next/screen-content-map/index.vue b/src/views/next/screen-content-map/index.vue index 81864e5..97fb954 100644 --- a/src/views/next/screen-content-map/index.vue +++ b/src/views/next/screen-content-map/index.vue @@ -87,6 +87,7 @@ import AMapLocaClass from './AMapLocaClass' import { getCommunityDistrict, getCommunityGeoPolygon, getCommunityGeoLine, getGridGeoPolygon, getMapStatistics, getGrid, getPageGridDataToal } from 'api/screen-content-center' import { getCommunityDetail } from 'api/screen-content-left' +import { getResidentClassifyStatistics ,getHourseClassifyStatistics} from 'api/screen-content-right' import { mapGetters, mapActions } from 'vuex' import Bus from 'utils/eventBus' import { numAnimation } from 'utils/common' @@ -150,6 +151,9 @@ export default { mapLevel(val) { if (val) { this.getMapStatistics() + this.getResidentClassifyStatistics() + this.getHourseClassifyStatistics() + } } }, @@ -171,6 +175,31 @@ export default { showGlobalDialog: 'showGlobalDialog', set_gridInfoDialog: "SET_GRIDINFODIALOG", }), + getResidentClassifyStatistics() { + let params = { + agencyId: this.communityId || '0' + } + getResidentClassifyStatistics(params).then(({ data: res }) => { + console.log('产品内网接口-获取居民分类统计数据地图', res) + numAnimation(this.statisticsList[0].value, res.count, this.statisticsList[0], 'value') + + + }).catch(err => { + console.error('产品内网接口-获取居民分类统计数据', err) + }) + }, + getHourseClassifyStatistics () { + let params = { + agencyId: this.communityId || '0' + } + getHourseClassifyStatistics(params).then(({ data: res }) => { + numAnimation(this.statisticsList[1].value, res.count, this.statisticsList[1], 'value') + + }).catch(err => { + console.error('产品内网接口-获取房屋分类统计数据', err) + this.roomClassifyChart.hideLoading() + }) + }, handelClickLook(houseId) { this.houseId = houseId this.showHouseDetail = true @@ -182,11 +211,13 @@ export default { handelCLickBack() { this.mapBack = false this.set_mapLevel('community') - this.set_communityId('') + this.set_communityId('0') Bus.$emit('drawCommunityPolygon') }, initMap() { this.getMapStatistics() + this.getResidentClassifyStatistics() + this.getHourseClassifyStatistics() this.getPageGridDataToal() /* eslint-disable */ Promise.all([ @@ -235,7 +266,6 @@ export default { }, // 获取顶部统计数 getMapStatistics() { - if (this.mapLevel === 'community' || (this.mapLevel === 'grid' && !this.communityId)) { const params = { id: this.streetId @@ -243,8 +273,8 @@ export default { getMapStatistics(params).then(({ data: res }) => { console.log('获取地图中心上方统计数2', res) const { resiNum, houseNum, communityNum, gridNum, gridUserNum, partyMemberNum } = res - numAnimation(this.statisticsList[0].value, resiNum, this.statisticsList[0], 'value') - numAnimation(this.statisticsList[1].value, houseNum, this.statisticsList[1], 'value') + // numAnimation(this.statisticsList[0].value, resiNum, this.statisticsList[0], 'value') + // numAnimation(this.statisticsList[1].value, houseNum, this.statisticsList[1], 'value') // numAnimation(this.statisticsList[2].value, communityNum, this.statisticsList[2], 'value') // numAnimation(this.statisticsList[3].value, gridNum, this.statisticsList[3], 'value') numAnimation(this.statisticsList[4].value, gridUserNum, this.statisticsList[4], 'value') @@ -260,8 +290,8 @@ export default { console.log('获取地图中心上方统计数1', res) // resiNum const { resiNum, houseNum, gridNum, gridUserNum, partyMemberNum } = res - numAnimation(this.statisticsList[0].value, resiNum, this.statisticsList[0], 'value') - numAnimation(this.statisticsList[1].value, houseNum, this.statisticsList[1], 'value') + // numAnimation(this.statisticsList[0].value, resiNum, this.statisticsList[0], 'value') + // numAnimation(this.statisticsList[1].value, houseNum, this.statisticsList[1], 'value') // numAnimation(this.statisticsList[2].value, 1, this.statisticsList[2], 'value') // numAnimation(this.statisticsList[3].value, gridNum, this.statisticsList[3], 'value') numAnimation(this.statisticsList[4].value, gridUserNum, this.statisticsList[4], 'value') @@ -277,12 +307,14 @@ export default { this.collapse = true }, // 社区下钻到网格 - drowDownToGrid({ id, communityId, center }) { + drowDownToGrid({ id, communityId, center,ids }) { this.mapBack = true this.getGridList(id) this.set_mapLevel('grid') - this.set_communityId(communityId) + this.set_communityId(ids || '0') this.getMapStatistics() + this.getResidentClassifyStatistics() + this.getHourseClassifyStatistics() Bus.$emit('drawGridPolygon', { communityId: id, center: center }) }, getGridList(id) { @@ -338,6 +370,7 @@ export default { Bus.$emit('drawGridPolygon') } }, + // 切换红十字会、志愿者tab async chooseTab(item) { // if (this.currentTab && (this.currentTab === tab.label)) { @@ -353,7 +386,7 @@ export default { // } else { // Bus.$emit('clearMarker') // } - + this.set_gridInfoDialog(true) Bus.$emit('emitgridInfoDialogData', { gridId: item.id || '1534561053840998402' }) @@ -532,6 +565,7 @@ img { cursor: pointer; } +