feat:合并

This commit is contained in:
李晓鸽
2022-10-21 17:00:49 +08:00
18 changed files with 2185 additions and 276 deletions

View File

@@ -424,9 +424,9 @@
</div>
</div>
<div class="operations">
<div class="operation">考勤</div>
<div class="operation">管理</div>
<div class="operation">二维码</div>
<div class="operation" style="cursor: pointer">考勤</div>
<div class="operation" style="cursor: pointer">管理</div>
<div class="operation" style="cursor:pointer">二维码</div>
</div>
</div>
<div class="course">
@@ -465,7 +465,7 @@
<div class="operation" style="cursor: pointer" @click="showFace">
管理
</div>
<div class="operation">二维码</div>
<div class="operation" style="cursor:pointer">二维码</div>
</div>
</div>
<div class="course">
@@ -501,8 +501,8 @@
<div class="operation" style="cursor: pointer" @click="showAA">
考勤
</div>
<div class="operation">管理</div>
<div class="operation">二维码</div>
<div class="operation" style="cursor: pointer">管理</div>
<div class="operation" style="cursor:pointer">二维码</div>
</div>
</div>
<div class="course">
@@ -1179,6 +1179,8 @@
<import-stu v-model:Importvisible="Importvisible" />
<!-- 查看学员 -->
<see-stu v-model:Seevisible="Seevisible" />
<!-- 学员换组 -->
<change-group v-model:Changevisible="Changevisible" />
<!-- 组员名单抽屉 -->
<member-list v-model:Lvisible="Lvisible" />
<!-- 面授学员抽屉 -->
@@ -1285,11 +1287,6 @@
display: flex;
align-items: center;
justify-content: space-between;
background: linear-gradient(
0deg,
rgba(78, 166, 255, 0) 0%,
rgba(78, 166, 255, 0.2) 100%
);
"
>
<div class="headerLeft" style="margin-left: 32px">
@@ -1343,6 +1340,38 @@
</a-modal>
</div>
<!-- 学员-创建小组弹窗 -->
<!-- 取消学员弹窗 -->
<div>
<a-modal
v-model:visible="canclestu"
:footer="null"
:closable="close"
wrapClassName="canclestu"
centered="true"
>
<div class="delete">
<div class="del_header"></div>
<div class="del_main">
<div class="header">
<div class="icon"></div>
<span>提示</span>
</div>
<div class="body">
<span>您是否授予此学员优秀学员称号</span>
</div>
<div class="del_btnbox">
<div class="del_btn btn1">
<div class="btnText" @click="closeModal1">取消</div>
</div>
<div class="del_btn btn2">
<div class="btnText" @click="closeModal1">确定</div>
</div>
</div>
</div>
</div>
</a-modal>
</div>
<!-- 取消学员弹窗 -->
</div>
</template>
<script>
@@ -1359,6 +1388,7 @@ import TestManage from "../../components/drawers/TestManage";
import StuAdd from "../../components/drawers/StuAdd";
import ImportStu from "../../components/drawers/ImportStu";
import SeeStu from "../../components/drawers/SeeStu";
import ChangeGroup from "../../components/drawers/ChangeGroup";
export default {
name: "taskPage",
components: {
@@ -1374,6 +1404,7 @@ export default {
StuAdd,
ImportStu,
SeeStu,
ChangeGroup,
},
setup() {
const state = reactive({
@@ -1541,8 +1572,10 @@ export default {
Stuvisible: false, //添加学员
Importvisible: false, //导入学员
Seevisible: false, //查看学员
Changevisible: false, //学员换组
pubproject: false,
stugroup: false,
canclestu: false,
checked: false,
checked1: true,
checked2: false,
@@ -2006,6 +2039,12 @@ export default {
const closeModal = () => {
state.pubproject = false;
};
const showModal1 = () => {
state.canclestu = true;
};
const closeModal1 = () => {
state.canclestu = false;
};
const showModal2 = () => {
state.stugroup = true;
};
@@ -2057,6 +2096,9 @@ export default {
const showImportStu = () => {
state.Importvisible = true;
};
const showChangeGroup = () => {
state.Changevisible = true;
};
const changecheck2 = () => {
state.checkedd = !state.checkedd;
};
@@ -2067,6 +2109,8 @@ export default {
...toRefs(state),
showModal,
closeModal,
showModal1,
closeModal1,
showModal2,
closeModal2,
showTime,
@@ -2082,6 +2126,7 @@ export default {
showStuAdd,
showImportStu,
showSeeStu,
showChangeGroup,
};
},
};
@@ -2236,9 +2281,132 @@ export default {
}
}
}
.canclestu {
.ant-modal {
width: 424px !important;
height: 258px !important;
.ant-modal-content {
width: 424px !important;
height: 258px !important;
.ant-modal-close {
margin-right: 18px;
margin-top: 5px;
}
.ant-modal-body {
width: 424px !important;
height: 258px !important;
padding: 0 !important;
.delete {
z-index: 999;
width: 424px;
height: 258px;
background: #ffffff;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
border-radius: 4px;
// position: absolute;
// left: 50%;
// top: 10%;
// transform: translate(-50%, -50%);
.del_header {
position: absolute;
width: calc(100%);
height: 68px;
background: linear-gradient(
rgba(78, 166, 255, 0.2) 0%,
rgba(78, 166, 255, 0) 100%
);
}
.del_main {
width: 100%;
position: relative;
.header {
display: flex;
align-items: center;
padding-top: 20px;
padding-left: 26px;
font-size: 16px;
.icon {
width: 16px;
height: 16px;
margin-right: 10px;
background-image: url(@/assets/images/coursewareManage/notice.png);
background-size: 100% 100%;
}
.close_exit {
position: absolute;
right: 42px;
cursor: pointer;
width: 20px;
height: 20px;
background-image: url(@/assets/images/coursewareManage/close.png);
background-size: 100% 100%;
}
}
.body {
width: 100%;
margin: 34px auto 56px auto;
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
// background-color: red;
position: relative;
.back {
position: absolute;
top: 30px;
font-size: 12px;
font-weight: 400;
color: #666666;
}
}
.del_btnbox {
display: flex;
margin: 30px auto;
justify-content: center;
.del_btn {
width: 100px;
height: 40px;
background: rgba(64, 158, 255, 0);
border-radius: 8px;
display: flex;
align-items: center;
justify-content: center;
flex-shrink: 0;
cursor: pointer;
.btnText {
font-size: 14px;
font-weight: 400;
line-height: 40px;
}
}
.btn1 {
border: 1px solid rgba(64, 158, 255, 1);
color: #4ea6ff;
margin-right: 14px;
}
.btn2 {
background-color: #4ea6ff;
color: #ffffff;
}
}
}
}
}
}
}
}
.doublepro {
.ant-modal {
.ant-modal-body {
.modalHeader {
background: linear-gradient(
0deg,
rgba(78, 166, 255, 0) 0%,
rgba(78, 166, 255, 0.2) 100%
);
}
padding: 0;
.modalMain {
display: flex;