feat:合并

This commit is contained in:
songwc
2022-10-19 08:47:07 +08:00
parent 15283f998f
commit c6f5dcb575

View File

@@ -56,9 +56,7 @@
<div class="second">
<div
class="taskbox"
style="
background: linear-gradient(180deg,#FEF3DD,#FFFAF0);
"
style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
>
<div class="leftt">
<img src="../../assets/images/taskpage/left1.png" />
@@ -77,7 +75,11 @@
<div
class="taskbox"
style="
background: linear-gradient(180deg,rgba(221, 234, 255, 1),rgba(240, 248, 254, 1));
background: linear-gradient(
180deg,
rgba(221, 234, 255, 1),
rgba(240, 248, 254, 1)
);
"
>
<div class="leftt">
@@ -98,7 +100,11 @@
class="taskbox"
@click="showModal"
style="
background: linear-gradient(180deg,rgba(229, 246, 236, 1) ,rgba(238, 249, 243, 1));
background: linear-gradient(
180deg,
rgba(229, 246, 236, 1),
rgba(238, 249, 243, 1)
);
"
>
<div class="leftt">
@@ -333,7 +339,9 @@
</div>
</div>
<div class="operations">
<div class="operation">学员</div>
<div class="operation" style="cursor: pointer" @click="showFS">
学员
</div>
<div class="operation" style="cursor: pointer" @click="showFace">
管理
</div>
@@ -370,7 +378,9 @@
</div>
</div>
<div class="operations">
<div class="operation">考勤</div>
<div class="operation" style="cursor: pointer" @click="showAA">
考勤
</div>
<div class="operation">管理</div>
<div class="operation">二维码</div>
</div>
@@ -405,7 +415,9 @@
</div>
</div>
<div class="operations">
<div class="operation">管理</div>
<div class="operation" style="cursor: pointer" @click="showWork">
管理
</div>
</div>
</div>
<div class="course">
@@ -456,21 +468,58 @@
<a-tab-pane key="8" tab="学员管理">
<div class="group">
<div class="groupleft">
<div style="display: flex;align-items: center;margin-right: 10px;margin-bottom: 10px">
<div
style="
display: flex;
align-items: center;
margin-right: 10px;
margin-bottom: 10px;
"
>
<div class="groupname" style="width: 42px">姓名</div>
<a-input v-model:value="value" placeholder="请输入姓名" />
</div>
<div style="display: flex;align-items: center;margin-right: 10px;margin-bottom: 10px">
<div
style="
display: flex;
align-items: center;
margin-right: 10px;
margin-bottom: 10px;
"
>
<div class="groupname">小组名称</div>
<a-input v-model:value="value" placeholder="请输入小组名称" />
<a-input
v-model:value="value"
placeholder="请输入小组名称"
/>
</div>
<div style="display: flex;align-items: center;margin-right: 10px;margin-bottom: 10px">
<div
style="
display: flex;
align-items: center;
margin-right: 10px;
margin-bottom: 10px;
"
>
<div class="groupname" style="width: 42px">部门</div>
<a-select v-model:value="value" placeholder="请选择部门" />
<a-select
v-model:value="value"
placeholder="请选择部门"
/>
</div>
<div style="display: flex;align-items: center;margin-bottom: 10px">
<div
style="
display: flex;
align-items: center;
margin-bottom: 10px;
"
>
<div class="groupname" style="width: 42px">学员</div>
<a-select v-model:value="value" placeholder="是否为优秀学员" :options="goodstuList"/>
<a-select
v-model:value="value"
placeholder="是否为优秀学员"
:options="goodstuList"
/>
</div>
</div>
<div class="groupright">
@@ -545,7 +594,10 @@
<div class="group">
<div class="groupleft">
<div class="groupname">小组名称</div>
<a-input v-model:value="value" placeholder="请输入小组名称" />
<a-input
v-model:value="value"
placeholder="请输入小组名称"
/>
</div>
<div class="groupright">
<div class="btn1">
@@ -574,7 +626,10 @@
<div class="grouptitle">
<div class="goodgruop">好好学习小组</div>
<div class="more">
<span style="color: rgba(0, 0, 0, 0.4500); cursor: pointer">. . .</span>
<span
style="color: rgba(0, 0, 0, 0.45); cursor: pointer"
>. . .</span
>
<div class="moreItems">
<div class="sammo">编辑</div>
<div class="sammo">删除</div>
@@ -589,10 +644,26 @@
<div class="grofooter">
<div class="ftext">组员名单 ></div>
<div class="peoples">
<div class="people1"><img src="../../assets/images/taskpage/people1.png"/></div>
<div class="people2"><img src="../../assets/images/taskpage/people2.png"/></div>
<div class="people3"><img src="../../assets/images/taskpage/people3.png"/></div>
<div class="people4"><img src="../../assets/images/taskpage/people4.png"/></div>
<div class="people1">
<img
src="../../assets/images/taskpage/people1.png"
/>
</div>
<div class="people2">
<img
src="../../assets/images/taskpage/people2.png"
/>
</div>
<div class="people3">
<img
src="../../assets/images/taskpage/people3.png"
/>
</div>
<div class="people4">
<img
src="../../assets/images/taskpage/people4.png"
/>
</div>
</div>
</div>
</div>
@@ -602,7 +673,10 @@
<div class="grouptitle">
<div class="goodgruop">全能小组</div>
<div class="more">
<span style="color: rgba(0, 0, 0, 0.4500); cursor: pointer">. . .</span>
<span
style="color: rgba(0, 0, 0, 0.45); cursor: pointer"
>. . .</span
>
<div class="moreItems">
<div class="sammo">编辑</div>
<div class="sammo">删除</div>
@@ -617,10 +691,26 @@
<div class="grofooter">
<div class="ftext">组员名单 ></div>
<div class="peoples">
<div class="people1"><img src="../../assets/images/taskpage/people1.png"/></div>
<div class="people2"><img src="../../assets/images/taskpage/people2.png"/></div>
<div class="people3"><img src="../../assets/images/taskpage/people3.png"/></div>
<div class="people4"><img src="../../assets/images/taskpage/people4.png"/></div>
<div class="people1">
<img
src="../../assets/images/taskpage/people1.png"
/>
</div>
<div class="people2">
<img
src="../../assets/images/taskpage/people2.png"
/>
</div>
<div class="people3">
<img
src="../../assets/images/taskpage/people3.png"
/>
</div>
<div class="people4">
<img
src="../../assets/images/taskpage/people4.png"
/>
</div>
</div>
</div>
</div>
@@ -630,7 +720,10 @@
<div class="grouptitle">
<div class="goodgruop">宇宙第一最强小组</div>
<div class="more">
<span style="color: rgba(0, 0, 0, 0.4500); cursor: pointer">. . .</span>
<span
style="color: rgba(0, 0, 0, 0.45); cursor: pointer"
>. . .</span
>
<div class="moreItems">
<div class="sammo">编辑</div>
<div class="sammo">删除</div>
@@ -645,10 +738,26 @@
<div class="grofooter">
<div class="ftext">组员名单 ></div>
<div class="peoples">
<div class="people1"><img src="../../assets/images/taskpage/people1.png"/></div>
<div class="people2"><img src="../../assets/images/taskpage/people2.png"/></div>
<div class="people3"><img src="../../assets/images/taskpage/people3.png"/></div>
<div class="people4"><img src="../../assets/images/taskpage/people4.png"/></div>
<div class="people1">
<img
src="../../assets/images/taskpage/people1.png"
/>
</div>
<div class="people2">
<img
src="../../assets/images/taskpage/people2.png"
/>
</div>
<div class="people3">
<img
src="../../assets/images/taskpage/people3.png"
/>
</div>
<div class="people4">
<img
src="../../assets/images/taskpage/people4.png"
/>
</div>
</div>
</div>
</div>
@@ -658,7 +767,10 @@
<div class="grouptitle">
<div class="goodgruop">天天向上小组</div>
<div class="more">
<span style="color: rgba(0, 0, 0, 0.4500); cursor: pointer">. . .</span>
<span
style="color: rgba(0, 0, 0, 0.45); cursor: pointer"
>. . .</span
>
<div class="moreItems">
<div class="sammo">编辑</div>
<div class="sammo">删除</div>
@@ -673,10 +785,26 @@
<div class="grofooter">
<div class="ftext">组员名单 ></div>
<div class="peoples">
<div class="people1"><img src="../../assets/images/taskpage/people1.png"/></div>
<div class="people2"><img src="../../assets/images/taskpage/people2.png"/></div>
<div class="people3"><img src="../../assets/images/taskpage/people3.png"/></div>
<div class="people4"><img src="../../assets/images/taskpage/people4.png"/></div>
<div class="people1">
<img
src="../../assets/images/taskpage/people1.png"
/>
</div>
<div class="people2">
<img
src="../../assets/images/taskpage/people2.png"
/>
</div>
<div class="people3">
<img
src="../../assets/images/taskpage/people3.png"
/>
</div>
<div class="people4">
<img
src="../../assets/images/taskpage/people4.png"
/>
</div>
</div>
</div>
</div>
@@ -698,6 +826,12 @@
<face-manage v-model:Fvisible="FaceVisivle" />
<!-- 学员小组管理创建小组抽屉 -->
<subset-manage v-model:Svisible="subsetVisivle" />
<!-- 面授学员抽屉 -->
<face-stu v-model:FSvisible="FSvisible" />
<!-- 活动考勤抽屉 -->
<active-attendance v-model:AAvisible="AAvisible" />
<!-- 作业管理抽屉 -->
<work-manage v-model:Wvisible="Wvisible" />
<!-- 概览无数据-项目发布弹窗 -->
<div>
<a-modal
@@ -718,7 +852,11 @@
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%);
background: linear-gradient(
0deg,
rgba(78, 166, 255, 0) 0%,
rgba(78, 166, 255, 0.2) 100%
);
"
>
<div class="headerLeft" style="margin-left: 32px">
@@ -786,8 +924,20 @@
width="624px"
height="332px"
>
<div class="modalHeader"
style="width: 100%;height: 68px;display: flex;align-items: center;justify-content: space-between;background:linear-gradient(0deg,rgba(78, 166, 255, 0) 0%,rgba(78, 166, 255, 0.2000) 100%)"
<div
class="modalHeader"
style="
width: 100%;
height: 68px;
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">
<span class="headerLeftText" style="font-size: 16px">创建小组</span>
@@ -847,9 +997,19 @@ import { reactive, toRefs } from "vue";
import TimeManage from "../../components/drawers/TimeManage";
import FaceManage from "../../components/drawers/FaceManage";
import SubsetManage from "../../components/drawers/SubsetManage";
import ActiveAttendance from "../../components/drawers/ActiveAttendance";
import WorkManage from "../../components/drawers/WorkManage.vue";
import FaceStu from "../../components/drawers/FaceStu";
export default {
name: "taskPage",
components: { TimeManage, FaceManage, SubsetManage },
components: {
TimeManage,
FaceManage,
SubsetManage,
FaceStu,
ActiveAttendance,
WorkManage,
},
setup() {
const state = reactive({
goodstuList: [
@@ -996,13 +1156,16 @@ export default {
visible: false, //时间管理
FaceVisivle: false, //面授管理
subsetVisivle: false, //随机小组
FSvisible: false, //面授学员
AAvisible: false, //活动考勤
Wvisible: false, //作业管理
pubproject: false,
stugroup: false,
checked: false,
checked1: true,
checked2: false,
activeKey: '3',
activeKey1: '8',
activeKey: "3",
activeKey1: "8",
});
const showModal = () => {
state.pubproject = true;
@@ -1032,6 +1195,18 @@ export default {
// console.log("点击管理");
state.subsetVisivle = true;
};
//面授学员的弹窗
const showFS = () => {
state.FSvisible = true;
};
//活动考勤的抽屉
const showAA = () => {
state.AAvisible = true;
};
//作业管理的抽屉
const showWork = () => {
state.Wvisible = true;
};
return {
...toRefs(state),
showModal,
@@ -1041,6 +1216,9 @@ export default {
showTime,
showFace,
showSubset,
showFS,
showAA,
showWork,
};
},
};
@@ -1221,7 +1399,6 @@ export default {
}
}
}
}
.pubtn {
display: flex;
@@ -1233,25 +1410,25 @@ export default {
height: 40px;
margin-right: 16px;
margin-bottom: 29px;
border: 1px solid #409EFF;
border: 1px solid #409eff;
border-radius: 4px;
color: rgba(78, 166, 255, 1);
font-size: 14px;
//line-height: 36px;
align-items: center;
background: rgba(255, 255, 255, 1)
background: rgba(255, 255, 255, 1);
}
.pubtn2 {
width: 100px;
height: 40px;
margin-bottom: 29px;
border: 1px solid #409EFF;
border: 1px solid #409eff;
border-radius: 4px;
color: #FFFFFF;
color: #ffffff;
font-size: 14px;
align-items: center;
//line-height: 36px;
background: #409EFF;
background: #409eff;
}
}
}
@@ -1804,12 +1981,12 @@ export default {
align-items: center;
justify-content: center;
margin-right: 16px;
border: 1px solid #409EFF;
border: 1px solid #409eff;
border-radius: 8px;
background: #409EFF;
background: #409eff;
cursor: pointer;
.btn1text {
color: #FFFFFF;
color: #ffffff;
margin-left: 5px;
font-size: 14px;
}
@@ -1821,12 +1998,12 @@ export default {
align-items: center;
justify-content: center;
margin-right: 32px;
border: 1px solid #409EFF;
border: 1px solid #409eff;
border-radius: 8px;
cursor: pointer;
background: #FFFFFF;
background: #ffffff;
.btn2text {
color: #409EFF;
color: #409eff;
margin-left: 5px;
font-size: 14px;
}
@@ -1909,7 +2086,7 @@ export default {
.clear {
cursor: pointer;
font-size: 14px;
color: #387DF7;
color: #387df7;
line-height: 24px;
position: absolute;
right: 20px;
@@ -1918,11 +2095,11 @@ export default {
.tab {
.ant-table-thead > tr > th {
background-color: rgba(239, 244, 252, 1);
color: rgba(0, 0, 0, 0.8500);
color: rgba(0, 0, 0, 0.85);
}
.ant-table-tbody > tr > td {
border-bottom: 1px solid #F0F6FC;
color: rgba(0, 0, 0, 0.6500);
border-bottom: 1px solid #f0f6fc;
color: rgba(0, 0, 0, 0.65);
}
th.h {
background-color: #eff4fc !important;
@@ -1954,8 +2131,8 @@ export default {
height: 181px;
display: flex;
justify-content: center;
border: 1px solid #E9E9E9;
box-shadow: 1px 1px 18px 1px rgba(0, 0, 0, 0.0500);
border: 1px solid #e9e9e9;
box-shadow: 1px 1px 18px 1px rgba(0, 0, 0, 0.05);
margin-top: 16px;
margin-right: 20px;
.grouptitle {
@@ -1964,7 +2141,7 @@ export default {
margin-top: 5px;
border-bottom: 1px solid rgba(232, 232, 232, 1);
.goodgruop {
color: rgba(0, 0, 0, 0.8500);
color: rgba(0, 0, 0, 0.85);
font-size: 16px;
line-height: 36px;
font-weight: 600;