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

View File

@@ -90,9 +90,16 @@
<span style="margin-right: 3px">活动时长</span>
</div>
<div class="btnbox">
<a-input
<a-input-number
:min="0"
:precision="0"
style="
width: 388px;
height: 32px;
border-radius: 8px;
overflow: hidden;
"
v-model:value="inputV2"
style="width: 388px; height: 32px"
/>
<span style="margin-left: 5px">分钟</span>
</div>
@@ -126,18 +133,34 @@
<div class="setbox">
<div class="timerbox">
<span>开始前</span>
<a-input
style="width: 88px; height: 32px"
<a-input-number
:min="0"
:max="30"
:precision="0"
style="
width: 88px;
height: 32px;
border-radius: 8px;
overflow: hidden;
"
:v-model:value="inputV4"
></a-input>
/>
<span style="color: #999999; margin-left: 8px">分钟</span>
</div>
<div class="timerbox">
<span>开始后</span>
<a-input
style="width: 88px; height: 32px"
<a-input-number
:min="0"
:max="30"
:precision="0"
style="
width: 88px;
height: 32px;
border-radius: 8px;
overflow: hidden;
"
:v-model:value="inputV5"
></a-input>
/>
<span style="color: #999999; margin-left: 8px">分钟</span>
</div>
</div>
@@ -147,10 +170,18 @@
<div class="setbox">
<div class="timerbox">
<span>结束前</span>
<a-input
style="width: 88px; height: 32px"
<a-input-number
:min="0"
:max="30"
:precision="0"
style="
width: 88px;
height: 32px;
border-radius: 8px;
overflow: hidden;
"
:v-model:value="inputV6"
></a-input>
/>
<span style="color: #999999; margin-left: 8px"
>分钟提前签退则记为早退</span
>
@@ -164,9 +195,11 @@
</div>
<div class="btnbox">
<a-radio-group v-model:value="radioV1">
<a-radio v-model:checked="checked" :value="1" @click="cloradio1">仅签到</a-radio>
<a-radio v-model:checked="checked" :value="1" @click="cloradio1"
>仅签到</a-radio
>
<a-radio v-model:checked="checked" :value="2" @click="cloradio1"
>签到签退全部完成</a-radio
>签到签退全部完成</a-radio
>
</a-radio-group>
</div>
@@ -231,7 +264,7 @@ export default {
if (value != "") {
state.radioV1 = "";
}
}
};
return {
...toRefs(state),
afterVisibleChange,

View File

@@ -151,18 +151,20 @@
<div class="setbox">
<div class="timerbox">
<span>开始前</span>
<a-input
style="width: 88px; height: 32px"
<a-input-number
:min="0" :max="30" :precision="0"
style="width: 88px; height: 32px;border-radius: 8px;overflow: hidden;"
:v-model:value="inputV5"
></a-input>
></a-input-number>
<span style="color: #999999; margin-left: 8px">分钟</span>
</div>
<div class="timerbox">
<span>开始后</span>
<a-input
style="width: 88px; height: 32px"
<a-input-number
:min="0" :max="30" :precision="0"
style="width: 88px; height: 32px;border-radius: 8px;overflow: hidden;"
:v-model:value="inputV6"
></a-input>
></a-input-number>
<span style="color: #999999; margin-left: 8px">分钟</span>
</div>
</div>
@@ -172,10 +174,11 @@
<div class="setbox">
<div class="timerbox">
<span>结束前</span>
<a-input
style="width: 88px; height: 32px"
<a-input-number
:min="0" :max="30" :precision="0"
style="width: 88px; height: 32px;border-radius: 8px;overflow: hidden;"
:v-model:value="inputV7"
></a-input>
></a-input-number>
<span style="color: #999999; margin-left: 8px"
>分钟提前签退则记为早退</span
>

View File

@@ -194,18 +194,20 @@
<div class="setbox">
<div class="timerbox">
<span>开始前</span>
<a-input
style="width: 88px; height: 32px"
<a-input-number
:min="0" :max="30" :precision="0"
style="width: 88px; height: 32px;border-radius: 8px;overflow: hidden;"
:v-model:value="inputV6"
></a-input>
></a-input-number>
<span style="color: #999999; margin-left: 8px">分钟</span>
</div>
<div class="timerbox">
<span>开始后</span>
<a-input
style="width: 88px; height: 32px"
<a-input-number
:min="0" :max="30" :precision="0"
style="width: 88px; height: 32px;border-radius: 8px;overflow: hidden;"
:v-model:value="inputV7"
></a-input>
></a-input-number>
<span style="color: #999999; margin-left: 8px">分钟</span>
</div>
</div>
@@ -215,10 +217,11 @@
<div class="setbox">
<div class="timerbox">
<span>结束前</span>
<a-input
style="width: 88px; height: 32px"
<a-input-number
:min="0" :max="30" :precision="0"
style="width: 88px; height: 32px;border-radius: 8px;overflow: hidden;"
:v-model:value="inputV8"
></a-input>
></a-input-number>
<span style="color: #999999; margin-left: 8px"
>分钟提前签退则记为早退</span
>

View File

@@ -118,9 +118,10 @@
</div>
<div class="btnbox">
<span style="margin-right: 8px">允许重复考试</span>
<a-input
<a-input-number
:min="-1" :precision="0"
v-model:value="inputV3"
style="width: 88px; height: 32px"
style="width: 88px; height: 32px;border-radius: 8px;overflow: hidden;"
/>
<span style="margin-left: 8px"></span>
<span style="margin-left: 24px; color: #999999"
@@ -177,7 +178,7 @@
</div>
<div class="btnbox">
<a-input
v-model:value="value2"
v-model:value="inputV4"
style="width: 88px; height: 32px"
/>
<span style="margin-left: 8px"></span>
@@ -237,6 +238,7 @@ export default {
inputV1: "",
inputV2: "",
inputV3: "",
inputV4: "60",
testV1: "",
radioV1: "",
radioV2: "",

View File

@@ -221,10 +221,12 @@
color: #333333;
line-height: 25px;
margin-left: 24px;
background-color: #ffffff;
}
}
.contentMain {
margin-top: 32px;
padding-right: 20px;
.main_items {
display: flex;
justify-content: space-between;