diff --git a/src/assets/images/taskpage/upload.png b/src/assets/images/taskpage/upload.png new file mode 100644 index 00000000..b5abb1bc Binary files /dev/null and b/src/assets/images/taskpage/upload.png differ diff --git a/src/components/drawers/ImportStu.vue b/src/components/drawers/ImportStu.vue new file mode 100644 index 00000000..e0bc373d --- /dev/null +++ b/src/components/drawers/ImportStu.vue @@ -0,0 +1,305 @@ + + + + + \ No newline at end of file diff --git a/src/components/drawers/StuAdd.vue b/src/components/drawers/StuAdd.vue index 6efcfdb0..2c44005f 100644 --- a/src/components/drawers/StuAdd.vue +++ b/src/components/drawers/StuAdd.vue @@ -3,7 +3,7 @@ :visible="Stuvisible" class="drawerStyle stuadd" placement="right" - width="60%" + width="50%" @after-visible-change="afterVisibleChange" >
@@ -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, + }" + /> +
+ +
+
+ + +
+
组织：
+ +
+ + +
+
+
受众名称：
+ +
+
+
+
+
搜索
+
+
+
+
重置
+
+
+
+
+
+
+
+
已选择
+
2
+
项
+
列表选项总计：
+
9条
+
+
清空
+
+
+
+ Content of Tab Pane 2 - Content of Tab Pane 3
@@ -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 { diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 0179b6c1..f90b96db 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -536,11 +536,11 @@
-
+
添加学员
-
+
导入学员
@@ -1018,6 +1018,10 @@ + + + + @@ -1199,6 +1203,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: { @@ -1210,6 +1216,8 @@ export default { ActiveAttendance, WorkManage, TestManage, + StuAdd, + ImportStu, }, setup() { const state = reactive({ @@ -1374,6 +1382,8 @@ export default { AAvisible: false, //活动考勤 Wvisible: false, //作业管理 TMvisible: false, //考试管理 + Stuvisible: false, //添加学员 + Importvisible: false, //导入学员 pubproject: false, stugroup: false, checked: false, @@ -1436,7 +1446,12 @@ export default { const showTest = () => { state.TMvisible = true; }; - + const showStuAdd = () => { + state.Stuvisible = true; + }; + const showImportStu = () => { + state.Importvisible = true; + }; const changecheck2 = () => { state.checkedd = !state.checkedd; }; @@ -1459,6 +1474,8 @@ export default { showTest, changecheck2, changecheck3, + showStuAdd, + showImportStu, }; }, };