diff --git a/src/components/drawers/AddOpenCourse.vue b/src/components/drawers/AddOpenCourse.vue index 76171568..34fe03ad 100644 --- a/src/components/drawers/AddOpenCourse.vue +++ b/src/components/drawers/AddOpenCourse.vue @@ -155,6 +155,31 @@ > +
+
+
+ +
+ 持续时间 +
+
+ +
+ 分钟 +
+
+
@@ -173,30 +198,6 @@
-
-
-
-
- 持续时间 -
-
- -
- 分钟 -
-
-
考勤设置 @@ -475,6 +476,7 @@ const formData = useResetRef({ evalFlag: 0, assessmentName: "", assessmentId: "", + duration: "", workInfo: {}, examInfo: {}, attach: "", @@ -514,6 +516,12 @@ const formDataRule = { message: "请选择教师", }, ], + duration: [ + { + required: true, + message: "请输入持续时间", + }, + ], }; const { validate } = Form.useForm(formData, formDataRule); diff --git a/src/components/drawers/project/ProjectFaceTaskManage.vue b/src/components/drawers/project/ProjectFaceTaskManage.vue index c73177ae..ac1b623f 100644 --- a/src/components/drawers/project/ProjectFaceTaskManage.vue +++ b/src/components/drawers/project/ProjectFaceTaskManage.vue @@ -297,10 +297,11 @@ const columns = ref([ key: "opacation", width: 100, align: "center", - customRender: ({record:{workStatus,answerId,examinationScore,studentId}}) => + customRender: ({record:{workStatus,answerId,examinationScore,studentId,finishStatus}}) =>
{examinationScore? examinationScore && showExamAnswer(answerId)}>查看答卷:''} {workStatus ? workStatus && showCWvisible(studentId)}>查看作业:''} + {finishStatus != 1 ? finishTask(studentId)}>标记为完成 : ''}
}, ]); @@ -339,6 +340,23 @@ const batchFinish = () => { }); }; +const finishTask = (stuId) => dialog({ + content: "确定标注完成吗?", + ok: async () => { + message.success("标注完成成功"); + tableRef.value.toLoading(); + await api.batchFinishTask({ + ids: [stuId], + type: 3, + taskId: props.datasource.routerTaskId, + pid: offcoursePlanId.value, + taskType: props.datasource.type, + currentStageId: props.datasource.currentStageId, + }); + tableRef.value.fetch(); + }, + }); + const answerId = ref(''); const showExamAnswer = (id) => { answerId.value = id; diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 5f3f516e..f362aa57 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -3202,26 +3202,22 @@ export default defineComponent({ console.log(val); rest(); - getTea(); }; const handelChangePageTea1 = (page, pageSize) => { state.currentPageTea1 = page; state.pageSizeTea1 = pageSize; rest(); - getTea(); }; const handleChangeTea2 = (val) => { console.log(787877); console.log(val); options4CurName.value = val; rest(); - getTea(); }; const handelChangePageTea2 = (page, pageSize) => { state.currentPageTea2 = page; state.pageSizeTea2 = pageSize; rest(); - getTea(); }; //获取分类、场景、封面图、-----------字典配置------------------------------- @@ -3476,7 +3472,6 @@ export default defineComponent({ const options4CurName = ref("张"); const of_hShow = () => { state.offcourseId = ""; - getTea(); if (state.of_hs == false) { state.of_hs = true; } @@ -3546,7 +3541,6 @@ export default defineComponent({ state.qdms_inputV1 = state.xzinputV1; state.xzinputV1 = ""; - getTea(); } if (state.bs_hs && state.valueE1 == 1) { state.addOnlineCoursevisible = true; @@ -4325,50 +4319,6 @@ export default defineComponent({ // }); */ // } }; - //获取教师 - const getTea = async () => { - options4CurName.value = state.teacher; - options4CurId.value = state.teacherId; - const item1 = await getMemberInfoApi({ - pageNo: state.currentPageTea1, - pageSize: state.pageSizeTea1, - keyWord: options4CurName.value, - id: options4CurId.value ? options4CurId.value : null, - }) - .then((res) => { - console.log("获取授课教师", res); - if (res.data.code === 200) return res.data.data; - }) - .catch((err) => { - console.log("获取授课教师失败", err); - }); - const { rows, total } = item1; - state.tableDataTotalTea1 = total; - state.tableDataTotalTea2 = total; - let newArr = []; - for (let item of rows) { - if (options4CurId.value === item.id) { - if (state.offcoursePlanId && state.offcourseId) { - options4CurName.value = item.realName; - state.xjkkinputV4 = item.realName; - state.teacherId = item.id; - } else if (state.offcourseId) { - options4CurName.value = item.realName; - state.qdms_inputV5 = item.realName; - state.teacher = item.realName; - state.teacherId = item.id; - console.log("那个老师", item); - } - } - newArr.push({ - value: item.id, - label: item.realName, - }); - } - options4.value = newArr; - console.log("options4.value"); - console.log(options4.value); - }; //编辑面授课 const handleEdit = async (itm, type) => { if (type === "1") { @@ -4423,7 +4373,6 @@ export default defineComponent({ // state.ft_hs = true; CourseModalRef.value.visibleOpen(state.offcourseId, null); state.ft_eidt = true; - // getTea(); }; // handleTagChange