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 @@
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); }); 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..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: "操作", @@ -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 = () => { 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/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) => { 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; }