From 507f4a1e6b10202cc1e22a6c1fe72fb04e2d6715 Mon Sep 17 00:00:00 2001 From: caozc Date: Fri, 10 Mar 2023 20:35:30 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix=EF=BC=9A=E8=B7=B3=E8=BD=AC=E6=96=B0tab?= =?UTF-8?q?=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/NavLeft.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue index 215b32a5..6737e480 100644 --- a/src/components/NavLeft.vue +++ b/src/components/NavLeft.vue @@ -436,7 +436,8 @@ src="../assets/images/navleft/review.png" /> - 旧版管理员界面 + 旧版管理员界面 +
From e3f7b9249e3d9fdbb4421a0848e1fb34c295cff8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=B8=9C=E8=BF=9B1?= <963286636@qq.com> Date: Fri, 10 Mar 2023 21:46:58 +0800 Subject: [PATCH 2/4] =?UTF-8?q?+=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/courseModal.vue | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/views/courselibrary/courseModal.vue b/src/views/courselibrary/courseModal.vue index 4141cf64..9a969b23 100644 --- a/src/views/courselibrary/courseModal.vue +++ b/src/views/courselibrary/courseModal.vue @@ -357,12 +357,22 @@ 内容标签
- + + +
Date: Mon, 13 Mar 2023 09:12:46 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=E9=9A=90=E8=97=8F=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/learningpath/LevelAdd.vue | 12 ++++++------ src/views/projectcenter/TaskPage.vue | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index b0b88e4e..33db8056 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -2653,8 +2653,8 @@ export default { let codeUrl = ""; // 在线课 停用 -- 暂时没有在线课停用标记 if (item.type == 1) { - if (item.taskStatus == 1 || item.taskStatus == 2) - return message.error("该任务无法学习，请联系管理员进行替换。"); + // if (item.taskStatus == 1 || item.taskStatus == 2) + // return message.error("该任务无法学习，请联系管理员进行替换。"); codeUrl = window.location.protocol + process.env.VUE_APP_ONLINE_CLASS_URL + @@ -2664,8 +2664,8 @@ export default { let date1 = new Date(item.endTime).getTime(); let date2 = new Date().getTime(); if (date1 < date2) return message.warning("当前面授课已结束"); - if (item.taskStatus == 1 || item.taskStatus == 2) - return message.error("该任务无法学习，请联系管理员进行替换。"); + // if (item.taskStatus == 1 || item.taskStatus == 2) + // return message.error("该任务无法学习，请联系管理员进行替换。"); codeUrl = window.location.protocol + process.env.VUE_APP_H5 + @@ -2690,8 +2690,8 @@ export default { } // 考试 停用 if (item.type == 5) { - if (item.taskStatus == 1 || item.taskStatus == 2) - return message.error("该任务无法学习，请联系管理员进行替换。"); + // if (item.taskStatus == 1 || item.taskStatus == 2) + // return message.error("该任务无法学习，请联系管理员进行替换。"); // 此处判断外部考试跳转 if (item.startTime == null || item.endTime == null) { codeUrl = diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 0ca48e93..6957976e 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -4606,19 +4606,19 @@ export default { let codeUrl = ""; // 在线课 停用 -- 暂时没有在线课停用标记 if (item.type == 1) { - if (item.taskStatus == 1 || item.taskStatus == 2) - return message.error("该任务无法学习，请联系管理员进行替换。"); + // if (item.taskStatus == 1 || item.taskStatus == 2) + // return message.error("该任务无法学习，请联系管理员进行替换。"); codeUrl = window.location.protocol + process.env.VUE_APP_ONLINE_CLASS_URL + - item.targetId; + item.courseId; } if (item.type == 2) { let date1 = new Date(item.endTime).getTime(); let date2 = new Date().getTime(); if (date1 < date2) return message.warning("当前面授课已结束"); - if (item.taskStatus == 1 || item.taskStatus == 2) - return message.error("该任务无法学习，请联系管理员进行替换。"); + // if (item.taskStatus == 1 || item.taskStatus == 2) + // return message.error("该任务无法学习，请联系管理员进行替换。"); codeUrl = window.location.protocol + process.env.VUE_APP_H5 + @@ -4642,8 +4642,8 @@ export default { } // 考试 停用 if (item.type == 5) { - if (item.taskStatus == 1 || item.taskStatus == 2) - return message.error("该任务无法学习，请联系管理员进行替换。"); + // if (item.taskStatus == 1 || item.taskStatus == 2) + // return message.error("该任务无法学习，请联系管理员进行替换。"); // 此处判断外部考试跳转 if (item.startTime == null || item.endTime == null) { codeUrl = From 2a745b7ae50f23ff914e2fade4656489b9af373f Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Mon, 13 Mar 2023 10:11:25 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=E9=9D=A2=E6=8E=88=E8=AF=BE=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=90=8E=E9=99=84=E4=BB=B6=E8=B7=AF=E5=BE=84=E5=8F=98?= =?UTF-8?q?=E5=8C=96=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 8c39f627..9b25f357 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -1165,7 +1165,7 @@
- +
@@ -2591,6 +2591,7 @@ export default defineComponent({ imgList: [], validated: 0, attach: "", + attachName: "", pageSize2: 10, currentPage2: 0, tableDataTotal2: 0, @@ -3746,7 +3747,8 @@ export default defineComponent({ : (str += arrss[i].slice(arrss[i].lastIndexOf("/") + 1) + ","); } console.log(str); - state.attach = str; + state.attachName = str; + state.attach = item.attach; state.xjkkinputV3 = [ dayjs(item.beginTime, "YYYY-MM-DD HH:mm"),