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

This commit is contained in:
dongwug
2022-10-18 11:36:44 +08:00

View File

@@ -462,54 +462,68 @@
<div style="display: flex; height: 20px"></div> <div style="display: flex; height: 20px"></div>
</a-tab-pane> </a-tab-pane>
<a-tab-pane key="3" tab="学员"> <a-tab-pane key="3" tab="学员">
<div class="split"></div> <div class="split"></div>
<div class="content3"> <div class="content3">
<a-tabs v-model:activeKey="activeKey1"> <a-tabs v-model:activeKey="activeKey1">
<a-tab-pane key="8" tab="学员管理">学员管理</a-tab-pane> <a-tab-pane key="8" tab="学员管理">学员管理</a-tab-pane>
<a-tab-pane key="9" tab="小组管理" force-render> <a-tab-pane key="9" tab="小组管理" force-render>
<div class="group"> <div class="group">
<div class="groupleft"> <div class="groupleft">
<div class="groupname">小组名称</div> <div class="groupname">小组名称</div>
<a-input <a-input v-model:value="value" placeholder="请输入小组名称" />
v-model:value="value" </div>
placeholder="请输入小组名称" <div class="groupright">
/> <div class="btn1">
</div> <img src="../../assets/images/courseManage/add0.png"/>
<div class="groupright"> <span class="btn1text">搜索</span>
<div class="btn1"> </div>
<img src="../../assets/images/courseManage/add0.png" /> <div class="btn2">
<span class="btn1text">搜索</span> <img src="../../assets/images/courseManage/reset1.png"/>
</div> <span class="btn2text">重置</span>
<div class="btn2"> </div>
<img src="../../assets/images/courseManage/reset1.png" /> </div>
<span class="btn2text">重置</span> </div>
</div> <div class="second2">
</div> <div class="btn1" @click="showModal2">
<img src="../../assets/images/courseManage/search0.png"/>
<span class="btn1text">创建小组</span>
</div>
<div class="btn2">
<img src="../../assets/images/courseManage/reset1.png"/>
<span class="btn2text">随机分组</span>
</div>
</div>
<div class="groupmain">
<div class="groupbox">
<div style="width: 90%">
<div class="grouptitle">
<div class="goodgruop">好好学习小组</div>
<div class="more">
<span style="color: rgba(0, 0, 0, 0.4500); cursor: pointer">. . .</span>
<div class="moreItems">
<div class="sammo">编辑</div>
<div class="sammo">删除</div>
</div>
</div>
</div>
<div class="leader">组长小李</div>
<div class="grocenter">
<div class="leader1">进度</div>
<a-progress :percent="55" />
</div>
<div class="grofooter">
<div class="ftext">组员名单 ></div>
<div></div>
</div>
</div>
</div>
<div class="groupbox">
</div>
</div>
</a-tab-pane>
</a-tabs>
</div> </div>
<div class="second2">
<div class="btn1">
<img src="../../assets/images/courseManage/search0.png" />
<span class="btn1text">创建小组</span>
</div>
<div class="btn2">
<img src="../../assets/images/courseManage/reset1.png" />
<span class="btn2text">随机分组</span>
</div>
</div>
<div class="groupmain">
<div class="groupbox">
<div style="width: 90%">
<div class="grouptitle">
<div class="goodgruop">好好学习小组</div>
<div>...</div>
</div>
</div>
</div>
<div class="groupbox"></div>
</div>
</a-tab-pane>
</a-tabs>
</div>
</a-tab-pane> </a-tab-pane>
<a-tab-pane key="4" tab="公告">Content of Tab Pane 3</a-tab-pane> <a-tab-pane key="4" tab="公告">Content of Tab Pane 3</a-tab-pane>
<a-tab-pane key="5" tab="项目积分">Content of Tab Pane 3</a-tab-pane> <a-tab-pane key="5" tab="项目积分">Content of Tab Pane 3</a-tab-pane>
@@ -521,7 +535,7 @@
<time-manage v-model:Tvisible="visible" /> <time-manage v-model:Tvisible="visible" />
<!-- 面授管理抽屉 --> <!-- 面授管理抽屉 -->
<face-manage v-model:Fvisible="FaceVisivle" /> <face-manage v-model:Fvisible="FaceVisivle" />
<!-- 项目发布弹窗 --> <!-- 概览无数据-项目发布弹窗 -->
<div> <div>
<a-modal <a-modal
v-model:visible="pubproject" v-model:visible="pubproject"
@@ -600,34 +614,139 @@
</div> </div>
</a-modal> </a-modal>
</div> </div>
<!-- 项目发布弹窗 --> <!-- 概览无数据-项目发布弹窗 -->
</div> <!-- 学员-创建小组弹窗 -->
<div>
<a-modal
v-model:visible="stugroup"
:title="null"
@ok="closeModal2"
:footer="null"
:closable="false"
wrapClassName="doublepro"
width="624px"
height="476px"
>
<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="headerLeft" style="margin-left: 32px">
<span class="headerLeftText" style="font-size: 16px">创建多层项目</span>
</div>
<div style="cursor: pointer;margin-right:32px" @click="closeModal2">
<img
style="width: 22px; height: 22px"
src="../../assets/images/basicinfo/close22.png"
/>
</div>
</div>
<div class="modalMain">
<div class="name">
<div class="star" style="margin-top: -4px">
<img
style="width: 10px; height: 10px"
src="../../assets/images/basicinfo/asterisk.png"
/>
</div>
<div class="inname">项目名称:</div>
<div class="in">
<a-input
v-model:value="value"
show-count :maxlength="30"
placeholder="请输入项目名称"
style="border-radius: 8px"
/>
</div>
</div>
<div class="name">
<div class="star" style="margin-top: -4px">
<img
style="width: 10px; height: 10px"
src="../../assets/images/basicinfo/asterisk.png"
/>
</div>
<div class="inname">分类:</div>
<div class="in">
<a-select
v-model:value="value"
placeholder="四个养成"
style="border-radius: 8px;height: 40px"
/>
</div>
</div>
<div class="name">
<div class="star" style="margin-top: -4px">
<img
style="width: 10px; height: 10px"
src="../../assets/images/basicinfo/asterisk.png"
/>
</div>
<div class="inname">项目经理:</div>
<div class="in">
<a-input
v-model:value="value"
placeholder="请选择项目经理"
style="border-radius: 8px;height: 40px"
/>
</div>
</div>
<div class="name">
<div class="star" style="margin-top: -4px">
<img
style="width: 10px; height: 10px"
src="../../assets/images/basicinfo/asterisk.png"
/>
</div>
<div class="inname">资源归属:</div>
<div class="in">
<a-input
v-model:value="value"
style="border-radius: 8px;height: 40px"
/>
</div>
</div>
<div class="pubtn">
<a-button class="pubtn1" @click="closeModal2">取消</a-button>
<a-button class="pubtn2" @click="closeModal2">确定</a-button>
</div>
</div>
</a-modal>
</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";
export default { export default {
name: "taskPage", name:"taskPage",
components: { TimeManage, FaceManage }, components: { TimeManage, FaceManage },
setup() { setup(){
const state = reactive({ const state = reactive({
visible: false, //时间管理 visible: false, //时间管理
FaceVisivle: true, //面授管理 FaceVisivle: false, //面授管理
pubproject: false, pubproject: false,
checked: false, stugroup: false,
checked1: true, checked: false,
checked2: false, checked1: true,
activeKey: "3", checked2: false,
activeKey1: "9", activeKey: '3',
}); activeKey1: '9',
const showModal = () => { });
state.pubproject = true; const showModal = () => {
}; state.pubproject = true;
const closeModal = () => { };
state.pubproject = false; const closeModal = () => {
}; state.pubproject = false;
//新增 };
const showModal2 = () => {
state.stugroup = true;
};
const closeModal2 = () => {
state.stugroup = false;
};
//新增
const showTime = () => { const showTime = () => {
console.log("点击管理"); console.log("点击管理");
state.visible = true; state.visible = true;
@@ -638,11 +757,13 @@ export default {
// console.log("点击管理"); // console.log("点击管理");
state.FaceVisivle = true; state.FaceVisivle = true;
}; };
return { return {
...toRefs(state), ...toRefs(state),
showModal, showModal,
closeModal, closeModal,
showTime, showModal2,
closeModal2,
showTime,
showFace, showFace,
}; };
}, },
@@ -779,6 +900,88 @@ export default {
} }
} }
} }
.doublepro {
.ant-modal {
.ant-modal-body {
padding: 0;
.modalMain {
display: flex;
flex-direction: column;
align-items: center;
.name {
width: 78%;
// background-color: lightcoral;
display: flex;
justify-content: right;
margin-top: 32px;
align-items: center;
height: 40px;
// border: 1px solid black;
.inname {
color: #000000;
font-size: 14px;
margin-left: 7px;
}
.in {
margin-left: 14px;
width: 81%;
.ant-input {
border-radius: 5px;
// height: 120%;
width: 100%;
height: 30px;
}
.ant-select {
border-radius: 5px;
// height: 120%;
width: 100%;
height: 40px;
.ant-select-selector {
border-radius: 8px;
// height: 120%;
width: 100%;
height: 40px;
}
}
}
}
.pubtn {
display: flex;
justify-content: center;
margin-top: 25px;
//margin-bottom: 29px;
.pubtn1 {
width: 100px;
height: 40px;
margin-right: 16px;
margin-bottom: 29px;
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)
}
.pubtn2 {
width: 100px;
height: 40px;
margin-bottom: 29px;
border: 1px solid #409EFF;
border-radius: 4px;
color: #FFFFFF;
font-size: 14px;
align-items: center;
//line-height: 36px;
background: #409EFF;
}
}
}
}
}
}
.taskpage { .taskpage {
width: 100%; width: 100%;
display: flex; display: flex;
@@ -1291,58 +1494,62 @@ export default {
font-weight: 700; font-weight: 700;
} }
.group { .group {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.groupleft { .groupleft {
display: flex; display: flex;
align-items: center; align-items: center;
margin-left: 32px; margin-left: 32px;
.groupname { .groupname {
color: #000000; height: 22px;
font-size: 14px; width: 70px;
color: #000000;
font-size: 14px;
}
.ant-input {
border-radius: 8px;
width: 264px;
height: 40px;
}
}
.groupright {
display: flex;
.btn1 {
width: 100px;
height: 40px;
display: flex;
align-items: center;
justify-content: center;
margin-right: 16px;
border: 1px solid #409EFF;
border-radius: 8px;
background: #409EFF;
cursor: pointer;
.btn1text {
color: #FFFFFF;
margin-left: 5px;
font-size: 14px;
}
}
.btn2 {
width: 100px;
height: 40px;
display: flex;
align-items: center;
justify-content: center;
margin-right: 32px;
border: 1px solid #409EFF;
border-radius: 8px;
cursor: pointer;
background: #FFFFFF;
.btn2text {
color: #409EFF;
margin-left: 5px;
font-size: 14px;
}
}
}
} }
.ant-input {
height: 40px;
}
}
.groupright {
display: flex;
.btn1 {
width: 100px;
height: 40px;
display: flex;
align-items: center;
justify-content: center;
margin-right: 16px;
border: 1px solid #409eff;
border-radius: 8px;
background: #409eff;
cursor: pointer;
.btn1text {
color: #ffffff;
margin-left: 5px;
font-size: 14px;
}
}
.btn2 {
width: 100px;
height: 40px;
display: flex;
align-items: center;
justify-content: center;
margin-right: 32px;
border: 1px solid #409eff;
border-radius: 8px;
cursor: pointer;
background: #ffffff;
.btn2text {
color: #409eff;
margin-left: 5px;
font-size: 14px;
}
}
}
}
.second2 { .second2 {
display: flex; display: flex;
margin: 30px 0 0 32px; margin: 30px 0 0 32px;
@@ -1382,26 +1589,117 @@ export default {
} }
} }
.groupmain { .groupmain {
display: flex; display: flex;
margin-left: 32px; margin-left: 32px;
.groupbox { .groupbox {
width: 264px; width: 264px;
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.05); box-shadow: 1px 1px 18px 1px rgba(0, 0, 0, 0.0500);
margin-top: 16px; margin-top: 16px;
margin-right: 20px; margin-right: 20px;
.grouptitle { .grouptitle {
display: flex; display: flex;
justify-content: space-betwwen; justify-content: space-between;
border-bottom: 1px solid rgba(232, 232, 232, 1); margin-top: 5px;
.goodgruop { border-bottom: 1px solid rgba(232, 232, 232, 1);
} .goodgruop {
color: rgba(0, 0, 0, 0.8500);
font-size: 16px;
line-height: 36px;
font-weight: 600;
}
.more {
position: relative;
//margin-right: 30px;
height: 30px;
display: flex;
align-items: center;
.moreItems {
width: 76px;
height: 80px;
display: none;
background: #ffffff;
box-shadow: 2px 3px 9px 3px rgba(0, 0, 0, 0.05);
// border-radius: 3px;
border: 0px solid #dcdcdc;
position: absolute;
left: -48px;
top: 30px;
z-index: 100;
cursor: pointer;
.sammo {
text-align: center;
margin-top: 12px;
cursor: pointer;
}
.sammo:hover {
color: #4ea6ff;
}
}
.moreItems:hover {
display: block;
}
}
@media screen and (max-width: 1240px) {
.line {
margin-right: 10px;
}
.img1 {
margin-right: 15px;
}
.img2 {
margin-right: 10px;
}
.return {
margin-right: 10px;
}
.pub {
margin-right: 10px;
}
.more {
margin-right: 10px;
}
}
.more:hover .moreArrow {
background-image: url("../../assets/images/navtop/up.png");
}
.more:hover .moreItems {
display: block;
}
}
.leader {
color: rgba(0, 0, 0, 1);
font-size: 14px;
margin-top: 16px;
//margin-left: 24px;
}
.grocenter {
display: flex;
margin-top: 14px;
.leader1 {
color: rgba(0, 0, 0, 1);
font-size: 14px;
width: 51px;
}
.ant-progress-outer {
width: 170px;
}
}
.grofooter {
display: flex;
justify-content: space-between;
cursor: pointer;
margin-top: 30px;
.ftext {
color: rgba(56, 139, 225, 1);
font-size: 14px;
}
}
}
} }
}
}
} }
} }
</style> </style>