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