elink-star
/
epmet-work-pc-chengyang
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Revert "重新提交下" 

This reverts commit c86cea4c5f.
feature
马魁 3 years ago
parent
4e572aefe4
commit
7327f887e8
8 changed files with 396 additions and 108 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      src/assets/scss/buttonstyle.scss
  2. 324
      src/assets/scss/modules/management/list-main.css
  3. 1
      src/assets/scss/modules/management/list-main.min.css
  4. 66
      src/assets/scss/modules/management/list-main.scss
  5. 3
      src/assets/scss/people-info.scss
  6. 15
      src/views/components/resiSearch.vue
  7. 6
      src/views/modules/base/resi.vue
  8. 74
      src/views/modules/shequ/cpts/peopleDetail.vue

15
src/assets/scss/buttonstyle.scss
View File

@ -36,7 +36,7 @@
height: 32px !important;
// line-height: 22px !important;
// padding:0 8px !important;
border: none;
}
@ -105,18 +105,7 @@
border-radius: 2px !important;
border: 1px solid #0056D6 !important;
}
// 普通按钮
.diy-button--common {
font-size: 14px !important;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #606266 !important;
min-width: 60px !important;
height: 32px !important;
background: #FFFFFF !important;
border-radius: 2px !important;
border: 1px solid #dcdfe6 !important;
}
//操作栏更多
.diy-button--other {
text-decoration: underline !important;

324
src/assets/scss/modules/management/list-main.css
View File

@ -0,0 +1,324 @@
.div_main {
width: 100%;
}
.div_main .marginl-20 {
margin-left: 16px;
}
.div_main .div_search {
padding: 10px;
background: #FFFFFF;
box-shadow: 0px 6px 16px 0px rgba(0, 0, 0, 0.08), 0px 3px 6px -4px rgba(0, 0, 0, 0.12);
margin: 7px 7px;
}
.div_main .div_search /deep/ .el-form-item {
margin-bottom: 14px;
}
.div_main .div_search .div_search_btn {
margin-right: 10px;
margin-top: 5px;
float: right;
}
.div_main .div_search .div_search_label {
line-height: 36px;
margin-left: 24px;
margin-right: 6px;
font-size: 14px;
color: #606266;
vertical-align: middle;
}
.div_main .data-tag {
margin-left: 10px;
}
.div_main .item_width_normal {
width: 168px;
}
.div_main .item_width_daterange {
width: 206px;
}
.div_main .item_width_daterange2 {
width: 445px;
}
.div_main .item_width_communitycascader {
width: 141px;
}
.div_main .item_width_buildcascader {
width: 96px;
}
.div_main .div_table {
margin: 16px 7px 7px;
background: #FFFFFF;
box-shadow: 0px 6px 16px 0px rgba(0, 0, 0, 0.08), 0px 3px 6px -4px rgba(0, 0, 0, 0.12);
position: relative;
padding: 24px 16px 10px;
}
.div_main .div_table .div_btn {
display: flex;
justify-content: space-between;
}
.div_main .div_table .div_btn .div_btn_left {
display: flex;
}
.div_main .div_table .div_btn .div_btn_left .btn_upload {
margin-left: 10px;
display: flex;
text-align: center;
}
.div_main .div_table .div_table_item {
margin-top: 16px;
position: relative;
}
.div_main .setFormBoxHeight {
max-height: 153px;
overflow: hidden;
}
.div_main .setFormBoxHeightAuto {
height: auto;
}
.div_main .flex {
display: flex;
flex-wrap: nowrap;
}
.div_main .hflex {
display: flex;
flex-flow: column;
overflow: hidden;
}
.div_main .flex1 {
flex: 1;
}
.div_main .mean {
justify-content: space-around;
}
.div_main .endpoint {
justify-content: space-between;
}
.div_main .align_item {
align-items: center;
}
.div_main .font12 {
font-size: 12px;
}
.div_main .font14 {
font-size: 14px !important;
}
.div_main .font16 {
font-size: 16px !important;
}
.div_main .font18 {
font-size: 18px !important;
}
.div_main .p0 {
padding: 0 !important;
}
.div_main .p10 {
padding: 10px;
}
.div_main .p16 {
padding: 16px;
}
.div_main .p50 {
padding: 50px;
}
.div_main .p30 {
padding: 30px;
}
.div_main .right5 {
margin-right: 5px;
}
.div_main .right24 {
margin-right: 24px;
}
.div_main .bottom8 {
margin-bottom: 8px;
}
.div_main .bottom16 {
margin-bottom: 16px;
}
.div_main .top2 {
margin-top: 2px;
}
.div_main .top12 {
margin-top: 12px;
}
.div_main .top24 {
margin-top: 24px !important;
}
.div_main .top32 {
margin-top: 32px !important;
}
.div_main .top40 {
margin-top: 40px !important;
}
.div_main .top48 {
margin-top: 48px !important;
}
.div_main .top8 {
margin-top: 8px !important;
}
.div_main .bot8 {
margin-bottom: 8px;
}
.div_main .bot24 {
margin-bottom: 24px !important;
}
.div_main .top16 {
margin-top: 16px !important;
}
.div_main .bot16 {
margin-bottom: 16px !important;
}
.div_main .right8 {
margin-right: 8px !important;
}
.div_main .margin30 {
margin: 30px;
}
.div_main .m0 {
margin: 0 !important;
}
.div_main .title-small {
border-left: solid 4px #0056d6;
height: 12px;
line-height: 16px;
margin-left: 70px;
padding-left: 6px;
font-size: 16px;
font-weight: bold;
}
@media only screen and (min-width: 2013px) {
.div_main .showUnfold {
display: none;
}
}
@media only screen and (min-width: 1481px) {
.div_main .communityUnfold {
display: none;
}
}
.div_main .item_width_2 {
width: 138px;
}
.div_main .item_width_1 {
width: 260px;
}
.div_main .item_width_3 {
width: 200px;
}
.div_main .list_item_width_1 {
width: 165px;
}
.div_main .list_item_width_2 {
width: 135px;
}
.div-mult-form {
margin-top: 20px;
}
.div-mult-form .div_person {
display: flex;
font-size: 14px;
padding-bottom: 20px;
}
.div-mult-form .div_person .person_title {
text-align: right;
flex: 0 0 100px;
line-height: 36px;
padding: 0 12px 0 0;
}
.div-mult-form .div_person .tag_item {
margin-right: 10px;
margin-top: 10px;
}
.div-mult-form .div_person .tag_tip {
margin-top: 10px;
color: #9c9c9c;
}
.div-mult-table {
position: relative;
padding: 0 20px;
}
.div-mult-table .div_selcount {
position: absolute;
bottom: 10px;
left: 30px;
}
.div_dialog_table {
padding: 10px;
}
.div_dialog_table .table {
margin-top: 20px;
}
.twoline {
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
}

1
src/assets/scss/modules/management/list-main.min.css
View File

@ -0,0 +1 @@
.div_main{width:100%}.div_main .marginl-20{margin-left:16px}.div_main .div_search{padding:10px;background:#FFFFFF;box-shadow:0px 6px 16px 0px rgba(0,0,0,0.08),0px 3px 6px -4px rgba(0,0,0,0.12);margin:7px 7px}.div_main .div_search /deep/ .el-form-item{margin-bottom:14px}.div_main .div_search .div_search_btn{margin-right:10px;margin-top:5px;float:right}.div_main .div_search .div_search_label{line-height:36px;margin-left:24px;margin-right:6px;font-size:14px;color:#606266;vertical-align:middle}.div_main .data-tag{margin-left:10px}.div_main .item_width_normal{width:168px}.div_main .item_width_daterange{width:206px}.div_main .item_width_daterange2{width:445px}.div_main .item_width_communitycascader{width:141px}.div_main .item_width_buildcascader{width:96px}.div_main .div_table{margin:16px 7px 7px;background:#FFFFFF;box-shadow:0px 6px 16px 0px rgba(0,0,0,0.08),0px 3px 6px -4px rgba(0,0,0,0.12);position:relative;padding:24px 16px 10px}.div_main .div_table .div_btn{display:flex;justify-content:space-between}.div_main .div_table .div_btn .div_btn_left{display:flex}.div_main .div_table .div_btn .div_btn_left .btn_upload{margin-left:10px;display:flex;text-align:center}.div_main .div_table .div_table_item{margin-top:16px;position:relative}.div_main .setFormBoxHeight{max-height:153px;overflow:hidden}.div_main .setFormBoxHeightAuto{height:auto}.div_main .flex{display:flex;flex-wrap:nowrap}.div_main .hflex{display:flex;flex-flow:column;overflow:hidden}.div_main .flex1{flex:1}.div_main .mean{justify-content:space-around}.div_main .endpoint{justify-content:space-between}.div_main .align_item{align-items:center}.div_main .font12{font-size:12px}.div_main .font14{font-size:14px !important}.div_main .font16{font-size:16px !important}.div_main .font18{font-size:18px !important}.div_main .p0{padding:0 !important}.div_main .p10{padding:10px}.div_main .p16{padding:16px}.div_main .p50{padding:50px}.div_main .p30{padding:30px}.div_main .right5{margin-right:5px}.div_main .right24{margin-right:24px}.div_main .bottom8{margin-bottom:8px}.div_main .bottom16{margin-bottom:16px}.div_main .top2{margin-top:2px}.div_main .top12{margin-top:12px}.div_main .top24{margin-top:24px !important}.div_main .top32{margin-top:32px !important}.div_main .top40{margin-top:40px !important}.div_main .top48{margin-top:48px !important}.div_main .top8{margin-top:8px !important}.div_main .bot8{margin-bottom:8px}.div_main .bot24{margin-bottom:24px !important}.div_main .top16{margin-top:16px !important}.div_main .bot16{margin-bottom:16px !important}.div_main .right8{margin-right:8px !important}.div_main .margin30{margin:30px}.div_main .m0{margin:0 !important}.div_main .title-small{border-left:solid 4px #0056d6;height:12px;line-height:16px;margin-left:70px;padding-left:6px;font-size:16px;font-weight:bold}@media only screen and (min-width: 2013px){.div_main .showUnfold{display:none}}@media only screen and (min-width: 1481px){.div_main .communityUnfold{display:none}}.div_main .item_width_2{width:138px}.div_main .item_width_1{width:260px}.div_main .item_width_3{width:200px}.div_main .list_item_width_1{width:165px}.div_main .list_item_width_2{width:135px}.div-mult-form{margin-top:20px}.div-mult-form .div_person{display:flex;font-size:14px;padding-bottom:20px}.div-mult-form .div_person .person_title{text-align:right;flex:0 0 100px;line-height:36px;padding:0 12px 0 0}.div-mult-form .div_person .tag_item{margin-right:10px;margin-top:10px}.div-mult-form .div_person .tag_tip{margin-top:10px;color:#9c9c9c}.div-mult-table{position:relative;padding:0 20px}.div-mult-table .div_selcount{position:absolute;bottom:10px;left:30px}.div_dialog_table{padding:10px}.div_dialog_table .table{margin-top:20px}.twoline{display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden}

66
src/assets/scss/modules/management/list-main.scss
View File

@ -120,133 +120,133 @@
height: auto;
}
// 弹性盒子
.f-flex {
.flex {
display: flex;
flex-wrap: nowrap;
}
.f-hflex {
.hflex {
display: flex;
flex-flow: column;
overflow: hidden;
}
.f-flex1 {
.flex1 {
flex: 1;
}
.f-mean {
.mean {
justify-content: space-around;
}
.f-endpoint {
.endpoint {
justify-content: space-between;
}
.f-align_item {
.align_item {
align-items: center;
}
// 字体大小
.f-font12 {
.font12 {
font-size: 12px;
}
.f-font14 {
.font14 {
font-size: 14px !important;
}
.f-font16 {
.font16 {
font-size: 16px !important;
}
.f-font18 {
.font18 {
font-size: 18px !important;
}
//内边距
.f-p0 {
.p0 {
padding: 0 !important;
}
.f-p10 {
.p10 {
padding: 10px;
}
.f-p16 {
.p16 {
padding: 16px;
}
.f-p50 {
.p50 {
padding: 50px;
}
.f-p30 {
.p30 {
padding: 30px;
}
// 外边距
.f-right5 {
.right5 {
margin-right: 5px;
}
.f-right24 {
.right24 {
margin-right: 24px;
}
.f-bottom8 {
.bottom8 {
margin-bottom: 8px;
}
.f-bottom16 {
.bottom16 {
margin-bottom: 16px;
}
.f-top2 {
.top2 {
margin-top: 2px;
}
.f-top12 {
.top12 {
margin-top: 12px;
}
.f-top24 {
.top24 {
margin-top: 24px !important;
}
.f-top32 {
.top32 {
margin-top: 32px !important;
}
.f-top40 {
.top40 {
margin-top: 40px !important;
}
.f-top48 {
.top48 {
margin-top: 48px !important;
}
.f-top8 {
.top8 {
margin-top: 8px !important;
}
.f-bot8 {
.bot8 {
margin-bottom: 8px;
}
.f-bot24 {
.bot24 {
margin-bottom: 24px !important;
}
.f-top16 {
.top16 {
margin-top: 16px !important;
}
.f-bot16 {
.bot16 {
margin-bottom: 16px !important;
}
.f-right8 {
.right8 {
margin-right: 8px !important;
}
.f-margin30 {
.margin30 {
margin: 30px;
}
.f-m0 {
.m0 {
margin: 0 !important;
}
// 详情分类title

3
src/assets/scss/people-info.scss
View File

@ -3,7 +3,6 @@
.m-pop {
@include shield;
z-index: 2000;
background-color: rgba(#000, 0.5);
overflow-y: auto;
@ -52,7 +51,7 @@
.list {
display: flex;
flex-wrap: wrap;
padding: 10px 67px;
padding: 10px 97px;
.item {
position: relative;

15
src/views/components/resiSearch.vue
View File

@ -23,11 +23,11 @@
<inputRange style="height:37px;" v-model="form[n.columnName]" :type="n.validType" @change="handleAgeChange" />
</template>
<template v-else-if="n.itemType === 'datepicker'">
<el-date-picker style="width:218px ;" v-if="n.queryType === 'daterange'" v-model.trim="timer.startPickerTime"
<el-date-picker v-if="n.queryType === 'daterange'" v-model.trim="timer.startPickerTime"
:picker-options="startPickerOptions" type="date" align="right" unlink-panels placeholder="开始时间"
class="item_width_daterang" size="small" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
</el-date-picker>
<el-date-picker style="width:219px ;" v-if="n.queryType === 'daterange'" v-model.trim="timer.endPickerTime"
<el-date-picker v-if="n.queryType === 'daterange'" v-model.trim="timer.endPickerTime"
:picker-options="endPickerOptions" class="item_width_daterang data-tag" size="small" type="date"
value-format="yyyy-MM-dd" value="yyyy-MM-dd" placeholder="结束时间">
</el-date-picker>
@ -91,11 +91,10 @@
</el-form>
</div>
<el-row v-if="showSmartSearchForm" class="resi-row-more f-m0">
<el-row v-if="showSmartSearchForm" class="resi-row-more m0">
<el-col :span="24">
<span style="width:100px;display: inline-block;text-align: right;padding-right: 18px;">智能查询</span>
<el-button v-for="btnItem in btnList" :key="btnItem.index" size="small"
:class="selBtnIndex === btnItem.index ? 'diy-button--white' : 'diy-button--common'"
:class="selBtnIndex === btnItem.index ? 'diy-button--blue' : 'diy-button--gray'"
@click="handelSelSmartBtn(btnItem.index)">{{ btnItem.name }}</el-button>
</el-col>
@ -288,7 +287,11 @@ export default {
formType: 'add',
selBtnIndex: 1,
btnList: [
{
name: '智能查询',
index: 1,
},
{
name: '租户',
index: 2,

6
src/views/modules/base/resi.vue
View File

@ -247,7 +247,7 @@
<div class="resi-btns">
<el-button size="small"
@click="handlerReset">重置</el-button>
@click="handlerCancle">重置</el-button>
<el-button size="small"
@click="handlerCancle">取消</el-button>
<el-button type="primary"
@ -1098,10 +1098,6 @@ export default {
});
this.dialogVisible = false;
},
handlerReset(){
this.$refs.baseForm.resetForm();
},
async submitAdd (arr) {
this.btnLoading = true;
await this.$http

74
src/views/modules/shequ/cpts/peopleDetail.vue
View File

@ -2,7 +2,7 @@
<div class="m-pop">
<div class="wrap">
<div class="wrap2">
<div class="title f-flex f-endpoint f-font16 f-p10" style="border-bottom: 1px #DCDEE0 solid;">
<div class="title flex endpoint font16 p10" style="border-bottom: 1px #DCDEE0 solid;">
<span>居民详情</span>
<el-button type="text"> <i class="el-icon-close" @click="handleClose"></i></el-button>
@ -13,7 +13,7 @@
class="diy-button--search"
@click="handleTuomin">显示脱敏信息</el-button>
</div> -->
<div class="title-small f-top40">基本信息</div>
<div class="title-small top40">基本信息</div>
<div :key="'fieldSubList' + index"
v-for="(fieldSubList, index) in fieldList">
<div class="list" :class="{'listTransform':index==1}">
@ -44,10 +44,7 @@
v-if="info[field.columnName]!=0"
>
<span class="item-field">{{field.label}}<span v-if="field.itemType!='radio'"> ：</span> </span>
<section v-if="field.columnName==='MOBILE' && info[field.columnName] != null||field.columnName==='ID_CARD' && info[field.columnName] != null" class="f-flex f-flex1 f-endpoint">
{{ info[field.columnName]||'--'}}
<span> <el-button type="text" class="div-table-button--blue" style="float;height: 24px;" @click="handleTuomin(field)"> <i class="el-icon-view"></i> 显示</el-button> </span>
</section>
<span v-if="field.columnName==='MOBILE'||field.columnName==='ID_CARD'">{{ info[field.columnName]||'--'}}</span>
<span v-else-if="
field.itemType == 'select' ||
field.itemType == 'radio' ||
@ -75,25 +72,24 @@
</div>
</div>
<div class="title-small f-top40 div-mult-table "> {{index==0? '分类信息':'其他信息'}}
<div class="title-small top40 div-mult-table "> {{index==0? '分类信息':'其他信息'}}
<section v-show="index==0 " style="position:absolute;top:42px;left: 20px;" class="font14">居民分类: </section>
</div>
</div>
<!-- 详情下方tab -->
<el-tabs class="f-top32" v-model="groupIndex" @tab-click="handlTabs">
<el-tabs class="top32" @tab-click="handlTabs">
<!-- <div class="tab-btn"
@click="subStartGroupIndex"
v-if="groupList.length > 9">
<img src="@/assets/img/shuju/people/arrow-double-left.png" />
</div> -->
<el-dropdown>
<span class="el-dropdown-link">
<i class="el-icon-arrow-down el-icon-more"></i>
</span>
<el-dropdown-menu slot="dropdown" >
<el-dropdown-item v-for="(j,index) in groupList" :key="index"><div @click="handlDropdownTabs(`${index}`)"> {{j.label}}</div></el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-button
type="text"
size="small"
@click="addTab(editableTabsValue)"
>
<i class="el-icon-more"></i>
</el-button>
<el-tab-pane
v-for="(item, index) in groupList"
:class="groupIndex % groupList.length == index ? 'z-on' : ''"
@ -146,12 +142,12 @@
</div>
</div>
<div v-else-if="group.tableName == 'ic_hs'"
style="margin: 10px 0 50px 0; padding: 0 20px">
<el-table class="table f-bot24"
style="margin-top: 10px; padding: 0 20px">
<el-table class="table"
:data="natList"
border
height="400"
:header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
style="width: 100%">
<el-table-column label="序号"
header-align="center"
@ -181,12 +177,12 @@
</el-table>
</div>
<div v-else-if="group.tableName == 'ic_xc'"
style="margin: 10px 0 50px 0; padding: 0 20px">
<el-table class="table f-bot24"
style="margin-top: 10px; padding: 0 20px">
<el-table class="table"
:data="tripList"
border
height="400"
:header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
style="width: 100%">
<el-table-column label="序号"
header-align="center"
@ -229,12 +225,13 @@
</el-table>
</div>
<div v-else-if="group.tableName == 'ic_ym'"
style="margin: 10px 0 50px 0; padding: 0 20px">
style="margin-top: 10px; padding: 0 20px">
<el-table v-if="vaccineList"
class="table f-bot24"
class="table"
:data="vaccineList"
border
height="400"
:header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
style="width: 100%">
<el-table-column label="序号"
header-align="center"
@ -293,9 +290,6 @@
</div>
</div>
</div>
<el-row class="f-bot12 footerClose" justify="end" >
<el-col :span="24"> <el-button class="diy-button--common" @click="handleClose">关闭</el-button></el-col>
</el-row>
</div>
</div>
</div>
@ -432,11 +426,7 @@ export default {
handlTabs(i){
this.groupIndex = i.index
},
handlDropdownTabs(index){
this.groupIndex = index
console.log(index);
},
async handleTuomin (item) {
async handleTuomin () {
const url = "/data/aggregator/epmetuser/detailByType";
const { data, code, msg } = await requestPost(url, {
@ -445,11 +435,8 @@ export default {
});
if (code === 0) {
if(item.columnName=='MOBILE'){
this.$set(this.info, 'MOBILE', data.mobile)
}else if(item.columnName=='ID_CARD'){
this.$set(this.info, 'ID_CARD', data.idCard)
}
this.$set(this.info, 'MOBILE', data.mobile)
this.$set(this.info, 'ID_CARD', data.idCard)
} else {
this.$message.error(msg);
}
@ -761,21 +748,10 @@ height: 848px;
width: 820px;
height: 848px;
}
.footerClose{
position: absolute;
background-color: pink;
bottom: 10px;
right: 10px;
z-index: 99;
}
.m-pop .wrap .list .item{
display: flex;
width: 48% !important;
font-size: 14px;
}
.item ::v-deep .el-button{
padding: 0;
}
.m-pop .wrap .list .width-40{
width: 17% !important;

Write Preview
Loading…
Cancel
Save