From 88a19d9ffbad12693e93ee22c809a0d026deadbf Mon Sep 17 00:00:00 2001 From: dongwug Date: Fri, 21 Oct 2022 15:36:33 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E5=8D=95=E9=80=89=E6=A1=86=E5=8F=AF=E5=8F=96=E6=B6=88=E9=80=89?= =?UTF-8?q?=E4=B8=AD=20=E9=83=A8=E5=88=86=E5=BC=B9=E7=AA=97=E9=80=80?= =?UTF-8?q?=E5=87=BA=E6=B8=85=E6=A5=9A=E7=8A=B6=E6=80=81=20=E6=B8=85?= =?UTF-8?q?=E9=99=A4=E6=97=A0=E7=94=A8=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddActive.vue | 13 +- src/components/drawers/AddFaceteach.vue | 22 +- src/components/drawers/AddLive.vue | 12 +- src/components/drawers/AddTest.vue | 46 +++- src/views/courselibrary/CoursewareManage.vue | 227 +++++++++++++------ 5 files changed, 229 insertions(+), 91 deletions(-) diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue index ce84b595..c0ea88cc 100644 --- a/src/components/drawers/AddActive.vue +++ b/src/components/drawers/AddActive.vue @@ -162,9 +162,9 @@
- 仅签到 - 签到、签退全部完成仅签到 + 签到、签退全部完成
@@ -220,15 +220,22 @@ export default { }); const closeDrawer = () => { ctx.emit("update:addactiveVisible", false); + state.radioV1 = ""; }; const afterVisibleChange = (bool) => { console.log("state", bool); }; + const cloradio1 = (value) => { + if (value != "") { + state.radioV1 = ""; + } + } return { ...toRefs(state), afterVisibleChange, closeDrawer, rowSelection, + cloradio1, }; }, }; diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index 9eec1733..f4f20786 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -173,8 +173,8 @@
- 仅签到 - 仅签到 + 签到、签退全部完成 @@ -196,8 +196,8 @@
- 允许项目内人员临时到场参加 - 允许项目内人员临时到场参加 + 允许项目外人员临时到场参加 @@ -309,6 +309,8 @@ export default { }); const closeDrawer = () => { ctx.emit("update:addfaceteachVisible", false); + state.radioV1 = ""; + state.radioV2 = ""; }; const afterVisibleChange = (bool) => { console.log("state", bool); @@ -322,6 +324,16 @@ export default { const showDrawerAddTest = () => { state.addtestvisible = true; }; + const cloradio1 = (value) => { + if (value != "") { + state.radioV1 = ""; + } + }; + const cloradio2 = (value) => { + if (value != "") { + state.radioV2 = ""; + } + } return { ...toRefs(state), showDrawerSelFacet, @@ -330,6 +342,8 @@ export default { afterVisibleChange, closeDrawer, rowSelection, + cloradio1, + cloradio2, // change, }; }, diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index 76485dc0..08f03cdb 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -230,8 +230,8 @@
- 仅签到 - 仅签到 + 签到、签退全部完成 @@ -439,6 +439,8 @@ export default { }); const closeDrawer = () => { ctx.emit("update:addliveVisible", false); + state.radioV1 = ""; + state.playback = false; }; const afterVisibleChange = (bool) => { console.log("state", bool); @@ -446,6 +448,11 @@ export default { const PlayBack = () => { state.playback = !state.playback; }; + const cloradio1 = (value) => { + if (value != "") { + state.radioV1 = ""; + } + } return { ...toRefs(state), afterVisibleChange, @@ -454,6 +461,7 @@ export default { options1, columns1, rowSelection, + cloradio1, }; }, }; diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index 4d879967..d2d7249c 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -132,8 +132,8 @@
- 允许查看 - 允许查看 + 不允许查看 @@ -145,8 +145,8 @@
- 允许查看 - 允许查看 + 不允许查看 @@ -159,10 +159,10 @@
- 最高一次 - 最后一次 @@ -187,9 +187,9 @@
- 试题乱序 - 试题排序 - 全部乱序 + 试题乱序 + 试题排序 + 全部乱序
@@ -243,15 +243,43 @@ export default { }); const closeDrawer = () => { ctx.emit("update:addtestVisible", false); + state.radioV1 = ""; + state.radioV2 = ""; + state.radioV3 = ""; + state.radioV4 = ""; }; const afterVisibleChange = (bool) => { console.log("state", bool); }; + const cloradio1 = (value) => { + if (value != "") { + state.radioV1 = ""; + } + } + const cloradio2 = (value) => { + if (value != "") { + state.radioV2 = ""; + } + } + const cloradio3 = (value) => { + if (value != "") { + state.radioV3 = ""; + } + } + const cloradio4 = (value) => { + if (value != "") { + state.radioV4 = ""; + } + } return { ...toRefs(state), afterVisibleChange, closeDrawer, rowSelection, + cloradio1, + cloradio2, + cloradio3, + cloradio4, }; }, }; diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 4bddd2c2..7b4e5baf 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -109,13 +109,13 @@
- {{ value5.length }}/20 + {{ xzinputV1.length }}/20
@@ -183,16 +183,16 @@
-
+
- 线上
-
+
- 面授
@@ -214,10 +214,10 @@
- 是 + 是
- 否 + 否
@@ -245,6 +245,7 @@ :closable="false" wrapClassName="modalStyle facteachModal" width="80%" + @cancel="ft_exit" >
@@ -281,14 +282,14 @@
{{ value6.length }}/90{{ qdms_inputV1.length }}/90
@@ -369,14 +370,14 @@
{{ value7.length }}/50{{ qdms_inputV2.length }}/50
@@ -389,14 +390,14 @@
{{ value8.length }}/200{{ qdms_inputV3.length }}/200
@@ -448,7 +449,7 @@
@@ -473,7 +474,7 @@
@@ -487,14 +488,14 @@
{{ value11.length }}/150{{ qdms_inputV6.length }}/150
@@ -528,7 +529,7 @@
- 删除 +
删除
@@ -548,7 +549,7 @@
- 删除 +
删除
@@ -568,8 +569,8 @@
- 重传取消 +
重传
+
取消
@@ -583,11 +584,14 @@
正在上传
+
+ 50% +
- 暂停取消 +
暂停
+
取消
@@ -697,7 +701,7 @@ class="select" ref="select" placeholder="请选择状态" - v-model:value="value12" + v-model:value="gl_selectV1" style="width: 200px" @focus="focus" @change="handleChange" @@ -714,7 +718,7 @@
@@ -742,7 +746,7 @@ class="select" ref="select" placeholder="请选择状态" - v-model:value="value14" + v-model:value="gl_selectV2" style="width: 200px" @focus="focus" @change="handleChange" @@ -759,7 +763,7 @@
@@ -951,6 +955,7 @@ :closable="false" wrapClassName="modalStyle schtimeModal" width="80%" + @cancel="stm_exit" >
@@ -973,7 +978,7 @@
+
@@ -1120,13 +1125,13 @@
- {{ value20.length }}/50 + {{ xjkkinputV2.length }}/50
@@ -1143,7 +1148,7 @@
@@ -1161,7 +1166,7 @@
@@ -1182,13 +1187,13 @@ 签到设置
- - + 是否允许未报名的学员签到 - 签到是否需要口令 @@ -1209,18 +1214,18 @@ 完成规则
- - + 报名即完成 - 签到即完成 - 请假算完成 @@ -1273,6 +1278,7 @@ :closable="false" wrapClassName="modalStyle stusmanageModal" width="80%" + @cancel="sm_exit" >
@@ -1316,7 +1322,7 @@
结业
- +
- 结业
- 不结业
@@ -1646,7 +1652,7 @@
-
+
提示
@@ -1731,9 +1737,7 @@ -
- -
+
@@ -1742,6 +1746,7 @@ import { reactive, toRefs, defineComponent, ref } from "vue"; import { message } from "ant-design-vue"; import OwnPower from "../../components/drawers/OwnPower.vue"; import Corpowerlist from "../../components/drawers/CorPowerlist.vue"; +//列表表格 const columns1 = [ { title: "序号", @@ -1846,6 +1851,7 @@ const columns1 = [ align: "center", }, ]; + const columns2 = [ { title: "姓名", @@ -1913,7 +1919,7 @@ const columns4 = [ align: "center", }, ]; -//授权弹窗的数据 +//授权弹窗 // const columns5 = [ // { // title: "姓名", @@ -2089,6 +2095,7 @@ export default defineComponent({ }, setup() { const state = reactive({ + //列表表格 tableData1: [ { key: "1", @@ -2187,6 +2194,7 @@ export default defineComponent({ kkty: true, }, ], + //在线面授管理报名管理 tableData2: [ { key: 1, @@ -2205,6 +2213,7 @@ export default defineComponent({ status: "已完成", }, ], + //在线面授管理学习记录 tableData3: [ { key: 1, @@ -2215,6 +2224,7 @@ export default defineComponent({ status: "已通过", }, ], + //管理查看详情 tableData4: [ { key: 1, @@ -2223,7 +2233,8 @@ export default defineComponent({ status: "已通过", }, ], - //授权弹窗的数据 + + // 授权弹窗 // tableData5: [ // { // key: 1, @@ -2261,6 +2272,8 @@ export default defineComponent({ // authority: "管理权", // }, // ], + + //开课 tableData6: [ { key: 1, @@ -2303,6 +2316,7 @@ export default defineComponent({ createtime: "2022-07-14 14:00:00", }, ], + //开课学员管理 tableData7: [ { key: "1", @@ -2412,20 +2426,45 @@ export default defineComponent({ //抽屉状态 ownpowervisible: false, corpowerlistvisible: false, - - value: "", - value5: "", - value6: "", - value7: "", - value8: "", - value11: "", - value20: "", + //列表 + value1: "", + value2: "", + value3: "", + value4: "", + //选择线上还是面授 + xzinputV1: "", valueE1: "", valueE2: "", - valueB: "", - valueC: "", + //确定面授 + qdms_inputV1: "", + qdms_inputV2: "", + qdms_inputV3: "", + qdms_inputV4: "", + qdms_inputV5: "", + qdms_inputV6: "", + //在线面授管理 + gl_selectV1:"", + gl_selectV2:"", + gl_inputV1:"", + gl_inputV2:"", + //开课 + kkinputV1: "", + kkinputV2: "", + //新建开课 + xjkkradioV1:"", + xjkkradioV2:"", + xjkkinputV1: "", + xjkkinputV2: "", + xjkkinputV3: "", + xjkkinputV4: "", selectedRowKeys: [], faceManageTab: "1", + //开课学员管理 + xygl_inputV1:"", + //录入成绩 + lrcj_inputV1:"", + //结业 + jyradioV1:"", }); // 渲染列表1操作 const getTableDate = () => { @@ -3035,6 +3074,8 @@ export default defineComponent({ const of_exit = () => { state.of_hs = false; state.valueE1 = ""; + state.valueE2 = ""; + state.hideshow = true; }; const hideShow = () => { if (state.hideshow == true) { @@ -3043,8 +3084,11 @@ export default defineComponent({ state.hideshow = true; } }; - const bs_hShow = () => { + const bs_hShow = (value) => { state.bs_hs = true; + if (value != "") { + state.valueE1 = ""; + } }; const createft = () => { if (state.bs_hs == false) { @@ -3055,6 +3099,7 @@ export default defineComponent({ }; const ft_exit = () => { state.ft_hs = false; + state.hideshow = true; }; const om_exit = () => { state.om_1 = false; @@ -3077,14 +3122,39 @@ export default defineComponent({ }; const cstm_exit = () => { state.cstm_hs = false; + state.xjkkradioV1 = ""; + state.xjkkradioV2 = ""; + state.xjkkinputV1 = ""; + state.xjkkinputV2 = ""; + state.xjkkinputV3 = ""; + state.xjkkinputV4 = ""; }; const sm_exit = () => { state.sm_hs = false; + state.hideshow = true; }; - const clear_valueE = () => { + const clear_valueE1 = () => { state.bs_hs = false; state.valueE1 = ""; }; + const clear_valueE2 = () => { + state.valueE2 = ""; + }; + const clear_xjkkradioV1 = (value) => { + if (value != ""){ + state.xjkkradioV1 = ""; + } + } + const clear_xjkkradioV2 = (value) => { + if (value != ""){ + state.xjkkradioV2 = ""; + } + } + const clear_jyradioV1 = (value) => { + if (value != ""){ + state.jyradioV1 = ""; + } + } const qr_exit = () => { state.QR_hs = false; state.qrQR_hs = false; @@ -3162,7 +3232,11 @@ export default defineComponent({ createkk, cstm_exit, sm_exit, - clear_valueE, + clear_valueE1, + clear_valueE2, + clear_xjkkradioV1, + clear_xjkkradioV2, + clear_jyradioV1, qr_exit, rg_exit, graduate_exit, @@ -4351,14 +4425,14 @@ export default defineComponent({ } } } - .file_operation { + } + .file_operation { display: flex; - - span { + .fobox{ + margin-right: 5px; cursor: pointer; } } - } } } } @@ -5029,6 +5103,13 @@ export default defineComponent({ padding-top: 20px; padding-left: 26px; font-size: 16px; + .del-icon { + width: 16px; + height: 16px; + margin-right: 10px; + background-image: url(@/assets/images/coursewareManage/notice.png); + background-size: 100% 100%; + } .icon { width: 16px; height: 16px; From 58db0256da1739d1b35c973925d6fcb24014c5ed Mon Sep 17 00:00:00 2001 From: songwc Date: Fri, 21 Oct 2022 15:46:07 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat=EF=BC=9A=E6=96=B0=E5=A2=9E=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=88=A0=E9=99=A4=20=E5=AF=BC=E5=85=A5=E5=AD=A6?= =?UTF-8?q?=E5=91=98=20=E5=AF=BC=E5=85=A5=E5=AD=A6=E5=91=98=E7=8A=B6?= =?UTF-8?q?=E6=80=81=20=E6=B7=BB=E5=8A=A0=E5=AD=A6=E5=91=98=E6=8A=BD?= =?UTF-8?q?=E5=B1=89=20=20=E8=B7=AF=E5=BE=84-=E6=97=A0=E5=85=B3=E5=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/basicinfo/cloud.png | Bin 0 -> 1071 bytes src/assets/images/basicinfo/exl.png | Bin 0 -> 855 bytes src/components/drawers/AddLevelAddStu.vue | 805 +++++++++++++++++++ src/components/drawers/AddLevelImportStu.vue | 354 ++++++++ src/views/learningpath/LevelAdd.vue | 589 ++++++++++---- src/views/projectcenter/TaskPage.vue | 12 +- 6 files changed, 1587 insertions(+), 173 deletions(-) create mode 100644 src/assets/images/basicinfo/cloud.png create mode 100644 src/assets/images/basicinfo/exl.png create mode 100644 src/components/drawers/AddLevelAddStu.vue create mode 100644 src/components/drawers/AddLevelImportStu.vue diff --git a/src/assets/images/basicinfo/cloud.png b/src/assets/images/basicinfo/cloud.png new file mode 100644 index 0000000000000000000000000000000000000000..06e258c7c801ff1c655888ed980fc3b4da86e368 GIT binary patch literal 1071 zcmV+~1kn45P)Px&=}AOER7gwhm0N5SRT#(r-`RyKWl4B2YGG&AO9|P;YK862VxUD6jR{Fru!*-A z(+7nhT6bnkd|~y8?hF!QZtFvzI8SrV`M&?}yPP?Pu*icJnTIRDnTp@haoU#=SMMZXD}Xgq8)q0e?3Mp? ze%Zcud_L`&S4kr;xec6^9|EWWaDjnua^eKs24Dq%QSylUlh674D?uv)Bi86z=1Vq! zDkkh6A6H%-dVwZ#!ofYf)aOfWC&pd?X`&@sQm;8(4q6eYC5C&LXd{u>V(b1-W)ssa z_g-dsl$ej(u|U)R21fR}x3EW^BIb9KvB1OSgd&OIcbMoQ%8I(=ZvS_4*_O>PVh-T_9!`ACTmfT7M9lh|tO{txo=I16pL`wS#T?U-_C+D5b72f*@h z0l6XFgYtI+1hxR)+dNTL|!1YY1@6*+xsegCUOf!eO0D3|YHJ;Fw zV};He5~-Ucp&NwNV15z6b^s$JsFx)_3&0Ufcb$kSKNa~|sZEl(mx#KOy3$$%44Y1h zfV6F>wWW;?o9CJd;t&bik&G%`n&pfUlbbY@P_7LO9Dtyf(tb@Q;{3=!RiB|MB^f$t z5PEH0y?eIP*c4}Pu2*@H0$^_56z}%-#5d>nN{42pJ_B>3ZKzenKr8hNm@n9d8l26s zaIF+r&R#Q}ArP&wb!Bx)hVEN{d^AhcFrX^~WkpIdoXa+3r9vL&en1?w4gX_Bz{tLl zdMPs}2{@Bwxp^RV!`NIx^T{xjICq_gL^lI#gz&CUMpq3M0VjLo#=x=zjNd@m&%)Cy zFJ<%Z-0#aK&Ys;>o1U$Q!9CwE_4#}^%M3^?@%Tt)8^LG;;aZSrw{?GFI{3?O8qIPZ z2a^f#HH8_npw_;q(v@2ao6aaPTsx+QrviNhEDsh}gwBK5uyys#!u44%?>cj=dKvwD z4Nf9{^mbFJ!RZ_v9v7} p-@{5LcA@)MfD5fyMf*iB>3`wkr7TR}d(i*@002ovPDHLkV1ndq_MiX& literal 0 HcmV?d00001 diff --git a/src/assets/images/basicinfo/exl.png b/src/assets/images/basicinfo/exl.png new file mode 100644 index 0000000000000000000000000000000000000000..bd777bcb304429649ce9d3b42f4c6aa7607da617 GIT binary patch literal 855 zcmV-d1E~CoP)Px&5lKWrR9HvtmupBU=uYFkmH7*LM z6oE-*Xos+a|Xy?#-UGSXRaLI?%r3eTvrZ}3jLg872pGB1Sr z1jC7Snys9GqZ~5Nsk2J$4yKfXGnwE72^cW5;1twQo%Bd%ckmw)1+{WI)FwP84g_02 za%$qsm%$4;k(VB`-0G$GaDf$;Tm4s~k^(iT?tYCiqaG|_adblh%GxWj-!B@?KUy#_ zF=UAk@(4g;paxP#g0F)esOo$P4%RO<^R_zBBLGK~ak$!a2U)?X_&m^tciJZ8gdRtA z_bYUb^jN?pJ1^pL!%d7EClIL!L(4!bCQSyb6BnKF0sk08t&K$c&^JLXZ*zf*!cRe~ z@5kG|Msy5!imsR_c(a!hh2gn)&{l!E-Zxgk1Vp%9Zd + +
+
+
添加学员
+ +
+
+
+
+ + +
+
+
姓名：
+ +
+
+
+
+ +
+
搜索
+
+
+
+ +
+
重置
+
+
+
+
+
+
+
+
已选择
+
2
+
项
+
列表选项总计：
+
9条
+
+
清空
+
+
+
+ +
+ +
+
+ + +
+
组织：
+
+ +
+
+ + +
+
+
受众名称：
+
+ +
+
+
+
+
+ +
+
搜索
+
+
+
+ +
+
重置
+
+
+
+
+
+
+
+
已选择
+
2
+
项
+
列表选项总计：
+
9条
+
+
清空
+
+
+
+ +
+ +
+
+ + +
+
+
+
+
已选
+
+
+ 全部清除 +
+
+
+
+ 李明 +
+
+
+ 李大明 +
+
+
+ 李二明 +
+
+
+ 李明 +
+
+
+ 李大明 +
+
+
+ 李二明 +
+
+
+
+
+
+ + +
+
+ + + + + + \ No newline at end of file diff --git a/src/components/drawers/AddLevelImportStu.vue b/src/components/drawers/AddLevelImportStu.vue new file mode 100644 index 00000000..fdf9464d --- /dev/null +++ b/src/components/drawers/AddLevelImportStu.vue @@ -0,0 +1,354 @@ + + + + + \ No newline at end of file diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index 9a7a4b19..92a699d6 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -72,66 +72,97 @@
-
-
-
{{ item.lev }}
-
-
{{ item.name }}
-
- 当前关卡 - {{ item.count }} - 个人 -
-
-
-
-
- {{ item.online }} + +
+
+
+
{{ item.lev }}
+
+
{{ item.name }}
+
+ 当前关卡 + {{ item.count }} + 个人
-
在线
-
-
-
- {{ item.homework }} +
+
+
+ {{ item.online }} +
+
在线
-
作业
-
-
-
-
- {{ item.juan }} +
+
+
+ {{ item.homework }} +
+
作业
-
问卷
-
-
-
-
- {{ item.ballot }} +
+
+
+ {{ item.juan }} +
+
问卷
-
投票
-
-
-
-
- {{ item.test }} +
+
+
+ {{ item.ballot }} +
+
投票
-
考试
-
-
-
- 编辑 -
-
更多
-
-
-
复制
-
删除
+
+
+
+ {{ item.test }} +
+
考试
+
+
+
+ 编辑 +
+
更多
+
+
+
复制
+
删除
+
+ +
+
+
+
+ +
+
+ +
+
+ +
+
+ 发布 +
+
快速发布项目
+
+
+
@@ -159,8 +190,8 @@
- - + +
@@ -344,13 +375,14 @@ v-model:visible="visible" :footer="null" centered="true" + wrapClassName="changeModal" >
调整关卡
-
+
@@ -375,39 +407,74 @@
+ + + +
+
+
+
+
+ 提示 +
+
+
+ 请确认是否批量删除学员 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+ + + + +
+ + \ 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 @@
+ +
+ +
+
+
+
+
+ 提示 +
+
+ 您是否授予此学员优秀学员称号？ +
+
+
+
取消
+
+
+
确定
+
+
+
+
+ +
+