From 13ddba8ef57860c3dcc7673403dfa60a159ba8ea Mon Sep 17 00:00:00 2001 From: dongwug Date: Tue, 18 Oct 2022 11:36:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddOnline.vue | 14 +- .../{EidtOnline.vue => EditOnline.vue} | 136 +++++++++--------- src/views/projectcenter/TaskAdd.vue | 4 +- 3 files changed, 82 insertions(+), 72 deletions(-) rename src/components/drawers/{EidtOnline.vue => EditOnline.vue} (83%) diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue index 0fd2359f..dee80d18 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -24,7 +24,7 @@
@@ -34,7 +34,7 @@
- \ No newline at end of file diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 569cf566..526f7751 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -567,7 +567,7 @@ />
- + - 在线课程管理 +
在线课程管理
+
面授课程管理
状态：
已审核
-
- - 报名管理 - 学习记录 - 资源完成情况 - -
-
-
- - 状态 - 已通过 - 未审核 - 管理员拒绝 - -
-
- -
-
-
-
-
搜索
-
-
-
-
- -
- - - - - - - - -
-
- - 面授课程管理 -
-
- -
-
-
-
-
-
-
课程：BMOT2021年职级晋升-安全管理（高级）
-
-
类型：
-
录播课
-
内容分类：
-
领导力
-
状态：
-
已审核
-
- - - 1 - - -
-
- - 状态 - 已通过 - 未审核 - 管理员拒绝 - -
-
- -
-
-
-
-
搜索
-
-
-
-
- - - -
- - - - -
-
- + 签到设置
- - 是否允许未报名的学员签到 - - - 签到是否需要口令 - + + 是否允许未报名的学员签到 + 签到是否需要口令 +
@@ -1165,15 +1060,11 @@ 完成规则
- - 报名即完成 - - - 签到即完成 - - - 请假算完成 - + + 报名即完成 + 签到即完成 + 请假算完成 +
@@ -2186,7 +2077,7 @@ export default defineComponent({ bs_hs: true, ft_hs:false, om_1: false, - ftm_1: false, + ft_1: false, om_ckxq: false, gpm_hs: false, stm_hs: false, @@ -2204,6 +2095,8 @@ export default defineComponent({ value5:"", value6:"", valueE:"", + valueB:"", + valueC:"", selectedRowKeys: [], }); const fileList = ref([]); @@ -2264,10 +2157,12 @@ export default defineComponent({ class="jc" style={{ width: "30px" }} onClick={() => { - if (value.courseform === "线上") { + if (value.courseform === "线上" ) { state.om_1 = true; + state.ft_1 = false; } else if (value.courseform === "面授") { - state.ftm_1 = true; + state.om_1 = true; + state.ft_1 = true; } }} > @@ -2766,9 +2661,6 @@ export default defineComponent({ const om_exit = () => { state.om_1 = false; }; - const ftm_exit = () => { - state.ftm_1 = false; - }; const ckxq_hs = () => { state.om_ckxq = true; }; @@ -2840,7 +2732,6 @@ export default defineComponent({ createft, ft_exit, om_exit, - ftm_exit, ckxq_hs, ftsr_exit, gpm_exit, @@ -3934,8 +3825,7 @@ export default defineComponent({ } } .modalMain{ - .onlinemanage, - .faceteachmanage { + .onlinemanage { display: none; z-index: 999; min-width: 1000px; diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index 56e22366..01c9e58c 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -76,12 +76,17 @@
-
+
面授
+ +
+ +
+
@@ -294,6 +299,7 @@ import { reactive, toRefs, onMounted, onUnmounted } from "vue"; import AddOnline from "../../components/drawers/AddOnline.vue"; import EditOnline from "../../components/drawers/EditOnline.vue"; +import AddFaceteach from "../../components/drawers/AddFaceteach.vue" const drawercolumns = [ { title: "项目名称", @@ -337,6 +343,7 @@ export default { components: { AddOnline, EditOnline, + AddFaceteach, }, setup() { const state = reactive({ @@ -582,7 +589,8 @@ export default { tableDataTotal: 100, pageSize: 10, visible: false, - visible2:false, + visible2: false, + visible3: false, stage: false, selectedRowKeys: [], }); @@ -722,7 +730,12 @@ export default { "0px 1px 35px 0px rgba(118, 136, 166, 0.07)"; }); const showDrawerOnline = () => { - state.visible = true; + state.visible = true; + + }; + const showDrawerFaceteach = () => { + state.visible3 = true; + console.log(state.visible3); }; return { ...toRefs(state), @@ -736,6 +749,7 @@ export default { drawercolumns, onSelectChange, showDrawerOnline, + showDrawerFaceteach, }; }, };