Merge branch 'master' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage

This commit is contained in:
zhangyc
2022-10-19 17:31:19 +08:00
12 changed files with 3137 additions and 358 deletions

View File

@@ -75,11 +75,7 @@
<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">
@@ -100,11 +96,7 @@
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">
@@ -641,7 +633,7 @@
<div class="leader1">进度</div>
<a-progress :percent="55" />
</div>
<div class="grofooter">
<div class="grofooter" @click="showMemberList">
<div class="ftext">组员名单 ></div>
<div class="peoples">
<div class="people1">
@@ -688,7 +680,7 @@
<div class="leader1">进度</div>
<a-progress :percent="55" />
</div>
<div class="grofooter">
<div class="grofooter" @click="showMemberList">
<div class="ftext">组员名单 ></div>
<div class="peoples">
<div class="people1">
@@ -735,7 +727,7 @@
<div class="leader1">进度</div>
<a-progress :percent="55" />
</div>
<div class="grofooter">
<div class="grofooter" @click="showMemberList">
<div class="ftext">组员名单 ></div>
<div class="peoples">
<div class="people1">
@@ -782,7 +774,7 @@
<div class="leader1">进度</div>
<a-progress :percent="55" />
</div>
<div class="grofooter">
<div class="grofooter" @click="showMemberList">
<div class="ftext">组员名单 ></div>
<div class="peoples">
<div class="people1">
@@ -838,6 +830,8 @@
<face-manage v-model:Fvisible="FaceVisivle" />
<!-- 学员小组管理创建小组抽屉 -->
<subset-manage v-model:Svisible="subsetVisivle" />
<!-- 组员名单抽屉 -->
<member-list v-model:Lvisible="Lvisible" />
<!-- 面授学员抽屉 -->
<face-stu v-model:FSvisible="FSvisible" />
<!-- 活动考勤抽屉 -->
@@ -864,11 +858,7 @@
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">
@@ -944,11 +934,7 @@
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">
@@ -1009,6 +995,7 @@ import { reactive, toRefs } from "vue";
import TimeManage from "../../components/drawers/TimeManage";
import FaceManage from "../../components/drawers/FaceManage";
import SubsetManage from "../../components/drawers/SubsetManage";
import MemberList from "../../components/drawers/MemberList";
import ActiveAttendance from "../../components/drawers/ActiveAttendance";
import WorkManage from "../../components/drawers/WorkManage.vue";
import FaceStu from "../../components/drawers/FaceStu";
@@ -1018,6 +1005,7 @@ export default {
TimeManage,
FaceManage,
SubsetManage,
MemberList,
FaceStu,
ActiveAttendance,
WorkManage,
@@ -1168,6 +1156,7 @@ export default {
visible: false, //时间管理
FaceVisivle: false, //面授管理
subsetVisivle: false, //随机小组
Lvisible: false, //组员名单
FSvisible: false, //面授学员
AAvisible: false, //活动考勤
Wvisible: false, //作业管理
@@ -1213,6 +1202,10 @@ export default {
const showFS = () => {
state.FSvisible = true;
};
//面授学员的弹窗
const showMemberList = () => {
state.Lvisible = true;
};
//活动考勤的抽屉
const showAA = () => {
state.AAvisible = true;
@@ -1232,6 +1225,7 @@ export default {
showTime,
showFace,
showSubset,
showMemberList,
showFS,
showAA,
showWork,