From 81970bf2842244e14825078bbcb15ae126156184 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Tue, 21 Mar 2023 15:53:50 +0800
Subject: [PATCH 1/5] =?UTF-8?q?fix:=E4=BD=9C=E4=B8=9A=E6=88=90=E7=BB=A9?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/drawers/project/ProjectFaceTaskManage.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/drawers/project/ProjectFaceTaskManage.vue b/src/components/drawers/project/ProjectFaceTaskManage.vue
index 672c85e9..2ada1820 100644
--- a/src/components/drawers/project/ProjectFaceTaskManage.vue
+++ b/src/components/drawers/project/ProjectFaceTaskManage.vue
@@ -242,7 +242,7 @@ const columns = ref([
align: "center",
ellipsis: true,
className: "h",
- customRender: ({ record: { workScore } }) => {workScore || "-"}
+ customRender: ({ record: { workScore } }) => {workScore!==-2?workScore:"-" || "-"}
},
{
title: "考试成绩",
From 078475065489fe08d6a783f474a2c3bbbea803b3 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Tue, 21 Mar 2023 16:00:06 +0800
Subject: [PATCH 2/5] =?UTF-8?q?fix:=E5=BC=80=E8=AF=BE=E5=90=8D=E7=A7=B0?=
=?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/drawers/AddOpenCourse.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/drawers/AddOpenCourse.vue b/src/components/drawers/AddOpenCourse.vue
index 46ad673c..e9e2cb3e 100644
--- a/src/components/drawers/AddOpenCourse.vue
+++ b/src/components/drawers/AddOpenCourse.vue
@@ -531,9 +531,9 @@ const createNewCourse = () => {
offcourseId: params.value.offcourseId,
draftTaskId: params.value.draftTaskId,
});
- onceName.value = "";
dateTime.value = [];
validated.value = 0;
+ onceName.value = "";
offCourseNewVisiable.value = true;
};
const handleCancelStu = () => offCourseNewVisiable.value = false;
@@ -576,6 +576,7 @@ async function coursePlanConfirm() {
}
function planEdit(record) {
+ onceName.value = record.name;
formData.value = { ...record };
validated.value = 0;
formData.value.homeWorkId && request(WORK_DETAIL(formData.value.homeWorkId), {}).then(res => formData.value.workInfo = res.data);
@@ -590,7 +591,6 @@ function openDrawer(row) {
params.value.draftTaskId = row.id;
formData.value.offcourseId = row.courseId;
formData.value.draftTaskId = row.id;
- onceName.value = row.name;
courseName.value = row.name;
nextTick(tableRef.value.fetch);
}
From 21bd32880662e1d9bfbd0504b4bb9cddbc18a1ba Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Tue, 21 Mar 2023 16:28:35 +0800
Subject: [PATCH 3/5] --fix bug
---
src/views/learningpath/LevelAdd.vue | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 38d8d882..64c1b1e7 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -2661,9 +2661,9 @@ export default {
item.courseId;
}
if (item.type == 2) {
- let date1 = new Date(item.endTime).getTime();
- let date2 = new Date().getTime();
- if (date1 < date2) return message.warning("当前面授课已结束");
+ // 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("该任务无法学习，请联系管理员进行替换。");
codeUrl =
@@ -2672,7 +2672,7 @@ export default {
"/faceteach?type=2&courseId=" +
item.courseId +
"&id=" +
- item.projectTaskId;
+ item.id;
}
if (item.type == 3) return message.error("请在pc端完成");
From e8590a58724c51713fb301044afac2ba8c7fcffb Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Tue, 21 Mar 2023 16:29:06 +0800
Subject: [PATCH 4/5] style
---
src/components/drawers/AddOpenCourse.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/drawers/AddOpenCourse.vue b/src/components/drawers/AddOpenCourse.vue
index e9e2cb3e..1536dbfe 100644
--- a/src/components/drawers/AddOpenCourse.vue
+++ b/src/components/drawers/AddOpenCourse.vue
@@ -166,7 +166,7 @@
授课教师
-
+
Date: Tue, 21 Mar 2023 16:30:47 +0800
Subject: [PATCH 5/5] =?UTF-8?q?fix:=E7=89=88=E6=9C=AC=E5=8F=B7=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/App.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/App.vue b/src/App.vue
index 9bb37f3f..42d09307 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -33,7 +33,7 @@ import {USER_PERMISSION} from "@/api/ThirdApi";
const store = useStore();
const isLogin = ref(false);
-console.log("版本2.2.0------------");
+console.log("版本2.2.1------------");
// 监听关闭浏览器
let time1 = ref(0);