From ab652a0924f14b551d349c2f3d2b11e64fefa849 Mon Sep 17 00:00:00 2001 From: songwc Date: Thu, 20 Oct 2022 10:51:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?style=EF=BC=9Atable=E6=B8=B2=E6=9F=93?= =?UTF-8?q?=E5=9B=BE=E7=89=87=20=E4=BF=AE=E6=94=B9=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E7=B1=BB=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/taskpage/one.png | Bin 0 -> 1367 bytes src/assets/images/taskpage/three.png | Bin 0 -> 1391 bytes src/assets/images/taskpage/two.png | Bin 0 -> 1121 bytes src/views/learningpath/LearningPath.vue | 323 +++++++++++----------- src/views/learningpath/LevelAddDetail.vue | 267 +++++++++--------- src/views/projectcenter/TaskPage.vue | 22 ++ 6 files changed, 322 insertions(+), 290 deletions(-) create mode 100644 src/assets/images/taskpage/one.png create mode 100644 src/assets/images/taskpage/three.png create mode 100644 src/assets/images/taskpage/two.png diff --git a/src/assets/images/taskpage/one.png b/src/assets/images/taskpage/one.png new file mode 100644 index 0000000000000000000000000000000000000000..1c8b3950528b45762e85fc99ec6c67b90c2c84d8 GIT binary patch literal 1367 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 literal 0 HcmV?d00001 diff --git a/src/assets/images/taskpage/two.png b/src/assets/images/taskpage/two.png new file mode 100644 index 0000000000000000000000000000000000000000..1f2f85b5810398f9c15d2109e6198ec186421407 GIT binary patch literal 1121 zcmV-n1fKheP)Px(8%ab#R7gvOR!vMBR}h|A^J9B4VDoP(d&Q;Y`y`r=dLM?|RN~D}p z^^il9oFb)abD$AIN-M5W616$Qg&T*SA^~E>kNLOxTkjg|H_`XXvv!G_jI{FVz1jKR zd^6uXGkwB}#bTd`d}~?OS0eHSGq=NCL=KtxU!~OF%=|hYk8k~77_PP9x^CLCtcOH2 zDI#_7@qM3mcXzdWcXu~Mqf!0N%w-~)Q%XIwZ98{8-bVng>wd$`e-Tjv&Xr1qHa0eB zdwZK28XENX7Z(@Q+uKY1{rwb)L`=*x5xHsG_M0F`2*CIKJ4&f%L}bBfZ*Py**Vnaw zOG`@#;N;{)uMZ3iP*+!%iK#5hx)+T`e=`eJfUA?gLh#emQ(9YFqhhg0?d|Q<)YPOY z3K}RnKR>6#!$XS4<1{!pNX^a7a8V-ioykN4fOBSkUn-Rnj^oh&{yy2ZO|7l16pO`l zTmUGg^t)wQ)f#x7N5{vC!?=H_PI*47qvbaaHMKrmz? zB6N9qsrNt+GgF~Z_=viLg9Ga8>!VC2Qx=f{c3t-tGyjfG!DcFzs#1YqpbCYoW#}w` z7z1_rd|n?C9VQ~T+4H=AMC3~V9336$9tYQWkS;Pvr_-8uV^~85$oTB+OjC$`JkUy8 zTbl-8=69e7D(npc1W$`V<}vHg0BW$avxEADk_!S5(Ka&hMWhh`=pLY((;zSkj_#;s z@JC^hEoy{cumJz73`!vY2n#g`S~8i`s;y-ZA=)!&r~!mm1qf193ji5pG8x^5;5=w( zThqE`JqTbZsunp20D7PSs1qrJ0uv1H*oTTy1FRbnUd!NJs7(z33RquXuY*9zJv}`& zDaz$?S_eiW$TA3^+cYRN^fmZ46VkLQv|tpBUy}*=H!W(^3{b?V3Jn{$ZZQOc%8?01J7yFnDhiGR4Gj%F85 z8F8!k!OYCeU@DcmYgyKFKo)fZ-Gu&%(mOd@h&MmBpaLd_n`5y8$OfAu$%rjh9ZR-SP49iBDdc24rq-?)yrm z@-myv%IN4Qga2BWKI*Wvv?Pw>a3m7>VRCZv&+GkM^Iyg6>}*0ro=!|mJQ9(wKl8Wc n?fm@wFU)*@YHI2~t^)P}1woTTdwXwQ00000NkvXXu0mjfI3@jF literal 0 HcmV?d00001 diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index 158e78c1..d5c582a6 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -95,6 +95,7 @@ centered="true" v-model:visible="out" :footer="null" + wrapClassName="CreatePath" >
@@ -534,193 +535,195 @@ export default { }; \ 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, }; }, }; From 9ea843b46b1c6f116ae0b2f578e42e12cdf161a6 Mon Sep 17 00:00:00 2001 From: songwc Date: Thu, 20 Oct 2022 15:23:58 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat=EF=BC=9A=E5=AD=A6=E4=B9=A0=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E5=9B=BE=E6=96=B0=E5=A2=9E=E5=8F=91=E5=B8=83=EF=BC=8C?= =?UTF-8?q?=E5=A4=8D=E5=88=B6=EF=BC=8C=E6=92=A4=E5=9B=9E=EF=BC=8C=E5=90=AF?= =?UTF-8?q?=E7=94=A8=EF=BC=8C=E5=81=9C=E7=94=A8=EF=BC=8C=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=B8=B2=E6=9F=93=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/learningpath/LearningPath.vue | 772 +++++++++++++++++++++--- src/views/projectcenter/TaskPage.vue | 15 +- 2 files changed, 697 insertions(+), 90 deletions(-) diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index d5c582a6..b837c39d 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -71,7 +71,7 @@ :data-source="tableData" :loading="tableDataTotal === -1 ? true : false" expandRowByClick="true" - :scroll="{ x: 1600 }" + :scroll="{ x: 1550 }" @expand="expandTable" :pagination="false" /> @@ -90,6 +90,7 @@ +
+ + +
+
+ + 路径发布 +
+
+ +
+
+
+
产品经理上升路径
+
+ 路径时间：2022/08/01-2022/08/30 +
+
+
+
路径信息
+
当前路径共0个阶段，0个任务
+
+
+
学员信息
+
路径共0名学员
+
+
+
+ + 发送路径通知 +
+
+ 发给老师 + 发给学员 +
+
+ 取消 + 发布 +
+
+ + + +
+
+
+
+
+ 提示 +
+
+
+ 您确定要复制此路径吗 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+ + + +
+
+
+
+
+ 提示 +
+
+
+ 您确定要停用此路径吗 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+ + + +
+
+
+
+
+ 提示 +
+
+
+ 您确定要删除此路径吗 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+ + + +
+
+
+
+
+ 提示 +
+
+
+ 您确定要启用此路径吗 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+ + + +
+
+
+
+
+ 提示 +
+
+
+ 是否撤回路径 +
（路径撤回后学员进度保留，发布后可继续学习）
+
+
+
+
取消
+
+
+
确定
+
+
+
+
+