From a8c3521d4834d3b25bce4d20524cf584badb57c8 Mon Sep 17 00:00:00 2001 From: wyx Date: Mon, 27 Feb 2023 22:31:11 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix:=E5=AD=A6=E5=91=98=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=AF=A6=E6=83=85-=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/StuScoreDetail.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/drawers/StuScoreDetail.vue b/src/components/drawers/StuScoreDetail.vue index fbc4cf4d..3dd1980c 100644 --- a/src/components/drawers/StuScoreDetail.vue +++ b/src/components/drawers/StuScoreDetail.vue @@ -156,6 +156,7 @@ export default { score: item.score, type: "完成任务", from: item.source == "" ? "-" : item.source, + typeDesc: item.typeDesc }; array.push(obj); }); From e83c81485d838b944a5d7915292bde29f9d2817e Mon Sep 17 00:00:00 2001 From: caozc Date: Mon, 27 Feb 2023 22:39:14 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=85=B1=E4=BA=AB?= =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BC=80=E5=85=B3=E8=AE=BE=E7=BD=AE=E6=B2=A1?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E4=B8=8B=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/LibraryAdd.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue index c9383a36..4f3d7a5c 100644 --- a/src/views/projectcenter/LibraryAdd.vue +++ b/src/views/projectcenter/LibraryAdd.vue @@ -1148,7 +1148,7 @@ export default defineComponent({ projectTaskId: 0, projectTemplateId: localStorage.getItem("projectTemplateId"), stageId: 0, - type: 0, + type: 0 }; api .editTask(obj) @@ -1292,13 +1292,15 @@ export default defineComponent({ // 设置上传图片开关 const checkedClose = (data, a) => { console.log(data, a); + console.log("模板id：" + projectTemplateId); + console.log("开关数据：" + JSON.stringify(data) + "====" + JSON.stringify(a)) state.attachSwitch = data; // 更新开关状态 api .templateEdit({ sourceBelongId: state.projectInfo.sourceBelongId, - projectTemplateId: localStorage.getItem("projectTemplateId"), + projectTemplateId: projectTemplateId, attachSwitch: state.attachSwitch ? 1 : -1, }) .then((res) => { From d654a6e46eeded8299a47b465e5cb39ce5d95928 Mon Sep 17 00:00:00 2001 From: caozc Date: Mon, 27 Feb 2023 22:42:04 +0800 Subject: [PATCH 3/6] =?UTF-8?q?fix:=20=E6=88=90=E5=8A=9F=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/project/ProjectExamManage.vue | 3 +-- src/components/drawers/project/ProjectExternalExamManage.vue | 3 +-- .../drawers/router/RouterExaminationExternalManage.vue | 3 +-- src/components/drawers/router/RouterExaminationManage.vue | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/components/drawers/project/ProjectExamManage.vue b/src/components/drawers/project/ProjectExamManage.vue index 8c4a4890..1abdba36 100644 --- a/src/components/drawers/project/ProjectExamManage.vue +++ b/src/components/drawers/project/ProjectExamManage.vue @@ -377,11 +377,10 @@ export default { }; batchSendMessage(obj).then(res => { console.log(res) - message.success("成功"); + message.success("催促" + props.title + "成功"); }).catch(err => { console.log(err) }) - message.success("催促" + props.title + "成功"); }; //导入成绩 const showEScoreModal = () => { diff --git a/src/components/drawers/project/ProjectExternalExamManage.vue b/src/components/drawers/project/ProjectExternalExamManage.vue index 49b7f074..3cdc469d 100644 --- a/src/components/drawers/project/ProjectExternalExamManage.vue +++ b/src/components/drawers/project/ProjectExternalExamManage.vue @@ -371,12 +371,11 @@ 'chapterId': props.datasource.chapterId,//阶段或关卡Id }; batchSendMessage(obj).then(res => { + message.success("催促" + props.title + "成功"); console.log(res) - message.success("成功"); }).catch(err => { console.log(err) }) - message.success("催促" + props.title + "成功"); }; //导入成绩 const showEScoreModal = () => { diff --git a/src/components/drawers/router/RouterExaminationExternalManage.vue b/src/components/drawers/router/RouterExaminationExternalManage.vue index cae1c3ed..830e49af 100644 --- a/src/components/drawers/router/RouterExaminationExternalManage.vue +++ b/src/components/drawers/router/RouterExaminationExternalManage.vue @@ -376,11 +376,10 @@ }; batchSendMessage(obj).then(res => { console.log(res) - message.success("成功"); + message.success("催促" + props.title + "成功"); }).catch(err => { console.log(err) }) - message.success("催促" + props.title + "成功"); }; //导入成绩 const showEScoreModal = () => { diff --git a/src/components/drawers/router/RouterExaminationManage.vue b/src/components/drawers/router/RouterExaminationManage.vue index 51c09fa0..b6b1ba7e 100644 --- a/src/components/drawers/router/RouterExaminationManage.vue +++ b/src/components/drawers/router/RouterExaminationManage.vue @@ -378,11 +378,10 @@ export default { }; batchSendMessage(obj).then(res => { console.log(res) - message.success("成功"); + message.success("催促" + props.title + "成功"); }).catch(err => { console.log(err) }) - message.success("催促" + props.title + "成功"); }; //导入成绩 const showEScoreModal = () => { From 1dea7519b37695efc1a2918651872ea8d7625625 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Mon, 27 Feb 2023 22:59:22 +0800 Subject: [PATCH 4/6] -- fix bug --- src/components/drawers/AddDiscuss.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue index b521e30c..c1b7185e 100644 --- a/src/components/drawers/AddDiscuss.vue +++ b/src/components/drawers/AddDiscuss.vue @@ -5,7 +5,7 @@
From a74d5a151bca979dbf5516f2e16ce65edf447c16 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Mon, 27 Feb 2023 23:10:02 +0800 Subject: [PATCH 5/6] -- fix bug --- src/components/drawers/router/RouterExaminationManage.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/drawers/router/RouterExaminationManage.vue b/src/components/drawers/router/RouterExaminationManage.vue index b6b1ba7e..a06f8702 100644 --- a/src/components/drawers/router/RouterExaminationManage.vue +++ b/src/components/drawers/router/RouterExaminationManage.vue @@ -286,7 +286,7 @@ export default { align: "center", ellipsis: true, className: "h", - customRender: ({record:{finishStatus}}) => ({1:'进行中',0:'未开始',9:'已完成'}[finishStatus] || '未开始'), + customRender: ({record:{finishStatus}}) => ({1:'已完成',0:'未开始',9:'已完成'}[finishStatus] || '未开始'), }, { title: "操作", From e8df19365861767d050001aa890d98c9ec6a544b Mon Sep 17 00:00:00 2001 From: wyx Date: Mon, 27 Feb 2023 23:11:02 +0800 Subject: [PATCH 6/6] =?UTF-8?q?style:=E5=B1=82=E7=BA=A7=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/learningpath/LevelAddDetail.vue | 1 + src/views/projectcenter/TaskAdd.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index eaffaf21..f115279b 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -2172,5 +2172,6 @@ const cancelStorage = async () => { .footBox { position: fixed; bottom: 0; + z-index: 999; } diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index 57380047..49cbd17a 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -1679,6 +1679,6 @@ const cancelStorage = async () => { .footBox { position: fixed; bottom: 0; - z-index: 99999; + z-index: 999; }