Merge branch 'master' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage

This commit is contained in:
songwc
2022-10-25 17:56:25 +08:00
12 changed files with 270 additions and 172 deletions

View File

@@ -15,7 +15,7 @@
@click="closeDrawer"
/>
</div>
<div class="main">
<div class="centermain">
<div class="titl">
<div class="endtime">
起止时间2022-07-21 14:00 2022-7-30 14:00
@@ -137,12 +137,10 @@
/>
</div> -->
</div>
</div>
<div class="botm"></div>
<div class="btnn">
<button class="btn1">取消</button>
<button class="btn2">确定</button>
<div class="btnn">
<button class="btn1">取消</button>
<button class="btn2">确定</button>
</div>
</div>
</a-drawer>
<!-- 批量签到弹窗 -->
@@ -710,6 +708,7 @@ export default {
// overflow-x: scroll;
display: flex;
flex-direction: column;
height: 100%;
.header {
height: 73px;
border-bottom: 1px solid #e8e8e8;
@@ -727,12 +726,13 @@ export default {
// margin-left: 24px;
}
}
.main {
width: 100%;
height: 100%;
background-color: #bfa;
.centermain {
// width: 100%;
// height: 100%;
// background-color: #bfa;
flex: 1;
overflow-y: auto;
margin-bottom: 75px;
.titl {
display: flex;
.endtime {
@@ -935,7 +935,7 @@ export default {
background: #f6f9fd;
}
.opa {
background-color: #bfa;
// background-color: #bfa;
}
}
// .tab {
@@ -954,44 +954,45 @@ export default {
// }
// }
}
}
.botm {
width: 100%;
height: 90px;
// background-color: red;
// flex-shrink: 1;
}
.btnn {
height: 72px;
width: 100%;
position: absolute;
background-color: #fff;
bottom: 0;
left: 0;
display: flex;
align-items: center;
justify-content: center;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
.btn1 {
width: 100px;
height: 40px;
border: 1px solid #4ea6ff;
border-radius: 8px;
color: #4ea6ff;
.btnn {
height: 72px;
width: 100%;
// position: absolute;
background-color: #fff;
cursor: pointer;
}
.btn2 {
cursor: pointer;
width: 100px;
height: 40px;
background: #4ea6ff;
border-radius: 8px;
border: 0;
margin-left: 15px;
color: #fff;
// bottom: 0;
// left: 0;
display: flex;
// display: none;
align-items: center;
justify-content: center;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
.btn1 {
width: 100px;
height: 40px;
border: 1px solid #4ea6ff;
border-radius: 8px;
color: #4ea6ff;
background-color: #fff;
cursor: pointer;
}
.btn2 {
cursor: pointer;
width: 100px;
height: 40px;
background: #4ea6ff;
border-radius: 8px;
border: 0;
margin-left: 15px;
color: #fff;
}
}
}
// .botm {
// width: 100%;
// height: 90px;
// // background-color: red;
// // flex-shrink: 1;
// }
}
}
}