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

This commit is contained in:
dongwug
2022-10-22 15:45:59 +08:00
4 changed files with 1026 additions and 403 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 621 B

View File

@@ -48,7 +48,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="line"> <!-- <div class="line">
<div class="inline"> <div class="inline">
<div class="left1"> <div class="left1">
<div class="img"></div> <div class="img"></div>
@@ -60,7 +60,7 @@
</div> </div>
<div class="right1">清空</div> <div class="right1">清空</div>
</div> </div>
</div> </div> -->
<div class="tabb" style="margin-top: 16px"> <div class="tabb" style="margin-top: 16px">
<a-table <a-table
style="border: 1px solid #f2f6fe" style="border: 1px solid #f2f6fe"
@@ -68,7 +68,7 @@
:data-source="tabledata" :data-source="tabledata"
:loading="tableDataTotal === -1 ? true : false" :loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true" expandRowByClick="true"
:scroll="{ x: 100, y: 560 }" :scroll="{ x: 500, y: 560 }"
@expand="expandTable" @expand="expandTable"
:pagination="false" :pagination="false"
:row-selection="{ :row-selection="{
@@ -92,29 +92,36 @@
</a-tab-pane> </a-tab-pane>
<a-tab-pane key="2" tab="添加组织" force-render> <a-tab-pane key="2" tab="添加组织" force-render>
<div class="tab2"> <div class="tab2">
<div class="organize">组织</div> <div class="t1">
<div class="select"> <div class="organize">选择组织</div>
<a-cascader <div class="select">
v-model:value="value" <a-tree-select
placeholder="请输入组织名称" v-model:value="valueSelect"
:options="organizeList" style="width: 200px"
:dropdown-style="{
overflow: 'auto',
width: '400px',
}"
dropdownClassName="dropdown"
placeholder="请输入组织名称"
allow-clear
tree-default-expand-all
:tree-data="treeData"
>
</a-tree-select>
</div>
</div>
<div class="t1">
<div class="organize">姓名</div>
<a-input
v-model:value="nameadd"
style="width: 200px; height: 40px; border-radius: 8px"
placeholder="请输入姓名"
/> />
</div> </div>
</div> </div>
</a-tab-pane> <!-- 选完后出现下面 -->
<a-tab-pane key="3" tab="受众关联"> <div class="searchdown">
<div class="tab1">
<div class="nameinp">
<div class="namee">受众名称</div>
<div class="select">
<a-select
v-model:value="choosevalue"
style="width: 264px; border-radius: 8px"
placeholder="请输入组织名称"
:options="organizeList1"
/>
</div>
</div>
<div class="btns"> <div class="btns">
<div class="btn1"> <div class="btn1">
<div class="img1"> <div class="img1">
@@ -133,8 +140,75 @@
<div class="wz">重置</div> <div class="wz">重置</div>
</div> </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: 500, y: 560 }"
@expand="expandTable"
:pagination="false"
:row-selection="{
columnWidth: 30,
selectedRowKeys: selectedRowKeys1,
onChange: onSelectChange1,
}"
/>
<div class="pa">
<a-pagination
showSizeChanger="true"
showQuickJumper="true"
hideOnSinglePage="true"
:pageSize="pageSize1"
:current="currentPage1"
:total="tableDataTotal1"
class="pagination"
/>
</div>
</div>
</div> </div>
<div class="line"> </a-tab-pane>
<a-tab-pane key="3" tab="受众关联">
<div class="tab1">
<div class="t1">
<div class="nameinp">
<div class="namee">选择受众</div>
<div class="select">
<a-select
v-model:value="choosevalue"
style="width: 200px; border-radius: 8px"
placeholder="请输入组织名称"
:options="organizeList1"
/>
</div>
</div>
</div>
<div class="t1" style="margin-top: 10px">
<div class="organize">姓名</div>
<a-input
v-model:value="nameaddd"
style="width: 200px; height: 40px; border-radius: 8px"
placeholder="请输入姓名"
/>
</div>
</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 class="line">
<div class="inline"> <div class="inline">
<div class="left1"> <div class="left1">
<div class="img"></div> <div class="img"></div>
@@ -146,21 +220,21 @@
</div> </div>
<div class="right1">清空</div> <div class="right1">清空</div>
</div> </div>
</div> </div> -->
<div class="tabb" style="margin-top: 16px"> <div class="tabb" style="margin-top: 16px">
<a-table <a-table
style="border: 1px solid #f2f6fe" style="border: 1px solid #f2f6fe"
:columns="tablecolumns1" :columns="tablecolumns2"
:data-source="tabledata1" :data-source="tabledata2"
:loading="tableDataTotal === -1 ? true : false" :loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true" expandRowByClick="true"
:scroll="{ x: 700, y: 400 }" :scroll="{ x: 500, y: 560 }"
@expand="expandTable" @expand="expandTable"
:pagination="false" :pagination="false"
:row-selection="{ :row-selection="{
columnWidth: 30, columnWidth: 30,
selectedRowKeys: selectedRowKeys, selectedRowKeys: selectedRowKeys2,
onChange: onSelectChange, onChange: onSelectChange2,
}" }"
/> />
<div class="pa"> <div class="pa">
@@ -168,9 +242,9 @@
showSizeChanger="true" showSizeChanger="true"
showQuickJumper="true" showQuickJumper="true"
hideOnSinglePage="true" hideOnSinglePage="true"
:pageSize="pageSize" :pageSize="pageSize2"
:current="currentPage" :current="currentPage2"
:total="tableDataTotal" :total="tableDataTotal2"
class="pagination" class="pagination"
/> />
</div> </div>
@@ -181,7 +255,11 @@
</div> </div>
<div class="right"> <div class="right">
<div class="onerow"> <div class="onerow">
<div class="already">已选</div> <div class="onleft">
<div class="already">已选</div>
<div class="count">6</div>
<div class="peo"></div>
</div>
<div class="clbox"> <div class="clbox">
<div class="colose"></div> <div class="colose"></div>
<span class="allclear">全部清除</span> <span class="allclear">全部清除</span>
@@ -238,47 +316,74 @@ export default {
pageSize: 10, pageSize: 10,
currentPage: 1, currentPage: 1,
tableDataTotal: 50, tableDataTotal: 50,
pageSize1: 10,
currentPage1: 1,
tableDataTotal1: 50,
pageSize2: 10,
currentPage2: 1,
tableDataTotal2: 50,
selectedRowKeys: [],
selectedRowKeys1: [],
selectedRowKeys2: [],
activeKey: "1", activeKey: "1",
name: "", //输入名字搜索
value: [], //级联选择框 value: [], //级联选择框
choosevalue: null, //受众选择 choosevalue: null, //受众选择
organizeList: [ valueSelect: null, //树形选择
name: "",
nameadd: "",
nameaddd: "",
treeData: [
{ {
id: 1, title: "京东方",
value: "京东方", value: "京东方",
label: "京东方",
children: [ children: [
{ {
id: 2, title: "产研部",
value: "产研部", value: "产研部",
label: "产研部",
children: [ children: [
{ {
id: 4, title: "产品部",
value: "产品部", value: "产品部",
label: "产品部门",
}, },
{ {
id: 5, title: "研究部",
value: "研发部门", value: "研究部",
label: "研发部门",
}, },
], ],
}, },
{ {
id: 3, title: "二级标题",
value: "人力资源部", value: "二级标题",
label: "人力资源部",
children: [ children: [
{ {
id: 6, title: "三级标题",
value: "三级标题",
children: [
{
title: "四级标题",
value: "四级标题",
children: [
{
title: "五级标题",
value: "五级标题",
},
],
},
],
},
],
},
{
title: "人力资源部",
value: "人力资源部",
children: [
{
title: "人事部",
value: "人事部", value: "人事部",
label: "人事部",
}, },
{ {
id: 7, title: "行政部",
value: "行政部", value: "行政部",
label: "行政部",
}, },
], ],
}, },
@@ -290,55 +395,64 @@ export default {
key: 1, key: 1,
name: "小李", name: "小李",
bum: "产研部", bum: "产研部",
gangw: "产品经理", numb: "000000",
guishu: "",
}, },
{ {
key: 2, key: 2,
name: "小刘", name: "小刘",
bum: "产研部", bum: "产研部",
gangw: "产品经理", numb: "000000",
guishu: "",
}, },
{ {
key: 3, key: 3,
name: "小李", name: "小李",
bum: "产研部", bum: "产研部",
gangw: "产品经理", numb: "000000",
guishu: "",
}, },
{ {
key: 4, key: 4,
name: "小李", name: "小李",
bum: "产研部", bum: "产研部",
gangw: "产品经理", numb: "000000",
guishu: "",
}, },
{ {
key: 5, key: 5,
name: "小李", name: "小李",
bum: "产研部", bum: "产研部",
gangw: "产品经理", numb: "000000",
guishu: "",
}, },
{ {
key: 6, key: 6,
name: "小李", name: "小李",
bum: "产研部", bum: "产研部",
gangw: "产品经理", numb: "000000",
guishu: "",
}, },
{ {
key: 7, key: 7,
name: "小李", name: "小李",
bum: "产研部", bum: "产研部",
gangw: "产品经理", numb: "000000",
guishu: "",
}, },
{ {
key: 8, key: 8,
name: "小李", name: "小李",
bum: "产研部", bum: "产研部",
gangw: "产品经理", numb: "000000",
guishu: "",
}, },
{ {
key: 9, key: 9,
name: "小李", name: "小李",
bum: "产研部", bum: "产研部",
gangw: "产品经理", numb: "000000",
guishu: "",
}, },
], ],
tablecolumns: [ tablecolumns: [
@@ -351,18 +465,26 @@ export default {
className: "h", className: "h",
}, },
{ {
title: "部门", title: "工号",
dataIndex: "bum", dataIndex: "numb",
key: "bum", key: "numb",
width: 45, width: 35,
align: "center", align: "center",
className: "h", className: "h",
}, },
{ {
title: "岗位", title: "归属组织",
dataIndex: "gangw", dataIndex: "guishu",
key: "gangw", key: "guishu",
width: 45, width: 30,
align: "center",
className: "h",
},
{
title: "部门",
dataIndex: "bum",
key: "bum",
width: 40,
align: "center", align: "center",
className: "h", className: "h",
}, },
@@ -370,56 +492,71 @@ export default {
tabledata1: [ tabledata1: [
{ {
key: 1, key: 1,
name: "学习受众", name: "小李",
time: "2022-10-31 23:12:00", bum: "产研部",
total: "1", numb: "000000",
state: "已发布", guishu: "",
type: "普通受众",
}, },
{ {
key: 2, key: 2,
name: "2", name: "小刘",
time: "2022-10-31 23:12:00", bum: "产研部",
total: "2", numb: "000000",
state: "已发布", guishu: "",
type: "普通受众",
}, },
{ {
key: 3, key: 3,
name: "mask", name: "小李",
time: "2022-10-31 23:12:00", bum: "产研部",
total: "1", numb: "000000",
state: "已发布", guishu: "",
type: "普通受众",
}, },
{ {
key: 4, key: 4,
name: "学习受众", name: "小李",
time: "2022-10-31 23:12:00", bum: "产研部",
total: "1", numb: "000000",
state: "已发布", guishu: "",
type: "普通受众",
}, },
{ {
key: 5, key: 5,
name: "学业受众", name: "小李",
time: "2022-10-31 23:12:00", bum: "产研部",
total: "2", numb: "000000",
state: "已发布", guishu: "",
type: "普通受众",
}, },
{ {
key: 6, key: 6,
name: "案例受众", name: "小李",
time: "2022-10-31 23:12:00", bum: "产研部",
total: "3", numb: "000000",
state: "已发布", guishu: "",
type: "普通受众", },
{
key: 7,
name: "小李",
bum: "产研部",
numb: "000000",
guishu: "",
},
{
key: 8,
name: "小李",
bum: "产研部",
numb: "000000",
guishu: "",
},
{
key: 9,
name: "小李",
bum: "产研部",
numb: "000000",
guishu: "",
}, },
], ],
tablecolumns1: [ tablecolumns1: [
{ {
title: "受众名称", title: "姓名",
dataIndex: "name", dataIndex: "name",
key: "name", key: "name",
width: 30, width: 30,
@@ -427,42 +564,137 @@ export default {
className: "h", className: "h",
}, },
{ {
title: "创建时间", title: "工号",
dataIndex: "time", dataIndex: "numb",
key: "time", key: "numb",
width: 35,
align: "center",
className: "h",
},
{
title: "归属组织",
dataIndex: "guishu",
key: "guishu",
width: 30,
align: "center",
className: "h",
},
{
title: "部门",
dataIndex: "bum",
key: "bum",
width: 40, width: 40,
align: "center", align: "center",
className: "h", className: "h",
}, },
],
tabledata2: [
{ {
title: "人数", key: 1,
dataIndex: "total", name: "小李",
key: "total", bum: "产研部",
width: 20, numb: "000000",
align: "center", guishu: "",
className: "h",
}, },
{ {
title: "状态", key: 2,
dataIndex: "state", name: "小刘",
key: "state", bum: "产研部",
width: 20, numb: "000000",
align: "center", guishu: "",
className: "h",
}, },
{ {
title: "类型", key: 3,
dataIndex: "type", name: "小李",
key: "type", bum: "产研部",
numb: "000000",
guishu: "",
},
{
key: 4,
name: "小李",
bum: "产研部",
numb: "000000",
guishu: "",
},
{
key: 5,
name: "小李",
bum: "产研部",
numb: "000000",
guishu: "",
},
{
key: 6,
name: "小李",
bum: "产研部",
numb: "000000",
guishu: "",
},
{
key: 7,
name: "小李",
bum: "产研部",
numb: "000000",
guishu: "",
},
{
key: 8,
name: "小李",
bum: "产研部",
numb: "000000",
guishu: "",
},
{
key: 9,
name: "小李",
bum: "产研部",
numb: "000000",
guishu: "",
},
],
tablecolumns2: [
{
title: "姓名",
dataIndex: "name",
key: "name",
width: 30, width: 30,
align: "left",
className: "h",
},
{
title: "工号",
dataIndex: "numb",
key: "numb",
width: 35,
align: "center",
className: "h",
},
{
title: "归属组织",
dataIndex: "guishu",
key: "guishu",
width: 30,
align: "center",
className: "h",
},
{
title: "部门",
dataIndex: "bum",
key: "bum",
width: 40,
align: "center", align: "center",
className: "h", className: "h",
}, },
], ],
organizeList1: [ organizeList1: [
{ {
value: "项目一", value: "产品受众群体",
label: "项目一", label: "产品受众群体",
},
{
value: "人力资源hrbp",
label: "人力资源hrbp",
}, },
], ],
}); });
@@ -473,34 +705,41 @@ export default {
const afterVisibleChange = (bool) => { const afterVisibleChange = (bool) => {
console.log("state", bool); console.log("state", bool);
}; };
const onSelectChange = (selectedRowKeys) => {
console.log("selectedRowKeys changed: ", selectedRowKeys);
state.selectedRowKeys = selectedRowKeys;
};
const onSelectChange1 = (selectedRowKeys) => {
console.log("selectedRowKeys changed: ", selectedRowKeys);
state.selectedRowKeys = selectedRowKeys;
};
const onSelectChange2 = (selectedRowKeys) => {
console.log("selectedRowKeys changed: ", selectedRowKeys);
state.selectedRowKeys = selectedRowKeys;
};
return { return {
...toRefs(state), ...toRefs(state),
afterVisibleChange, afterVisibleChange,
closeDrawer, closeDrawer,
onSelectChange,
onSelectChange1,
onSelectChange2,
// change, // change,
}; };
}, },
}; };
</script> </script>
<style lang="scss" > <style lang="scss">
.AddLevelAddStu { .AddLevelAddStu {
// .ant-drawer-content-wrapper {
// // max-width: 1000px;
// .ant-drawer-header {
// display: none !important;
// }
// .ant-drawer-body {
// padding: 0;
// }
// }
.drawerMain { .drawerMain {
min-width: 600px; min-width: 600px;
margin: 0px 32px 0px 32px; margin: 0px 32px 0px 32px;
overflow-x: scroll; overflow-y: scroll;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.header { .header {
height: 73px; height: 73px;
border-bottom: 1px solid #e8e8e8; border-bottom: 1px solid #e8e8e8;
@@ -519,11 +758,12 @@ export default {
} }
.main { .main {
display: flex; display: flex;
height: 80%; // height: 80%;
margin-bottom: 72px;
.left { .left {
// overflow-y: auto; overflow-y: auto;
width: 65%; width: 65%;
height: 100%; // height: 100%;
border-right: 1px solid rgba(233, 233, 233, 1); border-right: 1px solid rgba(233, 233, 233, 1);
.tabs { .tabs {
margin-right: 33px; margin-right: 33px;
@@ -531,6 +771,11 @@ export default {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-between; justify-content: space-between;
align-items: center;
.t1 {
display: flex;
align-items: center;
}
.nameinp { .nameinp {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -578,6 +823,43 @@ export default {
} }
} }
} }
.btns {
display: flex;
margin-top: 10px;
.btn1 {
width: 100px;
height: 40px;
margin-right: 16px;
display: flex;
align-items: center;
justify-content: center;
color: #ffffff;
font-size: 14px;
background: #409eff;
border-radius: 8px;
border: 1px solid #409eff;
cursor: pointer;
.wz {
margin-left: 10px;
}
}
.btn2 {
width: 100px;
height: 40px;
display: flex;
align-items: center;
justify-content: center;
color: #409eff;
font-size: 14px;
background: #ffffff;
border-radius: 8px;
cursor: pointer;
border: 1px solid #409eff;
.wz {
margin-left: 10px;
}
}
}
.line { .line {
width: 100%; width: 100%;
height: 40px; height: 40px;
@@ -678,9 +960,16 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
margin-top: 10px; margin-top: 10px;
flex-wrap: wrap;
justify-content: space-between;
.t1 {
display: flex;
align-items: center;
}
.organize { .organize {
color: rgba(0, 0, 0, 0.85); color: rgba(0, 0, 0, 0.85);
font-size: 14px; font-size: 14px;
white-space: nowrap;
} }
.ant-select { .ant-select {
border-radius: 8px !important; border-radius: 8px !important;
@@ -696,6 +985,51 @@ export default {
height: 40px; height: 40px;
} }
} }
.ant-tree-select {
.dropdown {
width: 800px !important;
}
}
}
.searchdown {
.btns {
display: flex;
margin-top: 10px;
.btn1 {
width: 100px;
height: 40px;
margin-right: 16px;
display: flex;
align-items: center;
justify-content: center;
color: #ffffff;
font-size: 14px;
background: #409eff;
border-radius: 8px;
border: 1px solid #409eff;
cursor: pointer;
.wz {
margin-left: 10px;
}
}
.btn2 {
width: 100px;
height: 40px;
display: flex;
align-items: center;
justify-content: center;
color: #409eff;
font-size: 14px;
background: #ffffff;
border-radius: 8px;
cursor: pointer;
border: 1px solid #409eff;
.wz {
margin-left: 10px;
}
}
}
} }
} }
} }
@@ -707,13 +1041,27 @@ export default {
align-items: center; align-items: center;
margin-right: 40px; margin-right: 40px;
flex-wrap: wrap; flex-wrap: wrap;
.already { .onleft {
color: rgba(51, 51, 51, 1); display: flex;
font-size: 16px; text-align: center;
font-weight: 500; .already {
margin-left: 32px; color: rgba(51, 51, 51, 1);
white-space: nowrap; font-size: 16px;
// margin-bottom: 20px; font-weight: 500;
margin-left: 32px;
white-space: nowrap;
// margin-bottom: 20px;
}
.count {
color: #388be1;
font-size: 16px;
margin: 0 6px;
}
.peo {
color: rgba(51, 51, 51, 1);
font-size: 16px;
font-weight: 500;
}
} }
.clbox { .clbox {
margin-left: 30px; margin-left: 30px;
@@ -774,6 +1122,7 @@ export default {
height: 72px; height: 72px;
width: 100%; width: 100%;
position: absolute; position: absolute;
background-color: #fff;
bottom: 0; bottom: 0;
left: 0; left: 0;
display: flex; display: flex;
@@ -802,4 +1151,4 @@ export default {
} }
} }
} }
</style> </style>

View File

@@ -24,18 +24,26 @@
<div class="nameinp"> <div class="nameinp">
<div class="namee">姓名</div> <div class="namee">姓名</div>
<a-input <a-input
v-model:value="name" v-model:value="name"
style="width: 270px; height: 40px; border-radius: 8px" style="width: 270px; height: 40px; border-radius: 8px"
placeholder="请输入姓名" placeholder="请输入姓名"
/> />
</div> </div>
<div class="btns"> <div class="btns">
<div class="btn1"> <div class="btn1">
<div class="img1"><img src="../../assets/images/courseManage/search0.png"/></div> <div class="img1">
<img
src="../../assets/images/courseManage/search0.png"
/>
</div>
<div class="wz">搜索</div> <div class="wz">搜索</div>
</div> </div>
<div class="btn2"> <div class="btn2">
<div class="img2"><img src="../../assets/images/courseManage/reset1.png"/></div> <div class="img2">
<img
src="../../assets/images/courseManage/reset1.png"
/>
</div>
<div class="wz">重置</div> <div class="wz">重置</div>
</div> </div>
</div> </div>
@@ -86,9 +94,9 @@
<div class="tab2"> <div class="tab2">
<div class="organize">组织</div> <div class="organize">组织</div>
<a-cascader <a-cascader
v-model:value="value" v-model:value="value"
placeholder="请输入组织名称" placeholder="请输入组织名称"
:options="organizeList" :options="organizeList"
/> />
</div> </div>
</a-tab-pane> </a-tab-pane>
@@ -97,19 +105,27 @@
<div class="nameinp"> <div class="nameinp">
<div class="namee">受众名称</div> <div class="namee">受众名称</div>
<a-select <a-select
v-model:value="value" v-model:value="value"
style="width: 264px;border-radius: 8px" style="width: 264px; border-radius: 8px"
placeholder="请输入组织名称" placeholder="请输入组织名称"
:options="organizeList1" :options="organizeList1"
/> />
</div> </div>
<div class="btns"> <div class="btns">
<div class="btn1"> <div class="btn1">
<div class="img1"><img src="../../assets/images/courseManage/search0.png"/></div> <div class="img1">
<img
src="../../assets/images/courseManage/search0.png"
/>
</div>
<div class="wz">搜索</div> <div class="wz">搜索</div>
</div> </div>
<div class="btn2"> <div class="btn2">
<div class="img2"><img src="../../assets/images/courseManage/reset1.png"/></div> <div class="img2">
<img
src="../../assets/images/courseManage/reset1.png"
/>
</div>
<div class="wz">重置</div> <div class="wz">重置</div>
</div> </div>
</div> </div>
@@ -168,6 +184,78 @@
</div> </div>
</div> </div>
<div class="selecteds"> <div class="selecteds">
<div class="chose">
李明
<div class="ch"></div>
</div>
<div class="chose">
李明
<div class="ch"></div>
</div>
<div class="chose">
李明
<div class="ch"></div>
</div>
<div class="chose">
李明
<div class="ch"></div>
</div>
<div class="chose">
李明
<div class="ch"></div>
</div>
<div class="chose">
李明
<div class="ch"></div>
</div>
<div class="chose">
李明
<div class="ch"></div>
</div>
<div class="chose">
李明
<div class="ch"></div>
</div>
<div class="chose">
李明
<div class="ch"></div>
</div>
<div class="chose">
李明
<div class="ch"></div>
</div>
<div class="chose">
李明
<div class="ch"></div>
</div>
<div class="chose">
李明
<div class="ch"></div>
</div>
<div class="chose">
李明
<div class="ch"></div>
</div>
<div class="chose">
李明
<div class="ch"></div>
</div>
<div class="chose">
李明
<div class="ch"></div>
</div>
<div class="chose">
李明
<div class="ch"></div>
</div>
<div class="chose">
李明
<div class="ch"></div>
</div>
<div class="chose">
李明
<div class="ch"></div>
</div>
<div class="chose"> <div class="chose">
李明 李明
<div class="ch"></div> <div class="ch"></div>
@@ -201,7 +289,6 @@
</div> </div>
</div> </div>
</a-drawer> </a-drawer>
</template> </template>
<script> <script>
@@ -227,38 +314,38 @@ export default {
label: "京东方", label: "京东方",
children: [ children: [
{ {
id:2, id: 2,
value: "产研部", value: "产研部",
label: "产研部", label: "产研部",
children: [ children: [
{ {
id:4, id: 4,
value: "产品部门", value: "产品部门",
label: "产品部门", label: "产品部门",
}, },
{ {
id:5, id: 5,
value: "研发部门", value: "研发部门",
label: "研发部门", label: "研发部门",
}, },
], ],
}, },
{ {
id:3, id: 3,
value: "人力资源部", value: "人力资源部",
label: "人力资源部", label: "人力资源部",
children: [ children: [
{ {
id:6, id: 6,
value: "人事部", value: "人事部",
label: "人事部", label: "人事部",
}, },
{ {
id:7, id: 7,
value: "行政部", value: "行政部",
label: "行政部", label: "行政部",
}, },
], ],
}, },
], ],
}, },
@@ -393,7 +480,7 @@ export default {
total: "3", total: "3",
state: "已发布", state: "已发布",
type: "普通受众", type: "普通受众",
}, },
], ],
tablecolumns1: [ tablecolumns1: [
{ {
@@ -449,7 +536,7 @@ export default {
const stuaddChange = (e) => { const stuaddChange = (e) => {
state.stuaddTab = e; state.stuaddTab = e;
} };
const afterVisibleChange = (bool) => { const afterVisibleChange = (bool) => {
console.log("state", bool); console.log("state", bool);
@@ -466,7 +553,7 @@ export default {
}; };
</script> </script>
<style lang="scss" > <style lang="scss">
.stuadd { .stuadd {
// .ant-drawer-content-wrapper { // .ant-drawer-content-wrapper {
// // max-width: 1000px; // // max-width: 1000px;
@@ -808,4 +895,4 @@ export default {
} }
} }
} }
</style> </style>

View File

@@ -407,8 +407,8 @@
<div <div
class="taskbox" class="taskbox"
style=" style="
background: linear-gradient(180deg, #ddeaff, #f0f8fe); background: linear-gradient(180deg, #ddeaff, #f0f8fe);
display:none; display: none;
" "
> >
<div class="leftt"> <div class="leftt">
@@ -533,7 +533,7 @@
<div class="tab" style="margin: 20px 32px 30px 32px"> <div class="tab" style="margin: 20px 32px 30px 32px">
<a-table <a-table
style="border: 1px solid #f2f6fe" style="border: 1px solid #f2f6fe"
:columns="tablecolumns" :columns="studentColumns()"
:data-source="tabledata" :data-source="tabledata"
:loading="tableDataTotal === -1 ? true : false" :loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true" expandRowByClick="true"
@@ -794,6 +794,7 @@
<p style="margin-top: 35px">公告内容</p> <p style="margin-top: 35px">公告内容</p>
<a-textarea <a-textarea
v-model:value="noticeContent" v-model:value="noticeContent"
placeholder="请输入要发布的公告"
show-count show-count
:maxlength="150" :maxlength="150"
style="margin-top: -10px; height: 110px" style="margin-top: -10px; height: 110px"
@@ -804,52 +805,58 @@
</div> </div>
</div> </div>
</a-tab-pane> </a-tab-pane>
<a-tab-pane key="5" tab="项目积分"> <a-tab-pane key="5" tab="项目积分">
<div class="split"></div> <div class="split"></div>
<div class="content3"> <div class="content3">
<a-tabs v-model:activeKey="activeKey2"> <a-tabs v-model:activeKey="activeKey2">
<a-tab-pane key="1" tab="学员获取"> <a-tab-pane key="1" tab="学员获取"> </a-tab-pane>
</a-tab-pane> <a-tab-pane key="2" tab="榜单"> </a-tab-pane>
<a-tab-pane key="2" tab="榜单">
</a-tab-pane>
<a-tab-pane key="3" tab="获取规则"> <a-tab-pane key="3" tab="获取规则">
<div class="projectscore"> <div class="projectscore">
<div class="pjc_body"> <div class="pjc_body">
<div class="pjcb_header"> <div class="pjcb_header">
<span>规则</span> <span>规则</span>
<div class="edit_btn"> <div class="edit_btn">
<div class="edit"></div> <div class="edit"></div>
<div class="btnText">编辑</div> <div class="btnText">编辑</div>
</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>
<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> </div>
</a-tab-pane> </a-tab-pane>
</a-tabs> </a-tabs>
@@ -1501,34 +1508,34 @@
<!-- 删除弹窗 --> <!-- 删除弹窗 -->
<div> <div>
<a-modal <a-modal
v-model:visible="delete_hs" v-model:visible="delete_hs"
:footer="null" :footer="null"
:closable="closableQR" :closable="closableQR"
wrapClassName="DelModal" wrapClassName="DelModal"
style="margin-top: 400px" style="margin-top: 400px"
> >
<div class="delete" :style="{ display: delete_hs ? 'block' : 'none' }"> <div class="delete" :style="{ display: delete_hs ? 'block' : 'none' }">
<div class="del_header"></div> <div class="del_header"></div>
<div class="del_main"> <div class="del_main">
<div class="header"> <div class="header">
<div class="del-icon"></div> <div class="del-icon"></div>
<span>提示</span> <span>提示</span>
<div class="close_exit" @click="delete_exit"></div> <div class="close_exit" @click="delete_exit"></div>
</div>
<div class="body">
<span>您确定要删除此课程吗</span>
</div>
<div class="del_btnbox">
<div class="del_btn btn1">
<div class="btnText" @click="delete_exit">取消</div>
</div> </div>
<div class="del_btn btn2"> <div class="body">
<div class="btnText" @click="delete_exit">确定</div> <span>您确定要删除此课程吗</span>
</div>
<div class="del_btnbox">
<div class="del_btn btn1">
<div class="btnText" @click="delete_exit">取消</div>
</div>
<div class="del_btn btn2">
<div class="btnText" @click="delete_exit">确定</div>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </a-modal>
</a-modal>
</div> </div>
<!-- 删除弹窗 --> <!-- 删除弹窗 -->
</div> </div>
@@ -1597,6 +1604,7 @@ export default {
diploma: "0", diploma: "0",
stutime: "2022-10-31 23:12:00", stutime: "2022-10-31 23:12:00",
putin: "手动加入", putin: "手动加入",
excellent: true, //是否是优秀学员
}, },
{ {
key: 2, key: 2,
@@ -1608,6 +1616,7 @@ export default {
diploma: "0", diploma: "0",
stutime: "2022-10-21 23:12:00", stutime: "2022-10-21 23:12:00",
putin: "手动加入", putin: "手动加入",
excellent: false, //是否是优秀学员
}, },
{ {
key: 3, key: 3,
@@ -1619,6 +1628,7 @@ export default {
diploma: "0", diploma: "0",
stutime: "2022-10-11 23:12:00", stutime: "2022-10-11 23:12:00",
putin: "手动加入", putin: "手动加入",
excellent: false, //是否是优秀学员
}, },
{ {
key: 4, key: 4,
@@ -1630,86 +1640,10 @@ export default {
diploma: "0", diploma: "0",
stutime: "2022-10-31 23:12:00", stutime: "2022-10-31 23:12:00",
putin: "手动加入", putin: "手动加入",
excellent: true, //是否是优秀学员
}, },
], ],
tablecolumns: [
{
title: "姓名",
dataIndex: "name",
key: "name",
width: 30,
align: "left",
className: "h",
},
{
title: "部门",
dataIndex: "bum",
key: "bum",
width: 40,
align: "center",
className: "h",
},
{
title: "岗位",
dataIndex: "gangw",
key: "gangw",
width: 40,
align: "center",
className: "h",
},
{
title: "所属小组",
dataIndex: "group",
key: "group",
width: 40,
align: "center",
className: "h",
},
{
title: "进度",
dataIndex: "progress",
key: "progress",
width: 40,
align: "center",
className: "h",
},
{
title: "证书",
dataIndex: "diploma",
key: "diploma",
width: 40,
align: "center",
className: "h",
},
{
title: "最近学习时间",
dataIndex: "stutime",
key: "stutime",
width: 50,
align: "center",
className: "h",
sorter: {
compare: (a, b) => a.stutime - b.stutime,
multiple: 3,
},
},
{
title: "加入方式",
dataIndex: "putin",
key: "putin",
width: 40,
align: "center",
className: "h",
},
{
title: "操作",
dataIndex: "operations",
key: "operations",
width: 60,
align: "center",
className: "h",
},
],
//进度排行学员 //进度排行学员
rankjindu: [{ value: "学员", label: "学员" }], rankjindu: [{ value: "学员", label: "学员" }],
valuestu1: "学员", valuestu1: "学员",
@@ -1735,7 +1669,7 @@ export default {
Seevisible: false, //查看学员 Seevisible: false, //查看学员
Changevisible: false, //学员换组 Changevisible: false, //学员换组
edit_hs: false, //编辑弹窗 edit_hs: false, //编辑弹窗
delete_hs:false, //删除弹窗 delete_hs: false, //删除弹窗
pubproject: false, pubproject: false,
stugroup: false, stugroup: false,
canclestu: false, canclestu: false,
@@ -1746,16 +1680,16 @@ export default {
checkedd2: false, //设置按钮2 checkedd2: false, //设置按钮2
radioV1: "", radioV1: "",
radioV2: "", radioV2: "",
activeKey: "2", activeKey: "3",
activeKey1: "8", activeKey1: "8",
activeKey2: "3", activeKey2: "3",
inputValue:5, inputValue: 5,
inputValue2:5, inputValue2: 5,
inputValue3:5, inputValue3: 5,
valueName: "", //排行榜输入姓名 valueName: "", //排行榜输入姓名
valueDate: "", //排行榜输入日期 valueDate: "", //排行榜输入日期
noticeChecked: true, noticeChecked: true,
noticeContent: "请输入要发布的公告", noticeContent: "",
TaskFaceImpStuvisible: false, //批量面授报名 TaskFaceImpStuvisible: false, //批量面授报名
//进度排行表 //进度排行表
@@ -2227,10 +2161,14 @@ export default {
> >
优秀学员 优秀学员
</div> </div>
<div class="jc" <div
class="jc"
onClick={() => { onClick={() => {
state.Seevisible = true; state.Seevisible = true;
}}>查看</div> }}
>
查看
</div>
<div class="tableSelect"> <div class="tableSelect">
<a-select <a-select
style="width: 50px;margin-top:2px;margin-left:25px" style="width: 50px;margin-top:2px;margin-left:25px"
@@ -2274,7 +2212,7 @@ export default {
}); });
state.tableData = datas; state.tableData = datas;
}; };
getTableDate() getTableDate();
const showModal = () => { const showModal = () => {
state.pubproject = true; state.pubproject = true;
@@ -2372,6 +2310,162 @@ export default {
state.radioV2 = ""; state.radioV2 = "";
} }
}; };
//学员管理列表操作
const studentData = () => {
let arr = state.tabledata;
arr.map((value) => {
value.operation = (
<div
style={{
display: "flex",
alignItems: "center",
justifyContent: "center",
}}
>
<div class="studentopea1">
{value.excellent ? "取消优秀" : "优秀学员"}
</div>
<div class="studentopea2">查看</div>
<div class="studentSelect">
<a-select
style="width: 50px"
value="更多"
// options={state.projectNameList}
dropdownClassName="tabledropdown"
>
<a-select-option value="换组" label="换组">
<div>换组</div>
</a-select-option>
<a-select-option value="删除" label="删除">
<div
onClick={() => {
console.log("点击了111");
}}
>
删除
</div>
</a-select-option>
</a-select>
</div>
</div>
);
});
state.tabledata = arr;
// console.log("state.tabledata", state.tabledata);
};
studentData();
const studentColumns = () => {
const tablecolumns = [
{
title: "姓名",
dataIndex: "name",
key: "name",
width: 50,
align: "left",
className: "h",
// scopedSlots: { customRender: "action" }, //引入的插槽
customRender: (text) => {
console.log(text.excellent);
return (
<div>
{text.record.excellent ? (
<div
style={{
display: "flex",
alignItems: "center",
}}
>
<span class="stydentName">{text.value}</span>
<div class="studentExcellent">
<img
class="studentExcellentImg"
src={require("../../assets/images/taskpage/excellent.png")}
/>
<span class="studentExcellentT">优秀</span>
</div>
</div>
) : (
<div>
<span>{text.value}</span>
</div>
)}
</div>
);
},
},
{
title: "部门",
dataIndex: "bum",
key: "bum",
width: 40,
align: "center",
className: "h",
},
{
title: "岗位",
dataIndex: "gangw",
key: "gangw",
width: 40,
align: "center",
className: "h",
},
{
title: "所属小组",
dataIndex: "group",
key: "group",
width: 40,
align: "center",
className: "h",
},
{
title: "进度",
dataIndex: "progress",
key: "progress",
width: 30,
align: "center",
className: "h",
},
{
title: "证书",
dataIndex: "diploma",
key: "diploma",
width: 30,
align: "center",
className: "h",
},
{
title: "最近学习时间",
dataIndex: "stutime",
key: "stutime",
width: 50,
align: "center",
className: "h",
// sorter: {
// compare: (a, b) => a.stutime - b.stutime,
// multiple: 3,
// },
},
{
title: "加入方式",
dataIndex: "putin",
key: "putin",
width: 40,
align: "center",
className: "h",
},
{
title: "操作",
dataIndex: "operation",
key: "operation",
width: 60,
align: "center",
className: "h",
},
];
return tablecolumns;
};
const delete_exit = () => { const delete_exit = () => {
state.delete_hs = false; state.delete_hs = false;
}; };
@@ -2402,6 +2496,7 @@ export default {
edit_exit, edit_exit,
cloradio1, cloradio1,
cloradio2, cloradio2,
studentColumns,
delete_exit, delete_exit,
}; };
}, },
@@ -3190,7 +3285,7 @@ export default {
} }
.taskSyllabus { .taskSyllabus {
// flex: 1; // flex: 1;
overflow-x: scroll; overflow-x: auto;
.ant-collapse { .ant-collapse {
border: 0px; border: 0px;
@@ -3593,32 +3688,125 @@ export default {
justify-content: right; justify-content: right;
// position: absolute; // position: absolute;
// bottom: 20px; // bottom: 20px;
} }
.operation { .operation {
display: flex; display: flex;
justify-content: center;
align-items: center;
color: #4ea6ff;
.nselect {
justify-content: center; justify-content: center;
align-items: center; align-items: center;
display: flex; color: #4ea6ff;
.jc { .nselect {
margin-left: 20px; justify-content: center;
cursor: pointer; align-items: center;
display: flex;
.jc {
margin-left: 20px;
cursor: pointer;
white-space: nowrap;
}
}
.tableSelect {
margin-right: 10px;
margin-left: -5px;
display: flex;
align-items: center;
justify-content: right;
white-space: nowrap; white-space: nowrap;
} }
} }
.tableSelect { .studentName {
margin-right: 10px; font-size: 14px;
margin-left: -5px; font-weight: 400;
color: rgba(0, 0, 0, 0.65);
line-height: 22px;
}
.studentExcellent {
width: 64px;
height: 24px;
border-radius: 2px;
border: 1px solid #ffb64e;
background-color: rgba(255, 182, 78, 0.1);
margin-left: 24px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: right; .studentExcellentImg {
white-space: nowrap; width: 16px;
height: 16px;
margin-left: 7px;
}
.studentExcellentT {
font-size: 12px;
font-weight: 400;
color: #ffb64e;
line-height: 17px;
margin-left: 3px;
}
}
.studentopea1 {
font-size: 14px;
font-weight: 400;
color: #387df7;
line-height: 22px;
padding-right: 8px;
border-right: 1px solid #e9e9e9;
cursor: pointer;
}
.studentopea2 {
font-size: 14px;
font-weight: 400;
color: #387df7;
line-height: 22px;
padding-right: 8px;
padding-left: 8px;
border-right: 1px solid #e9e9e9;
cursor: pointer;
}
.studentSelect {
margin-left: 8px;
display: inline-block;
.ant-select:not(.ant-select-customize-input)
.ant-select-selector
.ant-select-selection-search-input {
background-color: rgba(255, 255, 255, 0);
border: none;
}
.ant-select:not(.ant-select-customize-input) .ant-select-selector {
background-color: rgba(255, 255, 255, 0);
border: none;
}
.ant-select-single:not(.ant-select-customize-input)
.ant-select-selector {
padding: 0;
}
.ant-select-focused:not(.ant-select-disabled).ant-select:not(.ant-select-customize-input)
.ant-select-selector {
box-shadow: none;
}
.ant-select-arrow {
right: 0px;
color: rgba(56, 125, 247, 1);
font-size: 14px;
line-height: 36px;
// top: 17px;
top: 15px;
}
.ant-select-selection-item {
font-size: 14px;
font-weight: 400;
color: rgba(56, 125, 247, 1);
line-height: 33px;
}
.ant-select-single.ant-select-open .ant-select-selection-item {
color: rgba(56, 125, 247, 1);
}
} }
}
} }
.groupmain { .groupmain {
display: flex; display: flex;
@@ -3753,54 +3941,53 @@ export default {
} }
} }
} }
.projectscore{ .projectscore {
.pjc_body{ .pjc_body {
margin-left:34px; margin-left: 34px;
margin-right:34px; margin-right: 34px;
.pjcb_header{ .pjcb_header {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
margin:24px auto; margin: 24px auto;
.edit_btn{ .edit_btn {
width: 100px; width: 100px;
// padding: 0px 26px 0px 26px; // padding: 0px 26px 0px 26px;
height: 38px; height: 38px;
background: rgb(64, 158, 255); background: rgb(64, 158, 255);
border-radius: 8px; border-radius: 8px;
border: 1px solid rgba(64, 158, 255, 1); border: 1px solid rgba(64, 158, 255, 1);
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
flex-shrink: 0; flex-shrink: 0;
cursor: pointer; cursor: pointer;
.edit { .edit {
width: 15px; width: 15px;
height: 15px; height: 15px;
background-image: url(@/assets/images/coursewareManage/export1.png); background-image: url(@/assets/images/coursewareManage/export1.png);
background-size: 100% 100%; background-size: 100% 100%;
}
.btnText {
font-size: 14px;
font-weight: 400;
color: rgb(255, 255, 255);
line-height: 36px;
margin-left: 5px;
}
}
} }
.pjcb_content{ .btnText {
border: 1px solid #388BE1; font-size: 14px;
padding: 32px; font-weight: 400;
.pjcb_content :last-child{ color: rgb(255, 255, 255);
margin-bottom:0px; line-height: 36px;
} margin-left: 5px;
.content{
margin-bottom:24px;
}
} }
}
} }
.pjcb_content {
border: 1px solid #388be1;
padding: 32px;
.pjcb_content :last-child {
margin-bottom: 0px;
}
.content {
margin-bottom: 24px;
}
}
}
} }
} }
.content6 { .content6 {