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

This commit is contained in:
岳佳鑫
2022-10-22 17:57:12 +08:00
11 changed files with 558 additions and 111 deletions

View File

@@ -785,84 +785,13 @@
</div>
</a-tab-pane>
<a-tab-pane key="4" tab="公告">
<div class="noticeTitle">
<h3>公告</h3>
<a-divider style="margin-top: -5px"></a-divider>
<a-switch
v-model:checked="noticeChecked"
style="size: small"
/><span style="margin-left: 13px">开启</span>
<p style="margin-top: 35px">公告内容</p>
<a-textarea
v-model:value="noticeContent"
placeholder="请输入要发布的公告"
show-count
:maxlength="150"
style="margin-top: -10px; height: 110px"
/>
<div class="publish">
<div class="iconPub"></div>
<div class="btnText">发布</div>
</div>
</div>
<NoticePub></NoticePub>
</a-tab-pane>
<a-tab-pane key="5" tab="项目积分">
<div class="split"></div>
<div class="content3">
<a-tabs v-model:activeKey="activeKey2">
<a-tab-pane key="1" tab="学员获取"> </a-tab-pane>
<a-tab-pane key="2" tab="榜单"> </a-tab-pane>
<a-tab-pane key="3" tab="获取规则">
<div class="projectscore">
<div class="pjc_body">
<div class="pjcb_header">
<span>规则</span>
<div class="edit_btn">
<div class="edit"></div>
<div class="btnText">编辑</div>
</div>
</div>
<div class="pjcb_content">
<div class="content content1">
<span
>当前设计下学员可以获得
<a-input
v-model:value="inputValue"
:maxlength="3"
style="width: 50px"
/>
积分</span
>
</div>
<div class="content content2">
<span
>完成必修/选修获得
<a-input
v-model:value="inputValue2"
:maxlength="3"
style="width: 50px"
/>
积分</span
>
</div>
<div class="content content3">
<span
>优秀学员可获得
<a-input
v-model:value="inputValue3"
:maxlength="3"
style="width: 50px"
/>
积分</span
>
</div>
</div>
</div>
</div>
</a-tab-pane>
</a-tabs>
</div>
<ProjectScore></ProjectScore>
</a-tab-pane>
<a-tab-pane key="6" tab="排行榜">
<div class="content6">
<div class="title">排行榜</div>
@@ -1584,6 +1513,8 @@ import StuAdd from "../../components/drawers/StuAdd";
import ImportStu from "../../components/drawers/ImportStu";
import SeeStu from "../../components/drawers/SeeStu";
import ChangeGroup from "../../components/drawers/ChangeGroup";
import NoticePub from "../../components/drawers/NoticePub";
import ProjectScore from "../../components/drawers/ProjectScore";
import TaskImpStu from "../../components/drawers/TaskFaceIn";
export default {
name: "taskPage",
@@ -1601,7 +1532,10 @@ export default {
ImportStu,
SeeStu,
ChangeGroup,
NoticePub,
ProjectScore,
TaskImpStu,
},
setup() {
const state = reactive({
@@ -3619,42 +3553,7 @@ export default {
}
}
}
.noticeTitle {
margin-left: 38px;
margin-right: 38px;
padding-top: 20px;
.publish {
width: 100px;
// padding: 0px 26px 0px 26px;
height: 38px;
background: rgb(64, 158, 255);
border-radius: 8px;
border: 1px solid rgba(64, 158, 255, 1);
display: flex;
align-items: center;
justify-content: center;
flex-shrink: 0;
float: right;
margin-top: 60px;
margin-bottom: 60px;
margin-right: 20px;
cursor: pointer;
.iconPub {
width: 15px;
height: 15px;
background-image: url(@/assets/images/taskpage/pub.png);
background-size: 100% 100%;
color: rgb(255, 255, 255);
}
.btnText {
font-size: 14px;
font-weight: 400;
color: rgb(255, 255, 255);
line-height: 36px;
margin-left: 5px;
}
}
}
}
.content3 {
margin-top: 20px;