From 24fa82e3a0ebd3ec26cfcce53fc241fb870b2103 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= Date: Fri, 21 Oct 2022 16:00:29 +0800 Subject: [PATCH 1/6] =?UTF-8?q?feat:=E6=8D=A2=E7=BB=84=E5=92=8C=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E5=AD=A6=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/ChangeGroup.vue | 164 ++++++++++++++++++++++ src/views/projectcenter/TaskPage.vue | 183 ++++++++++++++++++++++++- 2 files changed, 340 insertions(+), 7 deletions(-) create mode 100644 src/components/drawers/ChangeGroup.vue diff --git a/src/components/drawers/ChangeGroup.vue b/src/components/drawers/ChangeGroup.vue new file mode 100644 index 00000000..6099646c --- /dev/null +++ b/src/components/drawers/ChangeGroup.vue @@ -0,0 +1,164 @@ + + + + + \ No newline at end of file diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 1c431256..6270bf0f 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -532,7 +532,7 @@ 导入学员 -
+
批量删除
@@ -1047,6 +1047,8 @@ + + @@ -1153,11 +1155,7 @@ display: flex; align-items: center; justify-content: space-between; - background: linear-gradient( - 0deg, - rgba(78, 166, 255, 0) 0%, - rgba(78, 166, 255, 0.2) 100% - ); + " >
@@ -1211,6 +1209,38 @@
+ +
+ +
+
+
+
+
+ 提示 +
+
+ 您是否授予此学员优秀学员称号? +
+
+
+
取消
+
+
+
确定
+
+
+
+
+
+
+
From 21884aace3fe07cff72f7197de715308cdfa4631 Mon Sep 17 00:00:00 2001 From: dongwug Date: Sat, 22 Oct 2022 09:17:30 +0800 Subject: [PATCH 6/6] =?UTF-8?q?feat:=E6=A8=A1=E6=9D=BF=E5=BA=93=E8=87=AA?= =?UTF-8?q?=E9=80=82=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 212 ++++++++++++------- src/views/projectcenter/TemplateLibrary.vue | 12 +- 2 files changed, 150 insertions(+), 74 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 18f29184..021cb7c5 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -183,16 +183,22 @@
-
+
- 线上
-
+
- 面授
@@ -214,10 +220,20 @@
- +
- +
@@ -529,7 +545,9 @@
-
删除
+
+ 删除 +
@@ -549,7 +567,9 @@
-
删除
+
+ 删除 +
@@ -569,8 +589,12 @@
-
重传
-
取消
+
+ 重传 +
+
+ 取消 +
@@ -590,8 +614,14 @@
-
暂停
-
取消
+
+ 暂停 +
+
+ 取消 +
@@ -1080,7 +1110,11 @@ - +
- 是否允许未报名的学员签到 - 签到是否需要口令 @@ -1215,17 +1255,26 @@
- 报名即完成 - 签到即完成 - 请假算完成 @@ -1542,12 +1591,18 @@
- 结业
- 不结业
@@ -1737,7 +1792,7 @@ - +
@@ -1851,7 +1906,7 @@ const columns1 = [ align: "center", }, ]; - +//列表操作在线面授管理 const columns2 = [ { title: "姓名", @@ -1896,6 +1951,7 @@ const columns2 = [ align: "center", }, ]; +//管理查看详情 const columns4 = [ { title: "开课名称", @@ -1919,7 +1975,7 @@ const columns4 = [ align: "center", }, ]; -//授权弹窗 +//5授权弹窗 6是开课表格 // const columns5 = [ // { // title: "姓名", @@ -1957,6 +2013,8 @@ const columns4 = [ // align: "center", // }, // ]; + +//开课表格 const columns6 = [ { title: "序号", @@ -2001,6 +2059,7 @@ const columns6 = [ align: "center", }, ]; +//开课学员管理 const columns7 = [ { title: "序号", @@ -2234,7 +2293,7 @@ export default defineComponent({ }, ], - // 授权弹窗 + // 5授权弹窗 6开课 // tableData5: [ // { // key: 1, @@ -2331,7 +2390,6 @@ export default defineComponent({ signstatus: "-", evastatus: "-", overstatus: "-", - operation: "2022-07-20 9:30", }, { key: "2", @@ -2346,7 +2404,6 @@ export default defineComponent({ signstatus: "已签到", evastatus: "已评估", overstatus: "-", - operation: "2022-07-20 9:30", }, { key: "3", @@ -2361,7 +2418,6 @@ export default defineComponent({ signstatus: "-", evastatus: "-", overstatus: "-", - operation: "2022-07-20 9:30", }, { key: "4", @@ -2376,7 +2432,6 @@ export default defineComponent({ signstatus: "已签到", evastatus: "-", overstatus: "90/已结业", - operation: "2022-07-20 9:30", }, { key: "5", @@ -2391,12 +2446,13 @@ export default defineComponent({ signstatus: "请假", evastatus: "-", overstatus: "", - operation: "2022-07-20 9:30", }, ], currentPage: 1, tableDataTotal: 100, pageSize: 10, + selectedRowKeys: [], + faceManageTab: "1", of_hs: false, hideshow: true, bs_hs: true, @@ -2422,7 +2478,7 @@ export default defineComponent({ olQR_hs: false, ftQR_hs: false, ftsQR_hs: false, - vipftQR_hs:false, + vipftQR_hs: false, //抽屉状态 ownpowervisible: false, corpowerlistvisible: false, @@ -2443,28 +2499,26 @@ export default defineComponent({ qdms_inputV5: "", qdms_inputV6: "", //在线面授管理 - gl_selectV1:"", - gl_selectV2:"", - gl_inputV1:"", - gl_inputV2:"", + gl_selectV1: "", + gl_selectV2: "", + gl_inputV1: "", + gl_inputV2: "", //开课 kkinputV1: "", kkinputV2: "", //新建开课 - xjkkradioV1:"", - xjkkradioV2:"", + xjkkradioV1: "", + xjkkradioV2: "", xjkkinputV1: "", xjkkinputV2: "", xjkkinputV3: "", xjkkinputV4: "", - selectedRowKeys: [], - faceManageTab: "1", //开课学员管理 - xygl_inputV1:"", + xygl_inputV1: "", //录入成绩 - lrcj_inputV1:"", + lrcj_inputV1: "", //结业 - jyradioV1:"", + jyradioV1: "", }); // 渲染列表1操作 const getTableDate = () => { @@ -2813,10 +2867,14 @@ export default defineComponent({
-
{ +
{ state.delete_hs = true; - }}>删除
+ }} + > + 删除 +
) : ( @@ -2825,10 +2883,14 @@ export default defineComponent({ {value.status === "已通过" ? (
-
{ +
{ state.delete_hs = true; - }}>删除
+ }} + > + 删除 +
) : ( @@ -2837,10 +2899,14 @@ export default defineComponent({ {value.status === "已拒绝" ? (
-
{ state.delete_hs = true; - }}>删除
+ }} + > + 删除 +
) : ( @@ -3096,7 +3162,7 @@ export default defineComponent({ const bs_hShow = (value) => { state.bs_hs = true; if (value != "") { - state.valueE1 = ""; + state.valueE1 = ""; } }; const createft = () => { @@ -3120,9 +3186,9 @@ export default defineComponent({ const ftsr_exit = () => { state.om_ckxq = false; }; - const gpm_exit = () => { - state.gpm_hs = false; - }; + // const gpm_exit = () => { + // state.gpm_hs = false; + // }; const stm_exit = () => { state.stm_hs = false; }; @@ -3133,9 +3199,9 @@ export default defineComponent({ state.cstm_hs = false; state.xjkkradioV1 = ""; state.xjkkradioV2 = ""; - state.xjkkinputV1 = ""; - state.xjkkinputV2 = ""; - state.xjkkinputV3 = ""; + state.xjkkinputV1 = ""; + state.xjkkinputV2 = ""; + state.xjkkinputV3 = ""; state.xjkkinputV4 = ""; }; const sm_exit = () => { @@ -3150,20 +3216,20 @@ export default defineComponent({ state.valueE2 = ""; }; const clear_xjkkradioV1 = (value) => { - if (value != ""){ + if (value != "") { state.xjkkradioV1 = ""; } - } + }; const clear_xjkkradioV2 = (value) => { - if (value != ""){ + if (value != "") { state.xjkkradioV2 = ""; } - } + }; const clear_jyradioV1 = (value) => { - if (value != ""){ + if (value != "") { state.jyradioV1 = ""; } - } + }; const qr_exit = () => { state.QR_hs = false; state.qrQR_hs = false; @@ -3223,10 +3289,10 @@ export default defineComponent({ // columns5, columns6, columns7, - getTableDate, - getTableDate2, options1, options2, + // getTableDate, + // getTableDate2, of_hShow, of_exit, hideShow, @@ -3236,7 +3302,7 @@ export default defineComponent({ om_exit, ckxq_hs, ftsr_exit, - gpm_exit, + // gpm_exit, stm_exit, createkk, cstm_exit, @@ -3296,7 +3362,6 @@ export default defineComponent({ .btns { display: flex; margin-left: 38px; - cursor: pointer; .btn { padding: 0px 26px 0px 26px; height: 38px; @@ -3308,6 +3373,7 @@ export default defineComponent({ justify-content: center; margin-right: 14px; flex-shrink: 0; + cursor: pointer; .search { background-size: 100%; } @@ -4436,12 +4502,12 @@ export default defineComponent({ } } .file_operation { - display: flex; - .fobox{ - margin-right: 5px; - cursor: pointer; - } + display: flex; + .fobox { + margin-right: 5px; + cursor: pointer; } + } } } } diff --git a/src/views/projectcenter/TemplateLibrary.vue b/src/views/projectcenter/TemplateLibrary.vue index e04226f8..f2a349d2 100644 --- a/src/views/projectcenter/TemplateLibrary.vue +++ b/src/views/projectcenter/TemplateLibrary.vue @@ -203,22 +203,31 @@ export default defineComponent({ width:100%; .tmpl_header{ display:flex; + flex-wrap: wrap; justify-content: space-between; - margin: 32px; + margin-bottom: 32px; + + margin-left: 32px; + margin-right: 32px; .tmplh_inp{ .inpbox{ display: flex; + margin-top: 32px; .inpbox1{ display:flex; justify-content: center; align-items: center; margin-right: 24px; + span{ + white-space: nowrap; + } } } } .tmplh_btn{ display: flex; margin-left: 38px; + margin-top: 32px; .btn { padding: 0px 26px 0px 26px; height: 38px; @@ -295,6 +304,7 @@ export default defineComponent({ display: flex; .jc { margin-left: 20px; + white-space: nowrap; cursor: pointer; } }