From 1bf369cab6eda84f60f3462aaf120048b8f6e4f2 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 16 Nov 2022 16:34:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E6=88=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scss/modules/visual/houseStatic.scss | 7 ++ src/assets/scss/modules/visual/people.scss | 2 +- .../base/epidemic/natInfo/natDetail.vue | 15 +++- .../modules/base/epidemic/natInfo/natForm.vue | 27 +++++-- .../modules/base/epidemic/natInfo/natList.vue | 24 +++++- .../basicinfo/houseStatic/houseStatic.vue | 80 +++++++++++++------ .../basicinfo/houseStatic/peopleList.vue | 6 +- src/views/modules/visual/basicinfo/people.vue | 17 +++- 8 files changed, 138 insertions(+), 40 deletions(-) diff --git a/src/assets/scss/modules/visual/houseStatic.scss b/src/assets/scss/modules/visual/houseStatic.scss index d02c6e7fa..24665cdbe 100644 --- a/src/assets/scss/modules/visual/houseStatic.scss +++ b/src/assets/scss/modules/visual/houseStatic.scss @@ -197,6 +197,13 @@ background: #e43c26; border-radius: 4px; } + + .hzrbz{ + background: #fac126; + } + .zbqc{ + background: #fc8452; + } >span{ margin-left:10px; font-size: 10px; diff --git a/src/assets/scss/modules/visual/people.scss b/src/assets/scss/modules/visual/people.scss index 06a879759..f774466cf 100644 --- a/src/assets/scss/modules/visual/people.scss +++ b/src/assets/scss/modules/visual/people.scss @@ -372,7 +372,7 @@ z-index: 1; } .rel-bg { - height: 90px; + height: 78px; width: 128px; } diff --git a/src/views/modules/base/epidemic/natInfo/natDetail.vue b/src/views/modules/base/epidemic/natInfo/natDetail.vue index f96dabf59..d59027890 100644 --- a/src/views/modules/base/epidemic/natInfo/natDetail.vue +++ b/src/views/modules/base/epidemic/natInfo/natDetail.vue @@ -25,7 +25,8 @@ 证件号： {{ formData.showIdCard||'--' }} -
+
采样时间： {{ formData.sampleTime||'--' }}
@@ -57,6 +58,12 @@
+
+ 试管编号： + {{ formData.testTubeCode||'--' }} +
+ @@ -210,7 +217,11 @@ export default { view_real_data: {//显示【显示脱敏信息】按钮 type: Boolean, default: false, - } + }, + isXiaozhaizi: { + type: Boolean, + default: false + }, }, } diff --git a/src/views/modules/base/epidemic/natInfo/natForm.vue b/src/views/modules/base/epidemic/natInfo/natForm.vue index 1bcdf2af5..3338f76a2 100644 --- a/src/views/modules/base/epidemic/natInfo/natForm.vue +++ b/src/views/modules/base/epidemic/natInfo/natForm.vue @@ -95,7 +95,8 @@ v-model="formData.idCard"> - @@ -173,6 +174,19 @@ + + + + + +
diff --git a/src/views/modules/base/epidemic/natInfo/natList.vue b/src/views/modules/base/epidemic/natInfo/natList.vue index 895fe1c46..f81e3ca24 100644 --- a/src/views/modules/base/epidemic/natInfo/natList.vue +++ b/src/views/modules/base/epidemic/natInfo/natList.vue @@ -31,7 +31,8 @@ - - - + + @@ -293,6 +303,7 @@ class="dialog-h" @closed="diaDetailClose"> @@ -321,6 +332,7 @@ export default { isResiUser: true, customerId: '', isYantai: false, + isXiaozhaizi: false, agencyId: '', orgTypeList: [ @@ -387,12 +399,16 @@ export default { async mounted () { //磐石街道：1580460084738760705 //烟台客户id: 1535072605621841922 + //小寨子客户id: 1536638904600752130 this.customerId = localStorage.getItem("customerId"); this.isYantai = false + this.isXiaozhaizi = false if (this.customerId === '1535072605621841922') { this.isYantai = true - + } + if (this.customerId === '1536638904600752130') { + this.isXiaozhaizi = true } this.updateBtnAuths(); diff --git a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue index 60b7126c8..914b33d80 100644 --- a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue +++ b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue @@ -91,11 +91,19 @@
- 常住人口数 + 人户一致
- 流动人口数 + 人在户不在 +
+
+
+ 户在人不在 +
+
+
+ 暂不清楚
@@ -110,22 +118,22 @@
+ @click="handleClickPeople('rhyz')">
{{userData.rhyzUserTotal}}
人户一致
+ @click="handleClickPeople('rzhbz')">
{{userData.rzhbzUserTotal}}
人在户不在
-
{{userData.hzrzUserTotal}}
-
户在人在
+ @click="handleClickPeople('hzrbz')"> +
{{userData.hzrbzUserTotal}}
+
户在人不在
+ @click="handleClickPeople('no')">
{{userData.zbqcUserTotal}}
暂不清楚
@@ -196,15 +204,27 @@
{{item.czUserTotal}}
-
{{item.czUserRatio+'%'}}
-
常住人口数
+ @click="handleClickPeople('rhyz',item)">{{item.rhyzUserTotal}}
+
{{item.rhyzUserRatio+'%'}}
+
人户一致
+ +
+
{{item.rzhbzUserRatio}}
+
{{item.rzhbzUserRatio+'%'}}
+
人在户不在
{{item.ldUserTotal}}
-
{{item.ldUserRatio+'%'}}
-
流动人口数
+ @click="handleClickPeople('hzrbz',item)">{{item.hzrbzUserTotal}}
+
{{item.hzrbzUserRatio+'%'}}
+
户在人不在
+ +
+
{{item.zbqcUserTotal}}
+
{{item.zbqcUserRatio+'%'}}
+
暂不清楚
@@ -234,7 +254,7 @@ @@ -321,12 +341,16 @@ export default { orgType: '',//组织、网格、小区类型 agency grid village userTotal: 198000,//居民总数 rhyzUserTotal: 2000,//人户一致 - czUserRatio: '90%',//常住居民总数占比 + rhyzUserRatio: '90%',//人户一致 占比 rzhbzUserTotal: 30,//人在户不在 - ldUserRatio: '5%',//流动居民总数占比 + rzhbzUserRatio: '5%',//人在户不在 占比 + hzrbzUserTotal: 30,//户在人不在户不在 + hzrbzUserRatio: '5%',//户在人不在 占比 + zbqcUserTotal: 30,//暂不清楚 + zbqcUserRatio: '5%',//暂不清楚 占比 }, - userColorArray: ['#3dda83', '#e43c26'], + userColorArray: ['#3dda83', '#e43c26', '#fac126', '#fc8452'], userPieData: [], subList: [], @@ -340,7 +364,7 @@ export default { parentPolygon: [], rentType: '',//点击房屋数类型 - type: '',//点击人员数类型 + rhType: '',//点击人员数类型 showPeopleList: false, showHouseList: false, selOrgId: '', @@ -385,7 +409,7 @@ export default { this.showHouseList = true }, //点击人员数 - handleClickPeople (type, item) { + handleClickPeople (rhType, item) { if (item) { this.selOrgId = item.orgId this.selOrgType = item.orgType @@ -394,7 +418,7 @@ export default { this.selOrgType = this.houseData.orgType } this.toSubAgency('people') - this.type = type + this.rhType = rhType this.showPeopleList = true }, @@ -552,12 +576,22 @@ export default { selected: true } let obj2 = { - name: '流动人口数', - value: this.userData.ldUserRatio + name: '人在户不在', + value: this.userData.rzhbzUserRatio + } + let obj3 = { + name: '户在人不在', + value: this.userData.hzrbzUserRatio + } + let obj4 = { + name: '暂不清楚', + value: this.userData.zbqcUserRatio } this.userPieData.push(obj1) this.userPieData.push(obj2) + this.userPieData.push(obj3) + this.userPieData.push(obj4) this.userPieOption.title.text = this.userData.userTotal this.userPieOption.series[1].itemStyle = { diff --git a/src/views/modules/visual/basicinfo/houseStatic/peopleList.vue b/src/views/modules/visual/basicinfo/houseStatic/peopleList.vue index 4107a6b0e..3c8e2e197 100644 --- a/src/views/modules/visual/basicinfo/houseStatic/peopleList.vue +++ b/src/views/modules/visual/basicinfo/houseStatic/peopleList.vue @@ -124,7 +124,7 @@ export default { let params = { orgId: this.orgId, orgType: this.orgType, - type: this.type, + rhType: this.rhType, pageSize: this.pageSize, pageNo: this.pageNo } @@ -172,6 +172,10 @@ export default { type: String, default: "", }, + rhType: {//人户一致:rhyz；人在户不在：rzhbz；户在人不在：hzrbz；暂不清楚：no； + type: String, + default: "", + }, }, }; diff --git a/src/views/modules/visual/basicinfo/people.vue b/src/views/modules/visual/basicinfo/people.vue index 53c4c01ba..91dfd3100 100644 --- a/src/views/modules/visual/basicinfo/people.vue +++ b/src/views/modules/visual/basicinfo/people.vue @@ -160,6 +160,9 @@
{{ houseInfo.userList[0].userName }}
+
+ {{ houseInfo.userList[0].renHuCondition }} +
@@ -178,6 +181,9 @@
{{ houseInfo.userList[1].userName }}
+
+ {{ houseInfo.userList[1].renHuCondition }} +
@@ -197,7 +203,7 @@ {{ houseInfo.userList[2].userName }}
- {{ houseInfo.userList[2].userName }} + {{ houseInfo.userList[2].renHuCondition }}
@@ -217,6 +223,9 @@ {{ houseInfo.userList[3].userName }} +
+ {{ houseInfo.userList[3].renHuCondition }} +
@@ -235,6 +244,9 @@
{{ houseInfo.userList[4].userName }}
+
+ {{ houseInfo.userList[4].renHuCondition }} +
@@ -253,6 +265,9 @@
{{ houseInfo.userList[5].userName }}
+
+ {{ houseInfo.userList[5].renHuCondition }} +