diff --git a/src/assets/img/shuju/measure/cheng.png b/src/assets/img/shuju/measure/cheng.png new file mode 100644 index 000000000..7cd8dea6e Binary files /dev/null and b/src/assets/img/shuju/measure/cheng.png differ diff --git a/src/assets/scss/modules/shequzhili/event-info.scss b/src/assets/scss/modules/shequzhili/event-info.scss index afcd0fa34..6c2bf3cca 100644 --- a/src/assets/scss/modules/shequzhili/event-info.scss +++ b/src/assets/scss/modules/shequzhili/event-info.scss @@ -143,7 +143,7 @@ width: 450px } .cell-width-2{ - width: 350px + width: 300px } .cell-width-map { diff --git a/src/assets/scss/modules/visual/houseStatic.scss b/src/assets/scss/modules/visual/houseStatic.scss index f89104834..d02c6e7fa 100644 --- a/src/assets/scss/modules/visual/houseStatic.scss +++ b/src/assets/scss/modules/visual/houseStatic.scss @@ -298,6 +298,7 @@ font-family: PingFang SC; font-weight: bold; color: #FFFFFF; + cursor: pointer; } .zz{ @@ -320,6 +321,12 @@ font-weight: bold; color: #fac126; } + .wsc{ + font-size: 35px; + font-family: PingFang SC; + font-weight: bold; + color: #fc8452; + } .colorwhite{ font-size: 35px; @@ -336,6 +343,7 @@ font-weight: 400; color: #FFFFFF; min-width:62px; + } .table-table-title{ diff --git a/src/assets/scss/modules/visual/people.scss b/src/assets/scss/modules/visual/people.scss index 1d0bc4fa8..b624578ba 100644 --- a/src/assets/scss/modules/visual/people.scss +++ b/src/assets/scss/modules/visual/people.scss @@ -243,6 +243,10 @@ border-radius: 3px; } } + + .item2{ + width: 49%; + } } .line { diff --git a/src/views/modules/shequzhili/event/cpts/add.vue b/src/views/modules/shequzhili/event/cpts/add.vue index d3581582a..f983260e2 100644 --- a/src/views/modules/shequzhili/event/cpts/add.vue +++ b/src/views/modules/shequzhili/event/cpts/add.vue @@ -28,15 +28,18 @@ prop="name" label-width="150px" style="display: block"> + - 居民信息中选择 +
+ 居民信息中选择 +
{{ scope.row.patrolTime }}
+ class="div-content">{{ scope.row.reviewTime }} 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..17fbd6709 --- /dev/null +++ b/src/views/modules/visual/basicinfo/houseStatic/houseList.vue @@ -0,0 +1,237 @@ + + + + + + + + + + + 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..1a21ce5a0 --- /dev/null +++ b/src/views/modules/visual/basicinfo/houseStatic/houseMore.vue @@ -0,0 +1,124 @@ + + + + + diff --git a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue index 462110fa1..8cf156b0a 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,23 +46,32 @@
-
+
{{houseData.houseTotal}}
房屋总数
-
+
{{houseData.zzHouseTotal}}
自住房屋数
-
+
{{houseData.czHouseTotal}}
出租房屋数
-
+
{{houseData.xzHouseTotal}}
闲置房屋数
+
+
{{houseData.wscHouseTotal}}
+
未出售房屋数
+
-
+
{{userData.userTotal}}
居民总数
-
+
{{userData.czUserTotal}}
常住人口数
-
+
{{userData.ldUserTotal}}
流动人口数
@@ -134,39 +147,52 @@
-
{{item.houseTotal}}
+
{{item.houseTotal}}
房屋总数
-
{{item.zzHouseTotal}}
+
{{item.zzHouseTotal}}
{{item.zzHouseRatio+'%'}}
自住房屋数
-
{{item.czHouseTotal}}
+
{{item.czHouseTotal}}
{{item.czHouseRatio+'%'}}
出租房屋数
-
{{item.xzHouseTotal}}
+
{{item.xzHouseTotal}}
{{item.xzHouseRatio+'%'}}
闲置房屋数
+
+
{{item.wscHouseTotal}}
+
{{item.wscHouseRatio+'%'}}
+
未出售房屋数
+
-
{{item.userTotal}}
+
{{item.userTotal}}
居民总数
-
{{item.czUserTotal}}
+
{{item.czUserTotal}}
{{item.czUserRatio+'%'}}
常住人口数
-
{{item.ldUserTotal}}
+
{{item.ldUserTotal}}
{{item.ldUserRatio+'%'}}
流动人口数
@@ -187,6 +213,21 @@
+ + + + + + +
@@ -199,6 +240,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 { @@ -207,7 +250,9 @@ export default { cptCard, screenTable, screenEchartsFrame, - ScreenLoading + ScreenLoading, + houseList, + peopleList }, data () { return { @@ -232,8 +277,10 @@ export default { czHouseRatio: '5%',//房屋出租总数占比(保留两位小数,带百分号的) xzHouseTotal: 200,//房屋闲置总数 xzHouseRatio: '70%',//房屋闲置总数占比(保留两位小数,带百分号的) + wscHouseTotal: 100,//房屋未售出总数 + wscHouseRatio: '20%',//房屋未售出总数占比 }, - houseColorArray: ['#3dda83', '#e43c26', '#fac126'], + houseColorArray: ['#3dda83', '#e43c26', '#fac126', '#fc8452'], housePieData: [], legendArray: [ @@ -248,6 +295,10 @@ export default { { name: '闲置房屋数', url: require('../../../../../assets/img/shuju/measure/huang@2x.png') + }, + { + name: '未出售房屋数', + url: require('../../../../../assets/img/shuju/measure/cheng.png') } ], @@ -278,6 +329,13 @@ export default { zoom: null, parentPolygon: [], + rentType: '',//点击房屋数类型 + type: '',//点击人员数类型 + showPeopleList: false, + showHouseList: false, + selOrgId: '', + selOrgType: '', + }; }, async mounted () { @@ -301,9 +359,35 @@ export default { this.getHousePie() this.getUserPie() + }, - + //点击房屋数 + handleClickHouse (rentType, item) { + if (item) { + this.selOrgId = item.orgId + this.selOrgType = item.orgType + } else { + this.selOrgId = this.houseData.orgId + this.selOrgType = this.houseData.orgType + } + this.toSubAgency('house') + this.rentType = rentType + this.showHouseList = true }, + //点击人员数 + handleClickPeople (type, item) { + if (item) { + this.selOrgId = item.orgId + this.selOrgType = item.orgType + } else { + this.selOrgId = this.houseData.orgId + this.selOrgType = this.houseData.orgType + } + this.toSubAgency('people') + this.type = type + this.showPeopleList = true + }, + housePieInitOk (dom) { console.log('pie准备好了', dom) this.housePieChartS = dom @@ -335,7 +419,6 @@ export default { this.$refs.housePieChart.hideLoading() } - } else { this.houseData = {} this.$message.error(msg); @@ -379,10 +462,15 @@ export default { name: '闲置房屋数', value: this.houseData.xzHouseRatio } + let obj4 = { + name: '未出售房屋数', + value: this.houseData.wscHouseRatio + } this.housePieData.push(obj1) this.housePieData.push(obj2) this.housePieData.push(obj3) + this.housePieData.push(obj4) this.housePieOption.title.text = this.houseData.houseTotal this.housePieOption.series[1].itemStyle = { @@ -575,33 +663,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 = '人员列表' + } }, @@ -609,6 +700,7 @@ export default { //返回所选组织 handleClickAgency (index) { + const cutNum = this.runAgencyArray.length - index//要减去的长度 this.runNum = this.runNum - cutNum @@ -622,6 +714,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..4107a6b0e --- /dev/null +++ b/src/views/modules/visual/basicinfo/houseStatic/peopleList.vue @@ -0,0 +1,235 @@ + + + + + + + + + + +