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

This commit is contained in:
songwc
2022-10-20 15:24:01 +08:00
4 changed files with 557 additions and 7 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

@@ -0,0 +1,305 @@
<template>
<a-drawer
:visible="Importvisible"
class="drawerStyle importstu"
placement="right"
width="50%"
@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="download">
<span class="placedown">请下载</span>
<span class="template">模板</span>
<span class="placedown">按要求填写数据并导入</span>
</div>
<div class="upload">
<span class="uptext">上传:</span>
<div>
<!-- 导入学员上传 -->
<div class="upbox" style="display: none">
<div class="uploadimg"><img src="../../assets/images/taskpage/upload.png"/></div>
<div class="draghere">点击或将文件拖拽到此处上传</div>
<div class="support">支持扩展名.xls/.xlsx</div>
</div>
<!-- 导入学员上传 -->
<!-- 导入学员上传有状态-正在上传 -->
<div class="alreadybox">
<div class="alimg"></div>
<div class="upproject">京东方商业模型.xls</div>
<div class="uping">正在上传</div>
<div class="progress">
<a-progress :percent="55" strokeColor="rgba(56, 139, 225, 1)"/>
</div>
<div class="state">
<span class="stop">暂停</span>
<span class="stop">取消</span>
</div>
</div>
<!-- 导入学员上传有状态-正在上传 -->
<div class="uploadstate">上传失败</div>
<!-- 导入学员上传有状态-上传失败 -->
<div class="alreadybox">
<div class="alimg"></div>
<div class="upproject">京东方商业模型.xls</div>
<div class="uping" style="color: #FF7474">上传失败</div>
<div class="progress">
<a-progress :percent="55" strokeColor="rgba(255, 116, 116, 1)" />
</div>
<div class="fail">下载失败数据</div>
<div class="state">
<span class="stop">重传</span>
<span class="stop">取消</span>
</div>
</div>
<!-- 导入学员上传有状态-上传失败 -->
<div class="uploadstate" style="margin-top: 74px">上传成功</div>
<!-- 导入学员上传有状态-上传成功 -->
<div class="alreadybox">
<div class="alimg"></div>
<div class="upproject">京东方商业模型.xls</div>
<div class="uping" style="color: #35AE69">上传成功</div>
<div class="progress">
<a-progress :percent="100" :show-info="false" strokeColor="rgba(87, 200, 135, 1)"/>
<span style="margin-left: 2px">100%</span>
</div>
<div class="state">
<span class="stop">删除</span>
</div>
</div>
<!-- 导入学员上传有状态-上传成功 -->
</div>
</div>
</div>
<div class="btnn">
<button class="btn1">取消</button>
<button class="btn2">确定</button>
</div>
</div>
</a-drawer>
</template>
<script>
import { reactive, toRefs } from "vue";
export default {
name: "ImportStu",
props: {
Importvisible: {
type: Boolean,
default: false,
},
},
setup(props, ctx) {
const state = reactive({});
const closeDrawer = () => {
ctx.emit("update:Importvisible", false);
};
const afterVisibleChange = (bool) => {
console.log("state", bool);
};
return {
...toRefs(state),
afterVisibleChange,
closeDrawer,
// change,
};
},
};
</script>
<style scoped lang="scss" >
.importstu {
.ant-drawer-content-wrapper {
// max-width: 1000px;
.ant-drawer-header {
display: none !important;
}
.ant-drawer-body {
padding: 0;
}
}
.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 {
.download {
display: flex;
.placedown {
color: rgba(51, 51, 51, 1);
font-size: 16px;
}
.template {
color: rgba(56, 139, 225, 1);
font-size: 16px;
cursor: pointer;
padding: 0 5px;
}
}
.upload {
display: flex;
margin-top: 27px;
.uptext {
color: rgba(51, 51, 51, 1);
font-size: 14px;
}
.upbox {
position: relative;
width: 500px;
height: 176px;
margin-left: 10px;
background: rgba(56, 139, 225, 0.1);
border: 1px dotted rgba(56, 139, 225, 0.2) ;
border-radius: 4px;
cursor: pointer;
.uploadimg {
position: absolute;
width: 28px;
height: 28px;
top: 52px;
left: 236px;
}
.draghere {
position: absolute;
top: 100px;
left: 159px;
color: rgba(56, 139, 225, 1);
font-size: 14px;
}
.support {
position: absolute;
left: 180px;
bottom: 24px;
color: rgba(153, 153, 153, 1);
font-size: 14px;
}
}
.alreadybox {
width: 500px;
height: 173px;
position: relative;
margin-left: 10px;
border: 1px dotted rgba(153, 153, 153, 1);
border-radius: 4px;
.fail {
position: absolute;
top: 113px;
left: 68px;
color: #FF7474;
font-size: 14px;
cursor: pointer;
}
.alimg {
width: 28px;
height: 32px;
position: absolute;
top: 66px;
left: 24px;
background: green;
}
.upproject {
position: absolute;
top: 60px;
left: 68px;
color: rgba(51, 51, 51, 1);
font-size: 14px;
}
.uping {
position: absolute;
top: 60px;
left: 274px;
color: rgba(56, 139, 225, 1);
font-size: 14px;
}
.progress {
position: absolute;
display: flex;
width: 293px;
top: 82px;
left: 68px;
}
.state {
position: absolute;
top: 83px;
left: 399px;
.stop {
color: rgba(56, 125, 247, 1);
font-size: 14px;
margin-right: 8px;
cursor: pointer;
}
}
}
.uploadstate {
margin-top: 28px;
margin-left: 75px;
color: rgba(51, 51, 51, 1);
font-size: 14px;
}
}
}
.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

@@ -3,7 +3,7 @@
:visible="Stuvisible"
class="drawerStyle stuadd"
placement="right"
width="60%"
width="50%"
@after-visible-change="afterVisibleChange"
>
<div class="drawerMain">
@@ -60,7 +60,81 @@
:data-source="tabledata"
:loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true"
:scroll="{ x: 590, y: 560 }"
:scroll="{ x: 560, y: 560 }"
@expand="expandTable"
:pagination="false"
:row-selection="{
columnWidth: 30,
selectedRowKeys: selectedRowKeys,
onChange: onSelectChange,
}"
/>
<div class="pa">
<a-pagination
showSizeChanger="true"
showQuickJumper="true"
hideOnSinglePage="true"
:pageSize="pageSize"
:current="currentPage"
:total="tableDataTotal"
class="pagination"
/>
</div>
</div>
</a-tab-pane>
<a-tab-pane key="2" tab="添加组织" force-render>
<div class="tab2">
<div class="organize">组织</div>
<a-cascader
v-model:value="value"
placeholder="请输入组织名称"
:options="organizeList"
/>
</div>
</a-tab-pane>
<a-tab-pane key="3" tab="受众关联">
<div class="tab1">
<div class="nameinp">
<div class="namee">受众名称</div>
<a-select
v-model:value="value"
style="width: 264px; border-radius: 8px"
placeholder="请输入组织名称"
:options="organizeList1"
/>
</div>
<div class="btns">
<div class="btn1">
<div class="img1"><img src="../../assets/images/courseManage/search0.png"/></div>
<div class="wz">搜索</div>
</div>
<div class="btn2">
<div class="img2"><img src="../../assets/images/courseManage/reset1.png"/></div>
<div class="wz">重置</div>
</div>
</div>
</div>
<div class="line">
<div class="inline">
<div class="left1">
<div class="img"></div>
<div class="text" style="margin-left: 10px">已选择</div>
<div class="text2">2</div>
<div class="text"></div>
<div class="text3">列表选项总计</div>
<div class="text4">9</div>
</div>
<div class="right1">清空</div>
</div>
</div>
<div class="tabb" style="margin-top: 16px">
<a-table
style="border: 1px solid #f2f6fe"
:columns="tablecolumns1"
:data-source="tabledata1"
:loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true"
:scroll="{ x: 700, y: 400 }"
@expand="expandTable"
:pagination="false"
:row-selection="{
@@ -82,8 +156,6 @@
</div>
</div>
</a-tab-pane>
<a-tab-pane key="2" tab="添加组织" force-render>Content of Tab Pane 2</a-tab-pane>
<a-tab-pane key="3" tab="受众关联">Content of Tab Pane 3</a-tab-pane>
</a-tabs>
</div>
</div>
@@ -129,6 +201,49 @@ export default {
pageSize: 10,
currentPage: 1,
tableDataTotal: 50,
organizeList: [
{
id: 1,
value: "京东方",
label: "京东方",
children: [
{
id:2,
value: "产研部",
label: "产研部",
children: [
{
id:4,
value: "产品部门",
label: "产品部门",
},
{
id:5,
value: "研发部门",
label: "研发部门",
},
],
},
{
id:3,
value: "人力资源部",
label: "人力资源部",
children: [
{
id:6,
value: "人事部",
label: "人事部",
},
{
id:7,
value: "行政部",
label: "行政部",
},
],
},
],
},
],
tabledata: [
{
key: 1,
@@ -211,6 +326,98 @@ export default {
className: "h",
},
],
tabledata1: [
{
key: 1,
name: "学习受众",
time: "2022-10-31 23:12:00",
total: "1",
state: "已发布",
type: "普通受众",
},
{
key: 2,
name: "2",
time: "2022-10-31 23:12:00",
total: "2",
state: "已发布",
type: "普通受众",
},
{
key: 3,
name: "mask",
time: "2022-10-31 23:12:00",
total: "1",
state: "已发布",
type: "普通受众",
},
{
key: 4,
name: "学习受众",
time: "2022-10-31 23:12:00",
total: "1",
state: "已发布",
type: "普通受众",
},
{
key: 5,
name: "学业受众",
time: "2022-10-31 23:12:00",
total: "2",
state: "已发布",
type: "普通受众",
},
{
key: 6,
name: "案例受众",
time: "2022-10-31 23:12:00",
total: "3",
state: "已发布",
type: "普通受众",
},
],
tablecolumns1: [
{
title: "受众名称",
dataIndex: "name",
key: "name",
width: 30,
align: "left",
className: "h",
},
{
title: "创建时间",
dataIndex: "time",
key: "time",
width: 40,
align: "center",
className: "h",
},
{
title: "人数",
dataIndex: "total",
key: "total",
width: 20,
align: "center",
className: "h",
},
{
title: "状态",
dataIndex: "state",
key: "state",
width: 20,
align: "center",
className: "h",
},
{
title: "类型",
dataIndex: "type",
key: "type",
width: 30,
align: "center",
className: "h",
},
],
});
const closeDrawer = () => {
ctx.emit("update:Stuvisible", false);
@@ -265,8 +472,10 @@ export default {
}
.main {
display: flex;
height: 80%;
.left {
width: 65%;
height: 100%;
border-right: 1px solid rgba(233, 233, 233, 1);
.tabs {
margin-right: 33px;
@@ -407,6 +616,25 @@ export default {
// bottom: 20px;
}
}
.tab2 {
display: flex;
align-items: center;
.organize {
color: rgba(0, 0, 0, 0.8500);
font-size: 14px;
}
.ant-cascader {
width: 264px;
height: 40px;
border-radius: 8px;
.ant-select-selector{
height: 100%;
}
.ant-select-selection-search-input {
height: 40px;
}
}
}
}
}
.right {

View File

@@ -536,11 +536,11 @@
</div>
</div>
<div class="second2" style="margin-top: 20px">
<div class="btn1">
<div class="btn1" @click="showStuAdd">
<img src="../../assets/images/courseManage/add0.png" />
<span class="btn1text">添加学员</span>
</div>
<div class="btn2">
<div class="btn2" @click="showImportStu">
<img src="../../assets/images/courseManage/reset2.png" />
<span class="btn2text">导入学员</span>
</div>
@@ -1053,6 +1053,10 @@
<face-manage v-model:Fvisible="FaceVisivle" />
<!-- 学员小组管理创建小组抽屉 -->
<subset-manage v-model:Svisible="subsetVisivle" />
<!-- 学员管理-添加学员抽屉 -->
<stu-add v-model:Stuvisible="Stuvisible" />
<!-- 学员管理-导入学员抽屉 -->
<import-stu v-model:Importvisible="Importvisible" />
<!-- 组员名单抽屉 -->
<member-list v-model:Lvisible="Lvisible" />
<!-- 面授学员抽屉 -->
@@ -1229,6 +1233,8 @@ import ActiveAttendance from "../../components/drawers/ActiveAttendance";
import WorkManage from "../../components/drawers/WorkManage";
import FaceStu from "../../components/drawers/FaceStu";
import TestManage from "../../components/drawers/TestManage";
import StuAdd from "../../components/drawers/StuAdd";
import ImportStu from "../../components/drawers/ImportStu";
export default {
name: "taskPage",
components: {
@@ -1240,6 +1246,8 @@ export default {
ActiveAttendance,
WorkManage,
TestManage,
StuAdd,
ImportStu,
},
setup() {
const state = reactive({
@@ -1404,6 +1412,8 @@ export default {
AAvisible: false, //活动考勤
Wvisible: false, //作业管理
TMvisible: false, //考试管理
Stuvisible: false, //添加学员
Importvisible: false, //导入学员
pubproject: false,
stugroup: false,
checked: false,
@@ -1734,7 +1744,12 @@ export default {
const showTest = () => {
state.TMvisible = true;
};
const showStuAdd = () => {
state.Stuvisible = true;
};
const showImportStu = () => {
state.Importvisible = true;
};
const changecheck2 = () => {
state.checkedd = !state.checkedd;
};
@@ -1757,6 +1772,8 @@ export default {
showTest,
changecheck2,
changecheck3,
showStuAdd,
showImportStu,
};
},
};