Commit e48aaceb by maxiaohan

Merge remote-tracking branch 'origin/dev_zwpt' into dev_zwpt

parents 74e2ff3c aa917609
......@@ -18,6 +18,34 @@
<t-l-candidate></t-l-candidate>
</div>
</div>
<el-dialog
class="bz-dialog"
title="比中"
:visible.sync="isDialogShow"
:modal-append-to-body="false"
>
<div class="tl">
<div class="type">
<div class="outside">
<div class="label">查询类型:</div>
<div class="content">倒查</div>
<div class="label">人员编号:</div>
<div class="content">R1231231231231231231</div>
<div class="label">指位:</div>
<div class="content">平面-右拇</div>
</div>
<div class="outside">
<div class="label">查询类型:</div>
<div class="content">倒查</div>
<div class="label">人员编号:</div>
<div class="content">R1231231231231231231</div>
<div class="label">指位:</div>
<div class="content">平面-右拇</div>
</div>
</div>
</div>
</el-dialog>
<!-- <div v-show="dialog" class="popContainer" @click="hideDialog"></div>-->
</div>
</template>
......@@ -32,12 +60,19 @@ export default {
TLSrc,
TLCandidate
},
data() {
return { isDialogShow: false, dialog: false };
},
methods: {
Bz() {
console.info("比中");
this.isDialogShow = true;
},
Rdwc() {
console.info("认定完成");
},
hideDialog() {
this.dialog = true;
}
}
};
......@@ -105,9 +140,7 @@ div {
.main {
width: 100%;
display: flex;
flex-direction: row;
.main-left {
width: 352px;
//border: none;
......@@ -123,4 +156,70 @@ div {
width: 360px;
}
}
.bz-dialog {
.tl {
width: 753px;
height: 634px;
.type {
display: flex;
width: 743px;
height: 160px;
border: #cda869 1px solid;
margin: 0;
background: rgba(230, 0, 18, 0.04);
}
.label {
width: 70px;
height: 22px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
line-height: 22px;
}
.content {
width: 190px;
height: 22px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
line-height: 22px;
}
}
}
.outside {
width: 371px;
height: 148px;
border: #0e9a00 1px solid;
padding-top: 12px;
padding-left: 30px;
//padding: 24px 0 24px 30px;
.label {
border: #0e0eff 1px solid;
width: 70px;
height: 22px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
line-height: 22px;
}
.content {
border: 1px darkmagenta solid;
width: 190px;
height: 22px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
line-height: 22px;
margin: 12px 30px 12px 30px;
}
}
//遮罩层
//.popContainer {
// position: fixed;
// top: 0;
// left: 0;
// right: 0;
// bottom: 0;
// background: rgba(255, 255, 255, 0.1);
//}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment