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

This commit is contained in:
岳佳鑫
2022-10-24 18:33:57 +08:00
10 changed files with 2669 additions and 794 deletions

View File

@@ -304,6 +304,7 @@ export default {
}
}
.contentMain {
padding-right: 12px;
.main_items {
display: flex;
justify-content: space-between;

File diff suppressed because it is too large Load Diff

View File

@@ -1,15 +1,14 @@
<!--发布公告-->
<template>
<div class="content3">
<div class="contentscore">
<a-tabs v-model:activeKey="activeKeyScore">
<a-tab-pane key="1" tab="学员获取">
<div class="group">
<div class="groupleft">
<div class="groupname" style="width: 42px">姓名</div>
<a-input
<a-input class="ant-input"
v-model:value="value"
placeholder="请输入姓名"
style="width: 131px"
/>
</div>
<div class="groupright">
@@ -63,11 +62,10 @@
</div>
<div class="group" style="justify-content: center">
<div class="groupleft">
<div class="groupname" style="width: 42px">姓名</div>
<a-input
<div class="groupname">姓名</div>
<a-input class="ant-input"
v-model:value="value"
placeholder="请输入姓名"
style="width: 130px"
/>
</div>
<div class="groupright">
@@ -156,11 +154,17 @@
>
</a-tabs>
</div>
<stu-score-detail v-model:Svisible="Svisible" />
</template>
<script>
import StuScoreDetail from "../../components/drawers/StuScoreDetail";
import { reactive, toRefs } from "vue";
export default {
name: "ProjectScore",
components:{
StuScoreDetail,
},
setup() {
const state = reactive({
tabledataStu: [
@@ -172,7 +176,7 @@ export default {
group: "好好学习",
diploma: "0",
operation: "查看",
putin: "手动加入",
},
{
key: 2,
@@ -182,7 +186,7 @@ export default {
group: "天天向上",
diploma: "0",
operation: "查看",
putin: "手动加入",
},
{
key: 3,
@@ -192,7 +196,7 @@ export default {
group: "好好学习",
diploma: "0",
operation: "查看",
putin: "手动加入",
},
{
key: 4,
@@ -202,7 +206,7 @@ export default {
group: "天天向上",
diploma: "0",
operation: "查看",
putin: "手动加入",
},
],
@@ -319,18 +323,53 @@ export default {
todayvalue: "1",
tableDataTotal: 30,
stuValue: false,
Svisible:false,
});
const getTableData = () => {
let datas = state.tabledataStu;
datas.map((value) => {
{
//单层项目
value.operation = (
<div class="operation">
<div
class="jc"
onClick={() => {
state.Svisible = true;
}}
>
查看
</div>
</div>
);
}
});
state.tabledataStu = datas;
};
getTableData();
return {
...toRefs(state),
};
},
};
</script>
<style lang="scss" scoped>
.content3 {
<style lang="scss">
.contentscore {
margin-top: 20px;
margin-bottom: 100px;
.ant-tabs-tab-btn {
font-size: 18px;
font-weight: 700;
}
.ant-input {
border-radius: 5px;
width: 130px;
height: 40px;
}
.group {
display: flex;
justify-content: space-between;
@@ -338,12 +377,13 @@ export default {
display: flex;
align-items: center;
margin-left: 32px;
.groupname {
.groupname {
height: 22px;
width: 70px;
width: 42px;
color: #000000;
font-size: 14px;
}
}
.groupright {
display: flex;
@@ -382,6 +422,14 @@ export default {
}
}
}
}
.ant-table-tbody{
.operation{
color: #409eff;
}
}
.scorelist {
padding-left: 20%;
@@ -463,8 +511,7 @@ export default {
}
}
}
}
.projectscore {
.projectscore {
.pjc_body {
margin-left: 34px;
margin-right: 34px;
@@ -532,4 +579,7 @@ export default {
}
}
}
}
</style>

View File

@@ -0,0 +1,340 @@
<template>
<a-drawer
:visible="Svisible"
class="drawerStyle StuScore"
placement="right"
width="70%"
@after-visible-change="afterVisibleChange"
>
<div class="drawerMain">
<div class="header">
<div class="headerTitle">学员获取详情</div>
<img
style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer"
/>
</div>
<div class="main">
<div class="tableBox" style="margin-top: 20px; margin-bottom: 100px">
<a-table
style="border: 1px solid #f2f6fe"
:columns="tablecolumns"
:data-source="tabledata"
:loading="tableDataTotal === -1 ? true : false"
:scroll="{ x: 900, y: 560 }"
@expand="expandTable"
:pagination="false"
/>
<div class="pa">
<a-pagination
showSizeChanger="true"
showQuickJumper="true"
hideOnSinglePage="true"
:pageSize="pageSize"
:current="currentPage"
:total="tableDataTotal"
class="pagination"
/>
</div>
</div>
</div>
<div class="btnn">
<button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="closeDrawer">确定</button>
</div>
</div>
</a-drawer>
</template>
<script>
import { toRefs, reactive } from "vue";
export default {
name: "StuScoreDetail",
props: {
Svisible: {
type: Boolean,
default: false,
},
},
setup(props, ctx) {
const state = reactive({
name: null,
pageSize: 10,
currentPage: 1,
tableDataTotal: 100,
selectedRowKeys: [],
tabledata: [
{
key: 1,
time: "2019-12-12 12:12",
score: "12",
type: "完成任务",
from: "【在线】如何成为产品经理",
},
{
key: 1,
time: "2019-12-12 12:12",
score: "12",
type: "完成任务",
from: "【在线】如何成为产品经理",
},
{
key: 1,
time: "2019-12-12 12:12",
score: "12",
type: "完成任务",
from: "【在线】如何成为产品经理",
},
{
key: 1,
time: "2019-12-12 12:12",
score: "12",
type: "完成任务",
from: "【在线】如何成为产品经理",
},
{
key: 1,
time: "2019-12-12 12:12",
score: "12",
type: "完成任务",
from: "【在线】如何成为产品经理",
},
{
key: 1,
time: "2019-12-12 12:12",
score: "12",
type: "完成任务",
from: "【在线】如何成为产品经理",
},
{
key: 1,
time: "2019-12-12 12:12",
score: "12",
type: "完成任务",
from: "【在线】如何成为产品经理",
},
{
key: 1,
time: "2019-12-12 12:12",
score: "12",
type: "完成任务",
from: "【在线】如何成为产品经理",
},
{
key: 1,
time: "2019-12-12 12:12",
score: "12",
type: "完成任务",
from: "【在线】如何成为产品经理",
},
{
key: 1,
time: "2019-12-12 12:12",
score: "12",
type: "完成任务",
from: "【在线】如何成为产品经理",
},
{
key: 1,
time: "2019-12-12 12:12",
score: "12",
type: "完成任务",
from: "【在线】如何成为产品经理",
},
],
tablecolumns: [
{
title: "获取时间",
dataIndex: "time",
key: "time",
width: 40,
align: "left",
className: "h head",
},
{
title: "积分",
dataIndex: "score",
key: "score",
width: 60,
align: "center",
className: "h",
},
{
title: "类型",
dataIndex: "type",
key: "type",
width: 60,
align: "center",
className: "h",
},
{
title: "来源",
dataIndex: "from",
key: "from",
width: 60,
align: "center",
className: "h",
},
],
});
const closeDrawer = () => {
ctx.emit("update:Svisible", false);
};
return {
...toRefs(state),
closeDrawer,
};
},
};
</script>
<style lang="scss" >
.StuScore{
.drawerMain {
min-width: 600px;
margin: 0px 32px 0px 32px;
overflow-x: scroll;
display: flex;
flex-direction: column;
.header {
height: 73px;
border-bottom: 1px solid #e8e8e8;
display: flex;
justify-content: space-between;
align-items: center;
// background-color: red;
margin-bottom: 20px;
.headerTitle {
font-size: 18px;
font-weight: 600;
color: #333333;
line-height: 25px;
// margin-left: 24px;
}
}
.main {
width: 100%;
height: 100%;
// background-color: #bfa;
// overflow-y: auto;
.endtime {
font-size: 16px;
font-weight: 500;
color: #333333;
}
.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;
}
}
.pa {
// left: 0;
margin-top: 15px;
width: 100%;
// height: 20px;
// background-color: red;
display: flex;
justify-content: center;
// position: absolute;
// bottom: 20px;
}
}
}
.btnn {
height: 72px;
width: 100%;
position: absolute;
bottom: 0;
left: 0;
display: flex;
align-items: center;
justify-content: center;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
.btn1 {
width: 100px;
height: 40px;
border: 1px solid #4ea6ff;
border-radius: 8px;
color: #4ea6ff;
background-color: #fff;
cursor: pointer;
}
.btn2 {
cursor: pointer;
width: 100px;
height: 40px;
background: #4ea6ff;
border-radius: 8px;
border: 0;
margin-left: 15px;
color: #fff;
}
}
}
}
</style>

View File

@@ -37,9 +37,9 @@ import { toRefs, reactive, defineComponent } from "vue";
export default defineComponent({
name: "DelWins",
props: {
delete_hs: {
type: Boolean,
default: false,
delete_hs: {
type: Boolean,
default: false,
},
},
setup() {