Browse Source

人房

feature/welfareImport
jiangyy 3 years ago
parent
commit
1bf369cab6
  1. 7
      src/assets/scss/modules/visual/houseStatic.scss
  2. 2
      src/assets/scss/modules/visual/people.scss
  3. 15
      src/views/modules/base/epidemic/natInfo/natDetail.vue
  4. 27
      src/views/modules/base/epidemic/natInfo/natForm.vue
  5. 24
      src/views/modules/base/epidemic/natInfo/natList.vue
  6. 80
      src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
  7. 6
      src/views/modules/visual/basicinfo/houseStatic/peopleList.vue
  8. 17
      src/views/modules/visual/basicinfo/people.vue

7
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;

2
src/assets/scss/modules/visual/people.scss

@ -372,7 +372,7 @@
z-index: 1;
}
.rel-bg {
height: 90px;
height: 78px;
width: 128px;
}

15
src/views/modules/base/epidemic/natInfo/natDetail.vue

@ -25,7 +25,8 @@
<span class="info-title-2">证件号</span>
<span>{{ formData.showIdCard||'--' }}</span>
</div>
<div class="info-prop">
<div v-if="!isXiaozhaizi"
class="info-prop">
<span class="info-title-2">采样时间</span>
<span>{{ formData.sampleTime||'--' }}</span>
</div>
@ -57,6 +58,12 @@
</div>
</div>
<div v-if="isXiaozhaizi"
class="info-prop">
<span class="info-title-2">试管编号</span>
<span>{{ formData.testTubeCode||'--' }}</span>
</div>
</div>
</div>
@ -210,7 +217,11 @@ export default {
view_real_data: {//
type: Boolean,
default: false,
}
},
isXiaozhaizi: {
type: Boolean,
default: false
},
},
}
</script>

27
src/views/modules/base/epidemic/natInfo/natForm.vue

@ -95,7 +95,8 @@
v-model="formData.idCard">
</el-input>
</el-form-item>
<el-form-item label="采样时间"
<el-form-item v-if="!isXiaozhaizi"
label="采样时间"
style="display: block"
prop="sampleTime"
label-width="150px">
@ -173,6 +174,19 @@
</el-upload>
</el-form-item>
<el-form-item v-if="isXiaozhaizi"
label="试管编号"
prop="testTubeCode"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
placeholder="请输入试管编号"
clearable
v-model="formData.testTubeCode">
</el-input>
</el-form-item>
<div v-if=" formType!=='detail'">
<el-form-item label="通知渠道"
prop="isSelChannel"
@ -689,13 +703,10 @@ export default {
},
props: {
// serviceList: {
// type: Array,
// default: []
// },
isXiaozhaizi: {
type: Boolean,
default: false
},
}
}
</script>

24
src/views/modules/base/epidemic/natInfo/natList.vue

@ -31,7 +31,8 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="采样时间"
<el-form-item v-if="!isXiaozhaizi"
label="采样时间"
label-width="110px"
prop="sampleStartTime">
<el-date-picker v-model="sampleTimeRange"
@ -180,7 +181,8 @@
label="证件号"
min-width="170">
</el-table-column>
<el-table-column prop="sampleTime"
<el-table-column v-if="!isXiaozhaizi"
prop="sampleTime"
header-align="center"
align="center"
label="采样时间"
@ -216,7 +218,14 @@
label="本辖区居民"
width="120">
</el-table-column>
<el-table-column v-if="isXiaozhaizi"
prop="testTubeCode"
header-align="center"
align="center"
show-overflow-tooltip
label="试管编号"
width="120">
</el-table-column>
<el-table-column label="操作"
fixed="right"
width="160"
@ -280,6 +289,7 @@
class="dialog-h"
@closed="diaClose">
<nat-form ref="ref_form"
:isXiaozhaizi="isXiaozhaizi"
@dialogCancle="diaClose"
@dialogOk="addFormOk"></nat-form>
</el-dialog>
@ -293,6 +303,7 @@
class="dialog-h"
@closed="diaDetailClose">
<nat-detail ref="ref_detail"
:isXiaozhaizi="isXiaozhaizi"
:view_real_data="btnAuths.ic_nat_view_real_data"
@dialogCancle="diaDetailClose"></nat-detail>
</el-dialog>
@ -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();

80
src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue

@ -91,11 +91,19 @@
<div class="div-tip2">
<div class="cz-tip">
<div class="cz-tip-dot"></div>
<span>常住人口数</span>
<span>人户一致</span>
</div>
<div class="ld-tip">
<div class="ld-tip-dot"></div>
<span>流动人口数</span>
<span>人在户不在</span>
</div>
<div class="ld-tip">
<div class="ld-tip-dot hzrbz"></div>
<span>户在人不在</span>
</div>
<div class="ld-tip">
<div class="ld-tip-dot zbqc"></div>
<span>暂不清楚</span>
</div>
</div>
@ -110,22 +118,22 @@
</div>
<div class="pie-table-line"></div>
<div class="pie-table-total "
@click="handleClickPeople('cz')">
@click="handleClickPeople('rhyz')">
<div class="pie-table-total-count zz">{{userData.rhyzUserTotal}}</div>
<div class="pie-table-title">人户一致</div>
</div>
<div class="pie-table-total "
@click="handleClickPeople('ld')">
@click="handleClickPeople('rzhbz')">
<div class="pie-table-total-count cz">{{userData.rzhbzUserTotal}}</div>
<div class="pie-table-title">人在户不在</div>
</div>
<div class="pie-table-total "
@click="handleClickPeople('ld')">
<div class="pie-table-total-count xz">{{userData.hzrzUserTotal}}</div>
<div class="pie-table-title">户在人在</div>
@click="handleClickPeople('hzrbz')">
<div class="pie-table-total-count xz">{{userData.hzrbzUserTotal}}</div>
<div class="pie-table-title">户在人</div>
</div>
<div class="pie-table-total "
@click="handleClickPeople('ld')">
@click="handleClickPeople('no')">
<div class="pie-table-total-count wsc">{{userData.zbqcUserTotal}}</div>
<div class="pie-table-title">暂不清楚</div>
</div>
@ -196,15 +204,27 @@
<div class="pie-table-line"></div>
<div class="pie-table-total ">
<div class="pie-table-total-count colorwhite"
@click="handleClickPeople('cz',item)">{{item.czUserTotal}}</div>
<div class="pie-table-title table-table-title">{{item.czUserRatio+'%'}}</div>
<div class="pie-table-title table-table-title">常住人口数</div>
@click="handleClickPeople('rhyz',item)">{{item.rhyzUserTotal}}</div>
<div class="pie-table-title table-table-title">{{item.rhyzUserRatio+'%'}}</div>
<div class="pie-table-title table-table-title">人户一致</div>
</div>
<div class="pie-table-total ">
<div class="pie-table-total-count colorwhite"
@click="handleClickPeople('rzhbz',item)">{{item.rzhbzUserRatio}}</div>
<div class="pie-table-title table-table-title">{{item.rzhbzUserRatio+'%'}}</div>
<div class="pie-table-title table-table-title">人在户不在</div>
</div>
<div class="pie-table-total ">
<div class="pie-table-total-count colorwhite"
@click="handleClickPeople('ld',item)">{{item.ldUserTotal}}</div>
<div class="pie-table-title table-table-title">{{item.ldUserRatio+'%'}}</div>
<div class="pie-table-title table-table-title">流动人口数</div>
@click="handleClickPeople('hzrbz',item)">{{item.hzrbzUserTotal}}</div>
<div class="pie-table-title table-table-title">{{item.hzrbzUserRatio+'%'}}</div>
<div class="pie-table-title table-table-title">户在人不在</div>
</div>
<div class="pie-table-total ">
<div class="pie-table-total-count colorwhite"
@click="handleClickPeople('no',item)">{{item.zbqcUserTotal}}</div>
<div class="pie-table-title table-table-title">{{item.zbqcUserRatio+'%'}}</div>
<div class="pie-table-title table-table-title">暂不清楚</div>
</div>
</div>
@ -234,7 +254,7 @@
<people-list v-if="showPeopleList "
:orgId="selOrgId"
:orgType="selOrgType"
:type="type"
:rhType="rhType"
@close="showPeopleList = false">
</people-list>
@ -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 = {

6
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: {//:rhyzrzhbzhzrbzno
type: String,
default: "",
},
},
};

17
src/views/modules/visual/basicinfo/people.vue

@ -160,6 +160,9 @@
<div class="rel-name">
{{ houseInfo.userList[0].userName }}
</div>
<div class="rel-name">
{{ houseInfo.userList[0].renHuCondition }}
</div>
</div>
</div>
@ -178,6 +181,9 @@
<div class="rel-name">
{{ houseInfo.userList[1].userName }}
</div>
<div class="rel-name">
{{ houseInfo.userList[1].renHuCondition }}
</div>
</div>
</div>
@ -197,7 +203,7 @@
{{ houseInfo.userList[2].userName }}
</div>
<div class="rel-name">
{{ houseInfo.userList[2].userName }}
{{ houseInfo.userList[2].renHuCondition }}
</div>
</div>
</div>
@ -217,6 +223,9 @@
<span class="rel-name">{{
houseInfo.userList[3].userName
}}</span>
<div class="rel-name">
{{ houseInfo.userList[3].renHuCondition }}
</div>
</div>
</div>
@ -235,6 +244,9 @@
<div class="rel-name">
{{ houseInfo.userList[4].userName }}
</div>
<div class="rel-name">
{{ houseInfo.userList[4].renHuCondition }}
</div>
</div>
</div>
@ -253,6 +265,9 @@
<div class="rel-name">
{{ houseInfo.userList[5].userName }}
</div>
<div class="rel-name">
{{ houseInfo.userList[5].renHuCondition }}
</div>
</div>
</div>
</div>

Loading…
Cancel
Save