diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue index 687e6711..c07d534b 100644 --- a/src/components/drawers/ActiveAttendance.vue +++ b/src/components/drawers/ActiveAttendance.vue @@ -15,7 +15,7 @@ @click="closeDrawer" /> -
+
起止时间:2022-07-21 14:00 ~ 2022-7-30 14:00 @@ -137,12 +137,10 @@ />
-->
-
- -
-
- - +
+ + +
@@ -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; + // } } } } diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue index 91e33ba6..5a0b5940 100644 --- a/src/components/drawers/AddActive.vue +++ b/src/components/drawers/AddActive.vue @@ -90,9 +90,16 @@ 活动时长:
- 分钟
@@ -126,18 +133,34 @@
开始前: - + /> 分钟
开始后: - + /> 分钟
@@ -147,10 +170,18 @@
结束前: - + /> 分钟(提前签退则记为早退) @@ -164,9 +195,11 @@
- 仅签到 + 仅签到 签到、签退全部完成签到、签退全部完成
@@ -231,7 +264,7 @@ export default { if (value != "") { state.radioV1 = ""; } - } + }; return { ...toRefs(state), afterVisibleChange, diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index b3017ce9..412dfb7a 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -151,18 +151,20 @@
开始前: - + > 分钟
开始后: - + > 分钟
@@ -172,10 +174,11 @@
结束前: - + > 分钟(提前签退则记为早退) diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index 8da74f75..bd7b3dab 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -194,18 +194,20 @@
开始前: - + > 分钟
开始后: - + > 分钟
@@ -215,10 +217,11 @@
结束前: - + > 分钟(提前签退则记为早退) diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index baa65f45..88b9afc6 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -118,9 +118,10 @@
允许重复考试 -
@@ -237,6 +238,7 @@ export default { inputV1: "", inputV2: "", inputV3: "", + inputV4: "60", testV1: "", radioV1: "", radioV2: "", diff --git a/src/components/drawers/CorPowerlist.vue b/src/components/drawers/CorPowerlist.vue index 081eadc5..4a334e1f 100644 --- a/src/components/drawers/CorPowerlist.vue +++ b/src/components/drawers/CorPowerlist.vue @@ -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; diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 8bdff2ff..d4602bed 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -1053,7 +1053,7 @@
@@ -1692,12 +1692,27 @@ style="margin-top: 400px" @cancel="delete_exit" > -
+
-
-
+
+ +
+
+ +
提示
@@ -2407,7 +2422,7 @@ export default defineComponent({ agreestudy_hs: false, rejectstudy_hs: false, delete_hs: false, - del_hs:false, + del_hs: false, copy_hs: false, nouse_hs: false, // 二维码标题状态 @@ -2920,7 +2935,7 @@ export default defineComponent({
{ state.delete_hs = true; - state.del_hs = true; + state.del_hs = true; }} > 删除 @@ -2998,11 +3013,15 @@ export default defineComponent({ {value.status === "已拒绝" ? (
-
{ +
{ state.delete_hs = true; state.del_hs = true; - }}>删除
+ }} + > + 删除 +
) : ( @@ -3414,7 +3433,7 @@ export default defineComponent({ } } .tableSelect { - margin-right: 10px; + // margin-right: 10px; margin-left: -5px; display: flex; align-items: center; @@ -4759,7 +4778,7 @@ export default defineComponent({ display: flex; justify-content: center; text-align: center; - margin:77px auto 109px auto; + margin: 77px auto 109px auto; cursor: pointer; position: relative; .smallleft { @@ -4835,7 +4854,7 @@ export default defineComponent({ } } .tableSelect { - margin-right: 10px; + // margin-right: 10px; margin-left: -5px; display: flex; align-items: center; @@ -5197,16 +5216,16 @@ export default defineComponent({ padding-left: 26px; font-size: 16px; .del-icon { - width: 16px; - height: 16px; - position: relative; - margin-right: 10px; - img{ + width: 16px; + height: 16px; + position: relative; + margin-right: 10px; + img { width: 100%; height: 100%; position: absolute; - top:0px; - left:0px; + top: 0px; + left: 0px; background-size: 100% 100%; } } diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index c43cc039..ef360373 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -1,5 +1,5 @@