From 4b5a70439d80040c5a9080bd009c402c109eecdd Mon Sep 17 00:00:00 2001 From: songwc Date: Sat, 22 Oct 2022 10:35:49 +0800 Subject: [PATCH 01/21] =?UTF-8?q?feat=EF=BC=9A=E6=96=B0=E5=A2=9E=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=8E=88=E6=9D=83=E5=90=8D=E5=8D=95=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=98=B6=E6=AE=B5=20=E5=8F=96=E6=B6=88=E9=98=B6?= =?UTF-8?q?=E6=AE=B5=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/ProjPowerList.vue | 546 ++++++++++++++++++++++ src/views/projectcenter/ProjectManage.vue | 130 +++++- src/views/projectcenter/TaskAdd.vue | 201 +++++++- 3 files changed, 859 insertions(+), 18 deletions(-) create mode 100644 src/components/drawers/ProjPowerList.vue diff --git a/src/components/drawers/ProjPowerList.vue b/src/components/drawers/ProjPowerList.vue new file mode 100644 index 00000000..1aea1e0c --- /dev/null +++ b/src/components/drawers/ProjPowerList.vue @@ -0,0 +1,546 @@ + + + + + \ No newline at end of file diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index c93a8d1a..49c82cfc 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -522,11 +522,14 @@ + + + + \ No newline at end of file diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 14a8544d..97e02bcd 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -212,7 +212,7 @@
任务大纲
- + + +
@@ -1163,6 +1165,7 @@ import StuAdd from "../../components/drawers/StuAdd"; import ImportStu from "../../components/drawers/ImportStu"; import SeeStu from "../../components/drawers/SeeStu"; import ChangeGroup from "../../components/drawers/ChangeGroup"; +import TaskImpStu from "../../components/drawers/TaskFaceIn"; export default { name: "taskPage", components: { @@ -1179,6 +1182,7 @@ export default { ImportStu, SeeStu, ChangeGroup, + TaskImpStu, }, setup() { const state = reactive({ @@ -1361,6 +1365,7 @@ export default { valueDate: "", //排行榜输入日期 noticeChecked: true, noticeContent: "请输入要发布的公告", + TaskFaceImpStuvisible: false, //批量面授报名 //进度排行表 jindutabledata: [ @@ -1829,6 +1834,9 @@ export default { const closeModal2 = () => { state.stugroup = false; }; + const showFaceIn = () => { + state.TaskFaceImpStuvisible = true; + }; //新增 const showTime = (course, name) => { console.log("点击管理"); @@ -1908,6 +1916,7 @@ export default { showImportStu, showSeeStu, showChangeGroup, + showFaceIn, }; }, }; From 570024e06cfc7bb22f92debed34c8b68f4244189 Mon Sep 17 00:00:00 2001 From: songwc Date: Sat, 22 Oct 2022 11:09:24 +0800 Subject: [PATCH 05/21] =?UTF-8?q?feat=EF=BC=9A=E6=96=B0=E5=A2=9E=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E9=9D=A2=E6=8E=88=E6=8A=A5=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/TaskPage.vue | 29 ++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 940acbca..3e3cb32e 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -209,19 +209,20 @@ -
-
-
任务大纲
- - - - 编辑 - -
-
+
+
+
+
任务大纲
+ + + + 编辑 + +
+
+ \ No newline at end of file diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index b2ba6a66..4e0789ef 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -820,7 +820,57 @@
- Content of Tab Pane 3 + +
+
+ + + + + + +
+
+
+ 规则 +
+
+
编辑
+
+
+
+
+ 当前设计下，学员可以获得 + + 积分 +
+
+ 完成【必修/选修】获得 + + 积分
+
+ 优秀学员可获得 + + 积分
+
+
+
+ + +
+
排行榜
@@ -1464,6 +1514,39 @@
+ +
+ +
+
+
+
+
+ 提示 +
+
+
+ 您确定要删除此课程吗 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+ +
+
- \ No newline at end of file + diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index ce4d23a0..f8eaf142 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -500,7 +500,7 @@
公告内容

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: "学员" }], valuestu1: "学员", @@ -1638,12 +1566,12 @@ export default { checkedd2: false, //设置按钮2 radioV1: "", radioV2: "", - activeKey: "2", + activeKey: "3", activeKey1: "8", valueName: "", //排行榜输入姓名 valueDate: "", //排行榜输入日期 noticeChecked: true, - noticeContent: "请输入要发布的公告", + noticeContent: "", //进度排行表 jindutabledata: [ @@ -2185,6 +2113,160 @@ export default { state.radioV2 = ""; } }; + + //学员管理列表操作 + const studentData = () => { + let arr = state.tabledata; + arr.map((value) => { + value.operation = ( +
+
+ {value.excellent ? "取消优秀" : "优秀学员"} +
+ +
查看
+
+ + +
换组
+ + +
{ + console.log("点击了111"); + }} + > + 删除 +
+ + +
+
+ ); + }); + 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 ( +
+ {text.record.excellent ? ( +
+ {text.value} +
+ + 优秀 +
+
+ ) : ( +
+ {text.value} +
+ )} +
+ ); + }, + }, + { + 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; + }; + return { ...toRefs(state), showModal, @@ -2211,6 +2293,7 @@ export default { edit_exit, cloradio1, cloradio2, + studentColumns, }; }, }; @@ -2998,7 +3081,7 @@ export default { } .taskSyllabus { // flex: 1; - overflow-x: scroll; + overflow-x: auto; .ant-collapse { border: 0px; @@ -3362,6 +3445,101 @@ export default { // position: absolute; // bottom: 20px; } + + .studentName { + font-size: 14px; + 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; + align-items: center; + .studentExcellentImg { + width: 13px; + height: 14px; + margin-left: 8px; + } + .studentExcellentT { + font-size: 12px; + font-weight: 400; + color: #ffb64e; + line-height: 17px; + margin-left: 5px; + } + } + + .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 { display: flex; @@ -3706,7 +3884,7 @@ export default { .set_edit { .ant-modal { width: 866px !important; - height: 870px !important; + height: 870px !important; .ant-modal-body { .modalHeader { background: linear-gradient( From a2135d25611a05a0310c7c3f62cc6155a3919a91 Mon Sep 17 00:00:00 2001 From: dongwug Date: Sat, 22 Oct 2022 15:45:55 +0800 Subject: [PATCH 15/21] =?UTF-8?q?feat:taskAdd=E6=97=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=20=E6=A8=A1=E6=9D=BF=E5=BA=93=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=A4=A7=E7=BA=B2=EF=BC=88=E5=B7=AE=E4=B8=80=E7=82=B9?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=B2=A1=E6=89=BE=E5=88=B0=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/LibraryAdd.vue | 1366 +++++++++++++++++------- src/views/projectcenter/TaskAdd.vue | 261 +++-- src/views/projectcenter/TaskPage.vue | 65 -- 3 files changed, 1147 insertions(+), 545 deletions(-) diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue index 2278df41..266760ad 100644 --- a/src/views/projectcenter/LibraryAdd.vue +++ b/src/views/projectcenter/LibraryAdd.vue @@ -1,261 +1,632 @@ \ No newline at end of file + From ab3e40739e988baf7bb042778d8a2255f22bb4d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= Date: Sat, 22 Oct 2022 16:10:46 +0800 Subject: [PATCH 18/21] =?UTF-8?q?feat:=E5=82=AC=E4=BF=83=E5=AD=A6=E4=B9=A0?= =?UTF-8?q?,=E5=82=AC=E4=BF=83=E8=80=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/taskpage/check.png | Bin 0 -> 563 bytes src/components/drawers/TestManage.vue | 44 ++++++++++++++++++++++++-- src/components/drawers/TimeManage.vue | 41 ++++++++++++++++++++++-- 3 files changed, 80 insertions(+), 5 deletions(-) create mode 100644 src/assets/images/taskpage/check.png diff --git a/src/assets/images/taskpage/check.png b/src/assets/images/taskpage/check.png new file mode 100644 index 0000000000000000000000000000000000000000..53bcd491c5d19d65b6599de32c309c414782e53c GIT binary patch literal 563 zcmV-30?hr1P)Px$?MXyIR5(wiQ%!4AQ4l@nzEryvs=U0Y6pX9l$09-{DJmjZq1wKXB0^ntA%YDMK$mv3+R$bqjv9o?WCEz_F-f!KkM-4~|!1bM* z07lpPFA04B=uD-fPn z3P(lp6PjU(U{z^-CO?Uw-Q`5ZKEzNJds4{yiE9Fx0`L{Y@|T9rEgnI$lVU`HhC*)< z-Lf-F!49=WPvwWu=$b@Z#D5v1Tec5CSRrKp|1Z+tta4OY-8HKm`>0RkC(-!hG0}oB z
-
+
催促考试
@@ -80,12 +80,17 @@
+
+
+
催促学员成功
+
+