From fa7c121f5e263836f6d69c3e622b2cafc03b174b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 6 Sep 2022 17:25:51 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E5=90=AF=E7=94=A8=E7=A6=81=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../point/icpointnucleicmonitoring.vue | 43 ++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue index a4bbccfcf..29bf60173 100644 --- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue +++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue @@ -153,13 +153,34 @@ align="center" show-overflow-tooltip > + + + From 92f5188d18a10bcbcf1034453d8c6c14e35fa2c0 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 7 Sep 2022 10:05:22 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E5=90=AF=E7=94=A8=E7=A6=81=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/plugins/point/icpointnucleicmonitoring.vue | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue index 29bf60173..8921683fa 100644 --- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue +++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue @@ -178,9 +178,7 @@ type="text" size="small" class="div-table-button--detail" - @click="enableOrDisabled(scope.row.id)" - >{{ scope.row.enableFlag === 'enable' ? '禁用' : '启用' }} + @click="enableOrDisabled(scope.row.id)">{{ (scope.row.enableFlag === 'enable' && '禁用') || '启用' }} { - + this.loadTable(); }) .catch(() => {}); - this.loadTable(); }, // 新增 / 修改 addOrUpdateHandle(id, title) { From 23b4ca95bdb589d23112c6898ad50f4596290813 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 7 Sep 2022 15:07:44 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E4=BA=BA=E6=88=BF=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/img/shuju/measure/cheng.png | Bin 0 -> 1594 bytes .../basicinfo/houseStatic/houseStatic.vue | 22 +++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 src/assets/img/shuju/measure/cheng.png diff --git a/src/assets/img/shuju/measure/cheng.png b/src/assets/img/shuju/measure/cheng.png new file mode 100644 index 0000000000000000000000000000000000000000..7cd8dea6ed630e94a3eda8af0ebafc59a88ba5c5 GIT binary patch literal 1594 zcmaJ>eNYr-96nG}Pa#Jk;hfQJF-&rAKkjz-?f~VuFHSi@#NbTSz1{b?6YuuiTf74_ zlQP6H#QZ2jE$xpO#+pE0|(#lEqLdaW5E&@wS?l%df~oK@uTI*Bj!_sI zHW7(WgVvKp>zDsFb`=h~iqU#6h40fk+mJzr-stLB#7%2s0RgpB3Cb z(an3I5F_K@i^Wt}QaTcX$7i!WB=-786D6e#4Kh9yS7NBg6N+ot+ArpS|7ASZ+MiqE z185HL^Th%y)x(((21~hnvZIipq(+w|xTT^nYmGcx>;YcUYD|TtFG|kM=}4zm%}^|j zFf5BB7^Nl=E$iSAoW(Fg1)LbeU}2ue;q|26Oqq%;JD(^^s; z##+68k@2!1?AtB*9>p4;h}9Vcz=*t%%kyi)U6AeKMc(h?eUQNrsyYolpXc^+e84|9 zRHl)rjX-d(2b@{pJ+>@O&4`FHd%AAARXh+ktyA@-p9mTE9iDsYT#<8lMUh^IO#pSL=)wt{1| z_4{_(TjjH>BGuO#j$RsveiGSePpmz7AbR|m--~zkM>QCF_SzTDD4%J5GmxDvkf9ud-I$4>W-QXS=DsJcAI$zIsW?H!n*pz2L*Ah@~`Up<~CJpAUT!B zG@mzL=-m3st?TU-XSPz^fA8rpl)rbDhTc!!_|nli+kS>FUOVre4cWUt9_nl9?L(n~ zfv?97HUF^mxxQ`B?El4|p4axakTgAZFB$zhTpE*KaCp4MGPb8LaTcm*Qz~j+h(Z6c z?A)*aEaK3S0+aFdQ2gn+Y@I{4rK(`rp3dG`X@6EW&v8wdzNRH3!LhO(zy zKwFLLB=c%g`hlc*G3OLEqN46dTy=$Qe(c2f@;RPU2B#3Myt?c!;;khU-x)YNWqKys zp0;{gW?X6J{e&?+9b6+gxOvija@xj~cN=3XUyk{7UCq|o*4#j&Z_~a*{ibgR626r2 XQyVO^Hg|0a{mreW#m0})SC{_>X5&qx literal 0 HcmV?d00001 diff --git a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue index 462110fa1..d38d7b33f 100644 --- a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue +++ b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue @@ -62,6 +62,10 @@
{{houseData.xzHouseTotal}}
闲置房屋数
+
+
{{houseData.wscHouseTotal}}
+
未出售房屋数
+
{{item.xzHouseRatio+'%'}}
闲置房屋数
+
+
{{item.wscHouseTotal}}
+
{{item.wscHouseRatio+'%'}}
+
未出售房屋数
+
@@ -232,8 +241,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 +259,10 @@ export default { { name: '闲置房屋数', url: require('../../../../../assets/img/shuju/measure/huang@2x.png') + }, + { + name: '未出售房屋数', + url: require('../../../../../assets/img/shuju/measure/cheng.png') } ], @@ -379,10 +394,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 = { From 21bbe4f953f5c1d10353869f24ec9b9eab88e430 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 7 Sep 2022 15:47:45 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/modules/visual/houseStatic.scss | 6 ++++++ .../modules/visual/basicinfo/houseStatic/houseStatic.vue | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/assets/scss/modules/visual/houseStatic.scss b/src/assets/scss/modules/visual/houseStatic.scss index f89104834..084e53f0e 100644 --- a/src/assets/scss/modules/visual/houseStatic.scss +++ b/src/assets/scss/modules/visual/houseStatic.scss @@ -320,6 +320,12 @@ font-weight: bold; color: #fac126; } + .wsc{ + font-size: 35px; + font-family: PingFang SC; + font-weight: bold; + color: #fc8452; + } .colorwhite{ font-size: 35px; diff --git a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue index d38d7b33f..20dbb3cf2 100644 --- a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue +++ b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue @@ -63,7 +63,7 @@
闲置房屋数
-
{{houseData.wscHouseTotal}}
+
{{houseData.wscHouseTotal}}
未出售房屋数
From 6715bb7876e10462733e88e751c41ac6ceb45ceb Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 7 Sep 2022 17:03:52 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/partymember/icpartyorgtree.vue | 121 ++++++++++++++++++ 1 file changed, 121 insertions(+) diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue index 4b8a5179e..ebc87f1ce 100644 --- a/src/views/modules/partymember/icpartyorgtree.vue +++ b/src/views/modules/partymember/icpartyorgtree.vue @@ -17,8 +17,24 @@ :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}" :height="tableHeight"> + + + + + @@ -67,6 +114,13 @@ export default { data () { return { + principalShow: false, + staffs: [], + editPrincipalData: { + principal: '', + principalMobile: '', + partyOrgId: '' + }, searchH: 0, dataForm: { id: '', @@ -76,6 +130,36 @@ }, tableLoading: false, tableData: [], + partyOrgTypes: [ + { + value: '0', + label: '省委' + }, + { + value: '1', + label: '市委' + }, + { + value: '2', + label: '区委' + }, + { + value: '3', + label: '党工委' + }, + { + value: '4', + label: '党委' + }, + { + value: '5', + label: '支部' + }, + { + value: '6', + label: '党小组' + } + ], agencyId: '', addOrUpdateVisible: false, lookMemberShow: false, @@ -93,6 +177,13 @@ const h = this.clientHeight - this.searchH - 230 + this.iframeHeigh const _h = this.clientHeight - 230 - this.searchH return this.$store.state.inIframe ? h : _h + }, + principalRules() { + return { + principal: [ + {required: true, message: '负责人不能为空', trigger: 'change'}, + ] + } } }, mounted() { @@ -109,6 +200,36 @@ // this.pageLoading = true }, methods:{ + principal(row) { + this.principalShow = true + this.editPrincipalData.partyOrgId = row.id + this.$http.post('/data/aggregator/org/staff-select-list/'+row.agencyId,{'params': {}}).then(({ data: res }) =>{ + if (res.code !== 0) { + return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败') + } else { + this.staffs = res.data + console.log(this.staffs) + } + }).catch(() => {}) + }, + editPrincipal(row) { + this.staffs.forEach(s => { + if (this.editPrincipalData.principal === s.value){ + this.editPrincipalData.principal = s.name + this.editPrincipalData.principalMobile = s.mobile + } + }) + this.$http.post('/resi/partymember/icPartyOrg/editPrincipal',this.editPrincipalData).then(({ data: res }) =>{ + if (res.code !== 0) { + return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败') + } + }).catch(() => {}) + this.principalShow = false + this.getTableData() + }, + handleClose() { + this.principalShow = false + }, // 查询列表 async getTableData () { this.tableLoading = true From 0b0bcffd0a50b843e13bbe222653de037459ca0c Mon Sep 17 00:00:00 2001 From: jiangyy Date: Thu, 8 Sep 2022 08:51:20 +0800 Subject: [PATCH 07/17] 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 @@ + + + + + + + + + + + From 69c109df78eab5e7db8c3733ec66cd0aad81bad4 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Thu, 8 Sep 2022 09:14:31 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E4=BA=BA=E6=88=BF=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scss/modules/visual/houseStatic.scss | 2 + src/assets/scss/modules/visual/people.scss | 4 ++ .../basicinfo/houseStatic/houseList.vue | 1 + .../basicinfo/houseStatic/houseMore.vue | 59 +++++++++++-------- 4 files changed, 43 insertions(+), 23 deletions(-) diff --git a/src/assets/scss/modules/visual/houseStatic.scss b/src/assets/scss/modules/visual/houseStatic.scss index 084e53f0e..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{ @@ -342,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/visual/basicinfo/houseStatic/houseList.vue b/src/views/modules/visual/basicinfo/houseStatic/houseList.vue index 72abe99c1..162621949 100644 --- a/src/views/modules/visual/basicinfo/houseStatic/houseList.vue +++ b/src/views/modules/visual/basicinfo/houseStatic/houseList.vue @@ -76,6 +76,7 @@
diff --git a/src/views/modules/visual/basicinfo/houseStatic/houseMore.vue b/src/views/modules/visual/basicinfo/houseStatic/houseMore.vue index b6d9495a7..fc99058d6 100644 --- a/src/views/modules/visual/basicinfo/houseStatic/houseMore.vue +++ b/src/views/modules/visual/basicinfo/houseStatic/houseMore.vue @@ -13,37 +13,50 @@
-
- 所属网格： - {{ 11 }} -
-
+ +
所属小区： - {{ 11 }} + {{ info.neighborHoodName }}
-
+
所属楼栋： - {{ 11 }}-{{ 11 }} + {{ info.buildingName }} +
+
+ 单元号： + {{ info.unitNum }} +
+
+ 门牌号： + {{ info. doorName}} +
+
+ 房屋类型： + {{ info.houseType==='1'?'楼房':info.houseType==='2'?'平方':'别墅' }} +
+
+ 房屋用途： + {{ info.purpose }}
-
- 所属家庭： - {{ 11 }} +
+ 房屋状态： + {{ info. rentFlag==='1'?'出租':info.rentFlag==='0'?'自住':info.rentFlag==='2'?'闲置':'未出售'}}
-
- 所属家庭： - {{ 11 }} +
+ 房主姓名： + {{ info. ownerName?info.ownerName:'--' }}
-
- 所属家庭： - {{ 11 }} +
+ 房主电话： + {{ info. ownerPhone?info.ownerPhone:'--' }}
-
- 所属家庭： - {{ 11 }} +
+ 身份证号： + {{ info.ownerIdCard?info.ownerIdCard:'--' }}
-
- 所属家庭： - {{ 11 }} +
+ 备注： + {{ info.remark?info.remark:'--' }}
From 4ef1056df6bc62869953a56b31988ab6f219f295 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 8 Sep 2022 09:20:21 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/partymember/icpartyorgtree.vue | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue index ebc87f1ce..45d0e6b88 100644 --- a/src/views/modules/partymember/icpartyorgtree.vue +++ b/src/views/modules/partymember/icpartyorgtree.vue @@ -82,6 +82,7 @@ + style="width: 200px" + class="item_width_4"> - 取 消 + 取 消 确 定 @@ -222,13 +224,23 @@ this.$http.post('/resi/partymember/icPartyOrg/editPrincipal',this.editPrincipalData).then(({ data: res }) =>{ if (res.code !== 0) { return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败') + }else { + this.principalShow = false + this.getTableData() + this.resetEditPrincipalData() } }).catch(() => {}) - this.principalShow = false - this.getTableData() }, handleClose() { - this.principalShow = false + this.principalShow = false + this.resetEditPrincipalData() + }, + resetEditPrincipalData() { + this.editPrincipalData = { + principal: '', + principalMobile: '', + partyOrgId: '' + } }, // 查询列表 async getTableData () { From 1cb3aea3d3a85a31b17ed17f8f0f249ed14734a3 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Thu, 8 Sep 2022 10:50:11 +0800 Subject: [PATCH 10/17] 11 --- src/assets/scss/modules/shequzhili/event-info.scss | 2 +- src/views/modules/shequzhili/event/cpts/add.vue | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) 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/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"> + - 居民信息中选择 +
+ 居民信息中选择 +
Date: Thu, 8 Sep 2022 13:46:08 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicinfo/houseStatic/houseStatic.vue | 58 +++++++++++++------ 1 file changed, 39 insertions(+), 19 deletions(-) diff --git a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue index a00a224b1..8cf156b0a 100644 --- a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue +++ b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue @@ -147,44 +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.wscHouseTotal}}
{{item.wscHouseRatio+'%'}}
未出售房屋数
-
{{item.userTotal}}
+
{{item.userTotal}}
居民总数
-
{{item.czUserTotal}}
+
{{item.czUserTotal}}
{{item.czUserRatio+'%'}}
常住人口数
-
{{item.ldUserTotal}}
+
{{item.ldUserTotal}}
{{item.ldUserRatio+'%'}}
流动人口数
@@ -207,15 +215,15 @@ @@ -324,7 +332,9 @@ export default { rentType: '',//点击房屋数类型 type: '',//点击人员数类型 showPeopleList: false, - showHouseList: false + showHouseList: false, + selOrgId: '', + selOrgType: '', }; }, @@ -352,13 +362,27 @@ export default { }, //点击房屋数 - handleClickHouse (rentType) { + 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) { + 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 @@ -395,10 +419,6 @@ export default { this.$refs.housePieChart.hideLoading() } - this.orgId = data.orgId - this.orgType = data.orgType - - } else { this.houseData = {} this.$message.error(msg); From bc272b1ff07ef31a8df3f5e161a73b8cfcde9e86 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 8 Sep 2022 13:54:47 +0800 Subject: [PATCH 12/17] =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/partymember/icpartyorgtree.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue index 45d0e6b88..980ef2f7b 100644 --- a/src/views/modules/partymember/icpartyorgtree.vue +++ b/src/views/modules/partymember/icpartyorgtree.vue @@ -205,12 +205,12 @@ principal(row) { this.principalShow = true this.editPrincipalData.partyOrgId = row.id + this.editPrincipalData.principal = row.principal this.$http.post('/data/aggregator/org/staff-select-list/'+row.agencyId,{'params': {}}).then(({ data: res }) =>{ if (res.code !== 0) { return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败') } else { this.staffs = res.data - console.log(this.staffs) } }).catch(() => {}) }, From 62be514affd260223274e4cd37fe3b4ac55f63f7 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 8 Sep 2022 14:10:22 +0800 Subject: [PATCH 13/17] =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/partymember/icpartyorgtree.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue index 980ef2f7b..11f62d4f3 100644 --- a/src/views/modules/partymember/icpartyorgtree.vue +++ b/src/views/modules/partymember/icpartyorgtree.vue @@ -12,7 +12,6 @@ :data="tableData" :default-expand-all="true" row-key="id" - border :tree-props="{children: 'children', hasChildren: 'hasChildren'}" :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}" :height="tableHeight"> From b66cf63631ee1bd7cb617cd19a0bfab56ccec5f7 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 8 Sep 2022 14:47:01 +0800 Subject: [PATCH 14/17] =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/partymember/icpartyorgtree.vue | 31 +++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue index 11f62d4f3..dd69f1160 100644 --- a/src/views/modules/partymember/icpartyorgtree.vue +++ b/src/views/modules/partymember/icpartyorgtree.vue @@ -15,8 +15,8 @@ :tree-props="{children: 'children', hasChildren: 'hasChildren'}" :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}" :height="tableHeight"> - - + + - - + +