From 94c1beb384778f5ec905f7cd336c5bbd5aed4eb6 Mon Sep 17 00:00:00 2001 From: dongwug Date: Thu, 20 Oct 2022 14:17:57 +0800 Subject: [PATCH 01/10] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=20=E5=88=A0=E9=99=A4=20=E5=A4=8D=E5=88=B6?= =?UTF-8?q?=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/coursewareManage/imgs.png | Bin 0 -> 1541 bytes src/views/courselibrary/CoursewareManage.vue | 324 +++++++++++++++---- 2 files changed, 254 insertions(+), 70 deletions(-) create mode 100644 src/assets/images/coursewareManage/imgs.png diff --git a/src/assets/images/coursewareManage/imgs.png b/src/assets/images/coursewareManage/imgs.png new file mode 100644 index 0000000000000000000000000000000000000000..71f006bc387268fee21125e12f469a2080417b06 GIT binary patch literal 1541 zcmeAS@N?(olHy`uVBq!ia0vp^GC-`r!3HE5w@NqxDajJoh?3y^w370~qErUQl>DSr z1<%~X^wgl##FWaylc_cg49u#TArU1JzCKpT`MG+DAT@dwxdlMo3=B5*6$OdO*{LN8 zNvY|XdA3ULckfqH$V{%1*XSQL?vFu&J;D8jzb> zlBiITo0C^;Rbi_HHrEQs1_|pcDS(xfWZNo192Makpx~Tel&WB+XP}#GU|^(RZmDNz zW@2Jyprc@9U}T_gV5)Cuq-$tqWnf}uXs!SSNh+i#(Mch>H3D2mX`VkM*2oZxQ#zd*srP|rv~!#6QG zGY=%93D)B4Yvq|&T#}fVoa*Ufs{}MeFEca6%GAlg!pOkF*u=ur%+S!)#nH{##KO?b z#l+as+0oF|45rs5Ke;qFHLnDwHwB^B1gBn5YRD}B+U$~Alv$RV;#QQOs{r=3RVHq? z7~(V!sy79; z_hPZa57s{nT?q%dGaPC!lxMOYbXs^L>R?=x=jO*Vw~8&gxg)mxbNkaX@6Ozme{Qt< zu+{Q(MIJ-ew$%)W3RW=Z9&GK2m)6sMGxtZ-wwU8DcX@6&`M=RKl;_P0j#d1bJ9gi+ z(reklGhO6~PISP}V5wtkudOIyeX!_|*86j*UnVJT$aj`7;5m?Rz|GeoXW5m~qapjI zpNU>ARkf()*!Rhm7mXH#+*&TD{P~3N0!5d@&u2DR`8;cUePCzN)uMHW*UwWbz90JF zQI+WV{cEDmJ$JgLYE&Na?c|wqDVG@U+^uaYOQ##A?c|qTZU5-_#1M|9OG|4aetul- zHmfP$w?>BfdrR#MyBY1rBv)-Y%^qKW>`d0v`E`BS6((zE8)#uX#ucKytW zB};U5*WUcJdG4i+H8TC;VH;vr&irmv>zw~=Tb4z(^4x8Wp7Wbt@6~h(>8qYUZTq~_ zZa?qpl%;Afz22qiV%itj6|^;@{CY#}m0!v`S6IH|StW7i#XTnV-+RoL=GNK2f4cM3 z?cmv>0bBTvpJGYTk3J^+NY6atE!Wl)CU>vx>FN1YF`Lc2j>~}I{jMo{o1!>HK?Sp? LtDnm{r-UW|Y;aMT literal 0 HcmV?d00001 diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 69d0a485..aad38383 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -67,7 +67,7 @@
-
导出
+
导出
@@ -120,7 +120,7 @@
课程命名规则
-
+
课程命名规则
-
+
附件
-
+
-
-
在线课程管理 @@ -811,7 +805,7 @@
查看详情
@@ -860,7 +854,7 @@
授权
@@ -960,7 +954,7 @@
开课
@@ -1257,7 +1251,7 @@
学员管理
@@ -1407,13 +1401,11 @@
-
-
-
取消
-
-
-
确定
-
+
@@ -1600,11 +1592,77 @@
+ + +
+
+
+
+
+ 提示 +
+
+
+ 您确定要删除此课程吗 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+
+ + + +
+
+
+
+
+ 提示 +
+
+
+ 您确定要复制此课程吗 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+
+
+ + \ No newline at end of file diff --git a/src/components/drawers/PowerList.vue b/src/components/drawers/PowerList.vue new file mode 100644 index 00000000..a87f8571 --- /dev/null +++ b/src/components/drawers/PowerList.vue @@ -0,0 +1,546 @@ + + + + + \ No newline at end of file diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index b837c39d..36cc7d77 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -398,13 +398,20 @@
+ + + +
+ + \ No newline at end of file diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index b7162605..748a3862 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -1406,13 +1406,17 @@ :closable="closableQR" wrapClassName="QRModal" style="margin-top: 400px" + destroyOnClose >
- 二维码 +
二维码
+
在线课
+
面授课
+
面授课签到
@@ -1700,11 +1704,15 @@
+ + +
+ + \ No newline at end of file diff --git a/src/components/drawers/SeeStu.vue b/src/components/drawers/SeeStu.vue new file mode 100644 index 00000000..d79b413c --- /dev/null +++ b/src/components/drawers/SeeStu.vue @@ -0,0 +1,360 @@ + + + + + \ No newline at end of file diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 357f0090..f97c4415 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -1049,6 +1049,8 @@ + + @@ -1227,6 +1229,7 @@ import FaceStu from "../../components/drawers/FaceStu"; import TestManage from "../../components/drawers/TestManage"; import StuAdd from "../../components/drawers/StuAdd"; import ImportStu from "../../components/drawers/ImportStu"; +import SeeStu from "../../components/drawers/SeeStu"; export default { name: "taskPage", components: { @@ -1240,6 +1243,7 @@ export default { TestManage, StuAdd, ImportStu, + SeeStu, }, setup() { const state = reactive({ @@ -1406,6 +1410,7 @@ export default { TMvisible: false, //考试管理 Stuvisible: false, //添加学员 Importvisible: false, //导入学员 + Seevisible: true, //查看学员 pubproject: false, stugroup: false, checked: false, @@ -1739,6 +1744,9 @@ export default { const showStuAdd = () => { state.Stuvisible = true; }; + const showSeeStu = () => { + state.Seevisible = true; + }; const showImportStu = () => { state.Importvisible = true; }; @@ -1766,6 +1774,7 @@ export default { changecheck3, showStuAdd, showImportStu, + showSeeStu, }; }, }; From ad174acb3036355a071398b7de9f573f0b5797cf Mon Sep 17 00:00:00 2001 From: dongwug Date: Fri, 21 Oct 2022 10:47:59 +0800 Subject: [PATCH 09/10] =?UTF-8?q?feat:=E6=8E=88=E6=9D=83=E5=90=8D=E5=8D=95?= =?UTF-8?q?=20=E6=8E=88=E6=9D=83=E5=BC=B9=E7=AA=97=E6=A0=B7=E5=BC=8F=20?= =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E9=80=80=E5=87=BA=E6=B8=85=E9=99=A4?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/CorPowerlist.vue | 352 +++++ src/components/drawers/OwnPower.vue | 1402 +++++++++--------- src/components/drawers/Ownership.vue | 1 + src/views/courselibrary/CoursewareManage.vue | 294 ++-- 4 files changed, 1246 insertions(+), 803 deletions(-) create mode 100644 src/components/drawers/CorPowerlist.vue diff --git a/src/components/drawers/CorPowerlist.vue b/src/components/drawers/CorPowerlist.vue new file mode 100644 index 00000000..34c4d1e7 --- /dev/null +++ b/src/components/drawers/CorPowerlist.vue @@ -0,0 +1,352 @@ + + + \ No newline at end of file diff --git a/src/components/drawers/OwnPower.vue b/src/components/drawers/OwnPower.vue index 57a410a4..ca7183fe 100644 --- a/src/components/drawers/OwnPower.vue +++ b/src/components/drawers/OwnPower.vue @@ -1,726 +1,776 @@ +
+ + +
+
+ + + }, + setup(props, ctx) { + const state = reactive({ + 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, + name: "小李", + bum: "产研部", + gangw: "产品经理", + }, + { + key: 2, + name: "小刘", + bum: "产研部", + gangw: "产品经理", + }, + { + key: 3, + name: "小李", + bum: "产研部", + gangw: "产品经理", + }, + { + key: 4, + name: "小李", + bum: "产研部", + gangw: "产品经理", + }, + { + key: 5, + name: "小李", + bum: "产研部", + gangw: "产品经理", + }, + { + key: 6, + name: "小李", + bum: "产研部", + gangw: "产品经理", + }, + { + key: 7, + name: "小李", + bum: "产研部", + gangw: "产品经理", + }, + { + key: 8, + name: "小李", + bum: "产研部", + gangw: "产品经理", + }, + { + key: 9, + name: "小李", + bum: "产研部", + gangw: "产品经理", + }, + ], + 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", + }, + ], + 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:ownpowervisible", false); + }; + + const afterVisibleChange = (bool) => { + console.log("state", bool); + }; + + return { + ...toRefs(state), + afterVisibleChange, + closeDrawer, + // change, + }; + }, +}; + \ No newline at end of file +} + \ No newline at end of file diff --git a/src/components/drawers/Ownership.vue b/src/components/drawers/Ownership.vue index 6fe9cc3f..f0267f44 100644 --- a/src/components/drawers/Ownership.vue +++ b/src/components/drawers/Ownership.vue @@ -765,6 +765,7 @@ export default { background-image: url(../../assets/images/basicinfo/ch.png); right: -8px; top: -8px; + cursor: pointer; } } } diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 748a3862..4bddd2c2 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -79,9 +79,11 @@
-
- + -->
-
+
-
无课程
-
请点击新建开课,创建课程
+
+ 无课程 +
+
+ 请点击新建开课,创建课程 +
-
+
-
+
-
二维码
-
在线课
-
面授课
-
面授课签到
+
+ 二维码 +
+
+ 在线课 +
+
+ 面授课 +
+
+ 面授课签到 +
+
+ 管理者面授课 +
@@ -1707,12 +1730,18 @@ + +
+ +
+
-