From 0b0bcffd0a50b843e13bbe222653de037459ca0c Mon Sep 17 00:00:00 2001 From: jiangyy Date: Thu, 8 Sep 2022 08:51:20 +0800 Subject: [PATCH] 11 --- .../basicinfo/houseStatic/houseList.vue | 236 ++++++++++++++++++ .../basicinfo/houseStatic/houseMore.vue | 111 ++++++++ .../basicinfo/houseStatic/houseStatic.vue | 102 ++++++-- .../basicinfo/houseStatic/peopleList.vue | 235 +++++++++++++++++ 4 files changed, 663 insertions(+), 21 deletions(-) create mode 100644 src/views/modules/visual/basicinfo/houseStatic/houseList.vue create mode 100644 src/views/modules/visual/basicinfo/houseStatic/houseMore.vue create mode 100644 src/views/modules/visual/basicinfo/houseStatic/peopleList.vue diff --git a/src/views/modules/visual/basicinfo/houseStatic/houseList.vue b/src/views/modules/visual/basicinfo/houseStatic/houseList.vue new file mode 100644 index 000000000..72abe99c1 --- /dev/null +++ b/src/views/modules/visual/basicinfo/houseStatic/houseList.vue @@ -0,0 +1,236 @@ + + + + + + + + + + + diff --git a/src/views/modules/visual/basicinfo/houseStatic/houseMore.vue b/src/views/modules/visual/basicinfo/houseStatic/houseMore.vue new file mode 100644 index 000000000..b6d9495a7 --- /dev/null +++ b/src/views/modules/visual/basicinfo/houseStatic/houseMore.vue @@ -0,0 +1,111 @@ + + + + + diff --git a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue index 20dbb3cf2..a00a224b1 100644 --- a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue +++ b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue @@ -12,7 +12,8 @@ {{orgName}} - +
@@ -45,24 +46,29 @@
-
+
{{houseData.houseTotal}}
房屋总数
-
+
{{houseData.zzHouseTotal}}
自住房屋数
-
+
{{houseData.czHouseTotal}}
出租房屋数
-
+
{{houseData.xzHouseTotal}}
闲置房屋数
-
+
{{houseData.wscHouseTotal}}
未出售房屋数
@@ -97,16 +103,19 @@
-
+
{{userData.userTotal}}
居民总数
-
+
{{userData.czUserTotal}}
常住人口数
-
+
{{userData.ldUserTotal}}
流动人口数
@@ -196,6 +205,21 @@
+ + + + + + +
@@ -208,6 +232,8 @@ import screenEchartsFrame from "../../components/screen-echarts-frame"; import ScreenLoading from "@/views/modules/visual/components/screen-loading"; import { housePieOption } from './options' import { userPieOption } from './userOptions' +import houseList from './houseList' +import peopleList from './peopleList' import * as echarts from 'echarts'; export default { @@ -216,7 +242,9 @@ export default { cptCard, screenTable, screenEchartsFrame, - ScreenLoading + ScreenLoading, + houseList, + peopleList }, data () { return { @@ -293,6 +321,11 @@ export default { zoom: null, parentPolygon: [], + rentType: '',//点击房屋数类型 + type: '',//点击人员数类型 + showPeopleList: false, + showHouseList: false + }; }, async mounted () { @@ -316,9 +349,21 @@ export default { this.getHousePie() this.getUserPie() + }, - + //点击房屋数 + handleClickHouse (rentType) { + this.toSubAgency('house') + this.rentType = rentType + this.showHouseList = true + }, + //点击人员数 + handleClickPeople (type) { + this.toSubAgency('people') + this.type = type + this.showPeopleList = true }, + housePieInitOk (dom) { console.log('pie准备好了', dom) this.housePieChartS = dom @@ -350,6 +395,9 @@ export default { this.$refs.housePieChart.hideLoading() } + this.orgId = data.orgId + this.orgType = data.orgType + } else { this.houseData = {} @@ -595,33 +643,36 @@ export default { async handleToSubAgency (item) { if (!this.dataLoading) { - this.toSubAgency(item) + this.toSubAgency('subAgency', item) await this.getApiData() } - - - }, //下钻到下一级 - async toSubAgency (item) { - + async toSubAgency (type, item) { this.runNum++ let obj = { orgId: this.orgId, orgType: this.orgType, orgName: this.orgName, + type: type } + this.runAgencyArray.push(obj) + if (type === 'subAgency') { - this.runAgencyArray.push(obj) + this.orgId = item.orgId + this.orgType = item.orgType + this.orgName = item.orgName - this.orgId = item.orgId - this.orgType = item.orgType - this.orgName = item.orgName + } else if (type === 'house') { + this.orgName = '房屋列表' + } else if (type === 'people') { + this.orgName = '人员列表' + } }, @@ -629,6 +680,7 @@ export default { //返回所选组织 handleClickAgency (index) { + const cutNum = this.runAgencyArray.length - index//要减去的长度 this.runNum = this.runNum - cutNum @@ -642,6 +694,14 @@ export default { this.orgId = orgData.orgId this.orgType = orgData.orgType this.orgName = orgData.orgName + this.showHouseList = false + this.showPeopleList = false + // if (orgData.type === 'house') { + // this.showHouseList = false + // } + // if (orgData.type === 'people') { + // this.showPeopleList = false + // } this.getApiData() diff --git a/src/views/modules/visual/basicinfo/houseStatic/peopleList.vue b/src/views/modules/visual/basicinfo/houseStatic/peopleList.vue new file mode 100644 index 000000000..edb79cf8d --- /dev/null +++ b/src/views/modules/visual/basicinfo/houseStatic/peopleList.vue @@ -0,0 +1,235 @@ + + + + + + + + + + +