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

This commit is contained in:
岳佳鑫
2022-10-25 10:28:56 +08:00
2 changed files with 131 additions and 56 deletions

View File

@@ -1,11 +1,12 @@
<!--发布公告--> <!--发布公告-->
<template> <template>
<div class="noticeTitle"><span style="font-size: 18px;">公告</span> <div class="split"></div>
<a-divider style="margin-top: 0px;margin-bottom:30px;"></a-divider> <div class="noticeTitle">
<a-switch v-model:checked="noticeChecked" size="small"/><span style="margin-left: 16px;">开启</span> <div class="notitle"><span class="titlespan">公告</span></div>
<div class="switch"><a-switch v-model:checked="noticeChecked" size="small"/><span style="margin-left: 16px;">开启</span></div>
<template v-if="noticeChecked"> <template v-if="noticeChecked">
<p style="margin-top: 35px;">公告内容</p> <p>公告内容</p>
<a-textarea v-model:value="noticeContent" show-count :maxlength="150" style="margin-top: -10px;margin-bottom:30px;height: 110px;"/> <a-textarea v-model:value="noticeContent" :maxlength="150" placeholder="公告信息最多输入150个字" style="margin-top: -10px;height: 120px;"/>
<div class="publish"><div class="iconPub"></div><div class="btnText">发布</div></div> <div class="publish"><div class="iconPub"></div><div class="btnText">发布</div></div>
</template> </template>
@@ -29,9 +30,26 @@ export default {
</script> </script>
<style lang="scss"> <style lang="scss">
.noticeTitle { .noticeTitle {
margin-left: 38px; margin-left: 32px;
margin-right: 38px; margin-right: 32px;
padding-top: 20px; padding-top: 20px;
.notitle{
height: 55px;
border-bottom:1px solid #ededed;
position: relative;
.titlespan{
font-size: 18px;
position: absolute;
left: 0;
bottom: 0px;
}
}
.switch{
display: flex;
align-items: center;
height: 90px;
}
.publish { .publish {
width: 100px; width: 100px;
height:38px; height:38px;
@@ -43,7 +61,7 @@ export default {
justify-content: center; justify-content: center;
flex-shrink: 0; flex-shrink: 0;
float: right; float: right;
margin-top: 60px; margin-top: 24px;
margin-bottom: 60px; margin-bottom: 60px;
margin-right: 20px; margin-right: 20px;
cursor: pointer; cursor: pointer;

View File

@@ -1,5 +1,6 @@
<!--发布公告--> <!--发布公告-->
<template> <template>
<div class="split"></div>
<div class="contentscore"> <div class="contentscore">
<a-tabs v-model:activeKey="activeKeyScore"> <a-tabs v-model:activeKey="activeKeyScore">
<a-tab-pane key="1" tab="学员获取"> <a-tab-pane key="1" tab="学员获取">
@@ -22,8 +23,8 @@
</div> </div>
</div> </div>
</div> </div>
<div class="tab" style="margin: 20px 32px 30px 32px"> <div class="tableBox" style="margin: 20px 32px 30px 32px">
<a-table <a-table
style="border: 1px solid #f2f6fe" style="border: 1px solid #f2f6fe"
:columns="tablecolumnStu" :columns="tablecolumnStu"
:data-source="tabledataStu" :data-source="tabledataStu"
@@ -63,7 +64,7 @@
<div class="group" style="justify-content: center"> <div class="group" style="justify-content: center">
<div class="groupleft"> <div class="groupleft">
<div class="groupname">姓名</div> <div class="groupname">姓名</div>
<a-input class="ant-input" <a-input class="ant-input" style="width:152px"
v-model:value="value" v-model:value="value"
placeholder="请输入姓名" placeholder="请输入姓名"
/> />
@@ -90,37 +91,38 @@
<a-radio-button class="today" value="3">近一个月</a-radio-button> <a-radio-button class="today" value="3">近一个月</a-radio-button>
</a-radio-group> </a-radio-group>
</div> </div>
<div class="slist"> <div class="listdiv"> <div class="slist">
<a-list :data-source="stuValue ? datascoreg : datascore"> <a-list :data-source="stuValue ? datascoreg : datascore">
<template #renderItem="{ item }"> <template #renderItem="{ item }">
<div class="item"> <div class="item">
<div v-if="item.id == 1" class="itemleft"> <div v-if="item.id == 1" class="itemleft">
<div class="itemimage"> <div class="itemimage">
<img src="../../assets/images/taskpage/gold.png" /> <img src="../../assets/images/taskpage/gold.png" />
</div>
<div class="itemid">{{ item.id }}</div>
</div> </div>
<div class="itemid">{{ item.id }}</div> <div v-else-if="item.id == 2" class="itemleft">
</div> <div class="itemimage">
<div v-else-if="item.id == 2" class="itemleft"> <img src="../../assets/images/taskpage/siler.png" />
<div class="itemimage"> </div>
<img src="../../assets/images/taskpage/siler.png" /> <div class="itemid">{{ item.id }}</div>
</div> </div>
<div class="itemid">{{ item.id }}</div> <div v-else-if="item.id == 3" class="itemleft">
</div> <div class="itemimage">
<div v-else-if="item.id == 3" class="itemleft"> <img src="../../assets/images/taskpage/copper.png" />
<div class="itemimage"> </div>
<img src="../../assets/images/taskpage/copper.png" /> <div class="itemid">{{ item.id }}</div>
</div>
<div v-else class="itemleft">
<div class="elseid">{{ item.id }}</div>
</div> </div>
<div class="itemid">{{ item.id }}</div>
</div>
<div v-else class="itemleft">
<div class="elseid">{{ item.id }}</div>
</div>
<div class="itemcenter">{{ item.name }}</div> <div class="itemcenter">{{ item.name }}</div>
<div class="itemright">{{ item.score }}</div> <div class="itemright">{{ item.score }}</div>
</div> </div>
</template> </template>
</a-list> </a-list>
</div>
</div> </div>
</div> </div>
</a-tab-pane> </a-tab-pane>
@@ -366,8 +368,8 @@ export default {
font-weight: 700; font-weight: 700;
} }
.ant-input { .ant-input {
border-radius: 5px; border-radius: 8px;
width: 130px; width: 264px;
height: 40px; height: 40px;
} }
.group { .group {
@@ -424,16 +426,63 @@ export default {
} }
} }
.tableBox {
.ant-table-selection-column {
padding: 0px !important;
// padding-left: 45px !important;
}
.ant-table-thead > tr > th {
background-color: rgba(239, 244, 252, 1) !important;
color: rgba(0, 0, 0, 0.8500);
}
.ant-table-cell {
color: rgba(0, 0, 0, 0.6500);
}
.ant-table-selection-column {
padding: 0 !important;
}
th.h {
background-color: #eff4fc !important;
}
.ant-table-tbody
> tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
> td {
background: #f6f9fd;
}
.ant-table-tbody > tr > td {
border-bottom: 1px solid rgba(240, 244, 254, 1);
padding: 16px 16px;
.operation {
color: rgba(56, 125, 247, 1);
cursor: pointer;
}
}
.ant-table-tbody{
.pa {
// left: 0;
margin-top: 15px;
width: 100%;
// height: 20px;
// background-color: red;
display: flex;
justify-content: center;
// position: absolute;
// bottom: 20px;
}
}
.ant-table-tbody{
.operation{
color: #409eff;
}
} }
.scorelist { .scorelist {
padding-left: 20%;
padding-right: 20%;
padding-bottom: 100px; padding-bottom: 100px;
padding-top: 50px; padding-top: 50px;
.grouprightscore { .grouprightscore {
@@ -446,8 +495,8 @@ export default {
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
margin-left: 10%; margin-left: 90px;
margin-right: 10%; margin-right: 90px;
} }
.btn1 { .btn1 {
@@ -455,21 +504,28 @@ export default {
} }
} }
.radiobutton { .radiobutton {
margin-top: 23px; margin-top: 23px;
margin-bottom: 23px; margin-bottom: 23px;
justify-content: center; justify-content: center;
display: flex; display: flex;
text-align: center; text-align: center;
.today { .today {
width: 105px; width: 120px;
height: 32px;
} }
} }
.slist { .listdiv{
display: flex;
justify-content: space-evenly;
text-align: center;
.slist {
width: 736px;
background-color: #f5f8fc; background-color: #f5f8fc;
padding-left: 20px; padding-left: 28px;
padding-right: 20px; padding-right: 28px;
padding-bottom: 20px; padding-bottom: 20px;
padding-top: 10px; padding-top: 16px;
font-size: 18px; font-size: 18px;
.item { .item {
@@ -477,7 +533,7 @@ export default {
justify-content: space-evenly; justify-content: space-evenly;
text-align: center; text-align: center;
border-bottom: none; border-bottom: none;
height: 60px; height: 56px;
align-items: center; align-items: center;
background-color: white; background-color: white;
border-radius: 21px; border-radius: 21px;
@@ -488,7 +544,7 @@ export default {
align-items: center; align-items: center;
width: 150px; width: 150px;
.itemid { .itemid {
font-size: 46px; font-size: 40px;
font-family: math; font-family: math;
font-style: italic; font-style: italic;
font-weight: 700; font-weight: 700;
@@ -510,6 +566,7 @@ export default {
} }
} }
} }
}
} }
.projectscore { .projectscore {
.pjc_body { .pjc_body {
@@ -582,4 +639,4 @@ export default {
} }
</style> </style>