elink-star
/
epmet-oper-gov
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

人房

feature/welfareImport
jiangyy 3 years ago
parent
08ad97c234
commit
1bf369cab6
8 changed files with 138 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  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
View File

@ -197,6 +197,13 @@
background: #e43c26; background: #e43c26;
border-radius: 4px; border-radius: 4px;
} }
.hzrbz{
background: #fac126;
}
.zbqc{
background: #fc8452;
}
>span{ >span{
margin-left:10px; margin-left:10px;
font-size: 10px; font-size: 10px;

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

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

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

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

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

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

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

@ -31,7 +31,8 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="采样时间" <el-form-item v-if="!isXiaozhaizi"
label="采样时间"
label-width="110px" label-width="110px"
prop="sampleStartTime"> prop="sampleStartTime">
<el-date-picker v-model="sampleTimeRange" <el-date-picker v-model="sampleTimeRange"
@ -180,7 +181,8 @@
label="证件号" label="证件号"
min-width="170"> min-width="170">
</el-table-column> </el-table-column>
<el-table-column prop="sampleTime" <el-table-column v-if="!isXiaozhaizi"
prop="sampleTime"
header-align="center" header-align="center"
align="center" align="center"
label="采样时间" label="采样时间"
@ -216,7 +218,14 @@
label="本辖区居民" label="本辖区居民"
width="120"> width="120">
</el-table-column> </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="操作" <el-table-column label="操作"
fixed="right" fixed="right"
width="160" width="160"
@ -280,6 +289,7 @@
class="dialog-h" class="dialog-h"
@closed="diaClose"> @closed="diaClose">
<nat-form ref="ref_form" <nat-form ref="ref_form"
:isXiaozhaizi="isXiaozhaizi"
@dialogCancle="diaClose" @dialogCancle="diaClose"
@dialogOk="addFormOk"></nat-form> @dialogOk="addFormOk"></nat-form>
</el-dialog> </el-dialog>
@ -293,6 +303,7 @@
class="dialog-h" class="dialog-h"
@closed="diaDetailClose"> @closed="diaDetailClose">
<nat-detail ref="ref_detail" <nat-detail ref="ref_detail"
:isXiaozhaizi="isXiaozhaizi"
:view_real_data="btnAuths.ic_nat_view_real_data" :view_real_data="btnAuths.ic_nat_view_real_data"
@dialogCancle="diaDetailClose"></nat-detail> @dialogCancle="diaDetailClose"></nat-detail>
</el-dialog> </el-dialog>
@ -321,6 +332,7 @@ export default {
isResiUser: true, isResiUser: true,
customerId: '', customerId: '',
isYantai: false, isYantai: false,
isXiaozhaizi: false,
agencyId: '', agencyId: '',
orgTypeList: [ orgTypeList: [
@ -387,12 +399,16 @@ export default {
async mounted () { async mounted () {
//磐石街道：1580460084738760705 //磐石街道：1580460084738760705
//烟台客户id: 1535072605621841922 //烟台客户id: 1535072605621841922
//小寨子客户id: 1536638904600752130
this.customerId = localStorage.getItem("customerId"); this.customerId = localStorage.getItem("customerId");
this.isYantai = false this.isYantai = false
this.isXiaozhaizi = false
if (this.customerId === '1535072605621841922') { if (this.customerId === '1535072605621841922') {
this.isYantai = true this.isYantai = true
}
if (this.customerId === '1536638904600752130') {
this.isXiaozhaizi = true
} }
this.updateBtnAuths(); this.updateBtnAuths();

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

@ -91,11 +91,19 @@
<div class="div-tip2"> <div class="div-tip2">
<div class="cz-tip"> <div class="cz-tip">
<div class="cz-tip-dot"></div> <div class="cz-tip-dot"></div>
<span>常住人口数</span> <span>人户一致</span>
</div> </div>
<div class="ld-tip"> <div class="ld-tip">
<div class="ld-tip-dot"></div> <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>
</div> </div>
@ -110,22 +118,22 @@
</div> </div>
<div class="pie-table-line"></div> <div class="pie-table-line"></div>
<div class="pie-table-total " <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-total-count zz">{{userData.rhyzUserTotal}}</div>
<div class="pie-table-title">人户一致</div> <div class="pie-table-title">人户一致</div>
</div> </div>
<div class="pie-table-total " <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-total-count cz">{{userData.rzhbzUserTotal}}</div>
<div class="pie-table-title">人在户不在</div> <div class="pie-table-title">人在户不在</div>
</div> </div>
<div class="pie-table-total " <div class="pie-table-total "
@click="handleClickPeople('ld')"> @click="handleClickPeople('hzrbz')">
<div class="pie-table-total-count xz">{{userData.hzrzUserTotal}}</div> <div class="pie-table-total-count xz">{{userData.hzrbzUserTotal}}</div>
<div class="pie-table-title">户在人在</div> <div class="pie-table-title">户在人不在</div>
</div> </div>
<div class="pie-table-total " <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-total-count wsc">{{userData.zbqcUserTotal}}</div>
<div class="pie-table-title">暂不清楚</div> <div class="pie-table-title">暂不清楚</div>
</div> </div>
@ -196,15 +204,27 @@
<div class="pie-table-line"></div> <div class="pie-table-line"></div>
<div class="pie-table-total "> <div class="pie-table-total ">
<div class="pie-table-total-count colorwhite" <div class="pie-table-total-count colorwhite"
@click="handleClickPeople('cz',item)">{{item.czUserTotal}}</div> @click="handleClickPeople('rhyz',item)">{{item.rhyzUserTotal}}</div>
<div class="pie-table-title table-table-title">{{item.czUserRatio+'%'}}</div> <div class="pie-table-title table-table-title">{{item.rhyzUserRatio+'%'}}</div>
<div class="pie-table-title table-table-title">常住人口数</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>
<div class="pie-table-total "> <div class="pie-table-total ">
<div class="pie-table-total-count colorwhite" <div class="pie-table-total-count colorwhite"
@click="handleClickPeople('ld',item)">{{item.ldUserTotal}}</div> @click="handleClickPeople('hzrbz',item)">{{item.hzrbzUserTotal}}</div>
<div class="pie-table-title table-table-title">{{item.ldUserRatio+'%'}}</div> <div class="pie-table-title table-table-title">{{item.hzrbzUserRatio+'%'}}</div>
<div class="pie-table-title table-table-title">流动人口数</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>
</div> </div>
@ -234,7 +254,7 @@
<people-list v-if="showPeopleList " <people-list v-if="showPeopleList "
:orgId="selOrgId" :orgId="selOrgId"
:orgType="selOrgType" :orgType="selOrgType"
:type="type" :rhType="rhType"
@close="showPeopleList = false"> @close="showPeopleList = false">
</people-list> </people-list>
@ -321,12 +341,16 @@ export default {
orgType: '',//组织、网格、小区类型 agency grid village orgType: '',//组织、网格、小区类型 agency grid village
userTotal: 198000,//居民总数 userTotal: 198000,//居民总数
rhyzUserTotal: 2000,//人户一致 rhyzUserTotal: 2000,//人户一致
czUserRatio: '90%',//常住居民总数占比 rhyzUserRatio: '90%',//人户一致 占比
rzhbzUserTotal: 30,//人在户不在 rzhbzUserTotal: 30,//人在户不在
ldUserRatio: '5%',//流动居民总数占比 rzhbzUserRatio: '5%',//人在户不在 占比
hzrbzUserTotal: 30,//户在人不在户不在
hzrbzUserRatio: '5%',//户在人不在 占比
zbqcUserTotal: 30,//暂不清楚
zbqcUserRatio: '5%',//暂不清楚 占比
}, },
userColorArray: ['#3dda83', '#e43c26'], userColorArray: ['#3dda83', '#e43c26', '#fac126', '#fc8452'],
userPieData: [], userPieData: [],
subList: [], subList: [],
@ -340,7 +364,7 @@ export default {
parentPolygon: [], parentPolygon: [],
rentType: '',//点击房屋数类型 rentType: '',//点击房屋数类型
type: '',//点击人员数类型 rhType: '',//点击人员数类型
showPeopleList: false, showPeopleList: false,
showHouseList: false, showHouseList: false,
selOrgId: '', selOrgId: '',
@ -385,7 +409,7 @@ export default {
this.showHouseList = true this.showHouseList = true
}, },
//点击人员数 //点击人员数
handleClickPeople (type, item) { handleClickPeople (rhType, item) {
if (item) { if (item) {
this.selOrgId = item.orgId this.selOrgId = item.orgId
this.selOrgType = item.orgType this.selOrgType = item.orgType
@ -394,7 +418,7 @@ export default {
this.selOrgType = this.houseData.orgType this.selOrgType = this.houseData.orgType
} }
this.toSubAgency('people') this.toSubAgency('people')
this.type = type this.rhType = rhType
this.showPeopleList = true this.showPeopleList = true
}, },
@ -552,12 +576,22 @@ export default {
selected: true selected: true
} }
let obj2 = { let obj2 = {
name: '流动人口数', name: '人在户不在',
value: this.userData.ldUserRatio 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(obj1)
this.userPieData.push(obj2) this.userPieData.push(obj2)
this.userPieData.push(obj3)
this.userPieData.push(obj4)
this.userPieOption.title.text = this.userData.userTotal this.userPieOption.title.text = this.userData.userTotal
this.userPieOption.series[1].itemStyle = { this.userPieOption.series[1].itemStyle = {

6
src/views/modules/visual/basicinfo/houseStatic/peopleList.vue
View File

@ -124,7 +124,7 @@ export default {
let params = { let params = {
orgId: this.orgId, orgId: this.orgId,
orgType: this.orgType, orgType: this.orgType,
type: this.type, rhType: this.rhType,
pageSize: this.pageSize, pageSize: this.pageSize,
pageNo: this.pageNo pageNo: this.pageNo
} }
@ -172,6 +172,10 @@ export default {
type: String, type: String,
default: "", default: "",
}, },
rhType: {//人户一致:rhyz；人在户不在：rzhbz；户在人不在：hzrbz；暂不清楚：no；
type: String,
default: "",
},
}, },
}; };

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

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

Write Preview
Loading…
Cancel
Save