From 11277aebe201ee9c568610f07e964a93993d1eba Mon Sep 17 00:00:00 2001 From: joshen Date: Wed, 19 Mar 2025 21:03:47 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=81=A2=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 32 ++++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index bdb92e9f..ce041d35 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -781,7 +781,7 @@ - +
@@ -975,7 +975,7 @@ :placeholder="[' 开始时间', ' 结束时间']" :disabled="editBeginClass" /> --> - 天
- +
评估设置 @@ -2317,7 +2317,7 @@ export default defineComponent({ const store = useStore(); const sysTypeOptions = computed(() => store.state.content_type); const durationText = computed(() => state.xjkkinputV3?.length==2?dayjs(state.xjkkinputV3[1]).diff(dayjs(state.xjkkinputV3[0]),'minute')|| '请输入持续时间':'请输入持续时间'); - + const state = reactive({ tableStudentChange: null, isAssessmentId: null, @@ -3679,7 +3679,7 @@ function onFocusEnd(){ }).catch(err=>{ message.error(err.message=='timeout of 15000ms exceeded'?'系统超时，请稍后再试':err.data.msg) state.tableCoursePlanLoading = false - res ={ + res ={ data:{data:{ "pageNo": "1", "pageSize": "10", @@ -3940,7 +3940,7 @@ function onFocusEnd(){ state.changeName = true state.xjkkinputV3 = [moment().format('YYYY-MM-DD HH:mm'),''] - state.examInfo = {}; + // state.examInfo = {}; //清除缓存 state.cstm_hs = true; }; @@ -4003,7 +4003,7 @@ function onFocusEnd(){ let t = state.signCom ? "1," : "0,"; let p = state.comLeave ? "1" : "0"; let type = t.concat(p); - let postData = { + const postData = { offcourseId: state.offcourseId, id: state.offcoursePlanId, //开课ID,不传代表新增 address: state.xjkkinputV2, @@ -4027,12 +4027,12 @@ function onFocusEnd(){ // teacher: state.member.name, offteachers: state.offteachers, workInfo: state.workInfo, //提交的作业信息 - //提交的考试信息 + examInfo: state.examInfo, //提交的考试信息 beforeStart: state.beforeValue, //考勤 开始前 afterStart: state.afterStartValue, //考勤 开始后 score: state.scoreParams, }; - if(state.kk_eidt){ + /*if(state.kk_eidt){ //编辑 postData.examInfo = state.examInfo; }else{ @@ -4043,7 +4043,7 @@ function onFocusEnd(){ } - console.log("postData gxdata data" ,postData); + console.log("postData gxdata data" ,postData);*/ if(!postData.name){ return message.error("请输入开课名称"); } @@ -4111,7 +4111,7 @@ function onFocusEnd(){ }); state.cstm_hs = false; }; - + let editBeginClass = ref(false) //编辑开课 const handelEditStu = async (item) => { @@ -4354,7 +4354,7 @@ function onFocusEnd(){ align: "center", customRender: ({ record }) => record.examinationScore ? record.examinationScore : "-", - + }, { title: "结业状态", @@ -5291,13 +5291,13 @@ function onFocusEnd(){ }; const disabledDateTime = () => { - // const dateOnlyStart = new Date(state.xjkkinputV3[0].split(' ')[0]); - // const dateOnlyEnd = new Date(state.xjkkinputV3[1].split(' ')[0]); + // const dateOnlyStart = new Date(state.xjkkinputV3[0].split(' ')[0]); + // const dateOnlyEnd = new Date(state.xjkkinputV3[1].split(' ')[0]); // if(dateOnlyStart.getTime()==dateOnlyEnd.getTime()){ // const currentMinute = dayjs(state.xjkkinputV3[0]).minute(); // return { - // disabledHours: () => range(0, dayjs(state.xjkkinputV3[0]).hour()).splice(0, dayjs(state.xjkkinputV3[0]).hour()), - // disabledMinutes: () => range(0, currentMinute+1).splice(0, currentMinute+1), + // disabledHours: () => range(0, dayjs(state.xjkkinputV3[0]).hour()).splice(0, dayjs(state.xjkkinputV3[0]).hour()), + // disabledMinutes: () => range(0, currentMinute+1).splice(0, currentMinute+1), // }; // } }; From a39a30492416c94491097319be2fed895b513d7d Mon Sep 17 00:00:00 2001 From: joshen Date: Wed, 19 Mar 2025 21:31:12 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=94=BE=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 8a862ea0..c65ce13e 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -4003,7 +4003,7 @@ function onFocusEnd(){ let t = state.signCom ? "1," : "0,"; let p = state.comLeave ? "1" : "0"; let type = t.concat(p); - const postData = { + let postData = { offcourseId: state.offcourseId, id: state.offcoursePlanId, //开课ID,不传代表新增 address: state.xjkkinputV2, @@ -4027,12 +4027,11 @@ function onFocusEnd(){ // teacher: state.member.name, offteachers: state.offteachers, workInfo: state.workInfo, //提交的作业信息 - examInfo: state.examInfo, //提交的考试信息 + // examInfo: state.examInfo, //提交的考试信息 beforeStart: state.beforeValue, //考勤 开始前 afterStart: state.afterStartValue, //考勤 开始后 score: state.scoreParams, }; - //todo 为了合并代码 if(state.kk_eidt){ //编辑 postData.examInfo = state.examInfo; @@ -4044,7 +4043,7 @@ function onFocusEnd(){ } - console.log("postData gxdata data" ,postData);*/ + console.log("postData gxdata data" ,postData); if(!postData.name){ return message.error("请输入开课名称"); } From 263f1cd31de11a4f823a6593bf960df2b1a0f796 Mon Sep 17 00:00:00 2001 From: joshen Date: Wed, 19 Mar 2025 21:49:41 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index c65ce13e..3ca3985b 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -4110,6 +4110,7 @@ function onFocusEnd(){ console.log(err); }); state.cstm_hs = false; + logT(); }; let editBeginClass = ref(false) From 42f22abe369aea652c05713f7482b6e2ea810600 Mon Sep 17 00:00:00 2001 From: joshen Date: Wed, 19 Mar 2025 21:56:28 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=88=A0=E9=99=A4=20=20=20=20=20=20logT();?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 5e803c9b..999956c6 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -4111,7 +4111,6 @@ function onFocusEnd(){ console.log(err); }); state.cstm_hs = false; - logT(); }; let editBeginClass = ref(false) From 64e0fa9013975aeb869b2c562666a4b596b6586f Mon Sep 17 00:00:00 2001 From: joshen Date: Wed, 19 Mar 2025 22:14:38 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 999956c6..f7c76552 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -3474,6 +3474,7 @@ function onFocusEnd(){ }; const logT = () => { state.examInfo = {}; + state.EditTestId = null; }; const removePG = () => { console.log("11111"); @@ -4016,7 +4017,8 @@ function onFocusEnd(){ endTime: endTime, evalFlag: Number(state.assessmentId) > 0 && state.checked4 ? 1 : 0, assessmentId: state.checked4==1?Number(state.assessmentId):0, - testId: state.examInfo.examinationName ? state.EditTestId : null, + // testId: state.examInfo.examinationName ? state.EditTestId : null, + testId: state.examInfo.examinationName ? (state.examInfo.examinationTestId ? state.EditTestId : null): null; homeWorkId: state.EditWorkId, name: state.xjkkinputV1, signFlag: state.xjkkradioV1 ? 1 : 0, //是否允许未报名的签到:1是0否 From 980d70c589de8776540cf157b9c660620c2b3300 Mon Sep 17 00:00:00 2001 From: joshen Date: Wed, 19 Mar 2025 22:16:44 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index f7c76552..051a9a95 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -4018,7 +4018,7 @@ function onFocusEnd(){ evalFlag: Number(state.assessmentId) > 0 && state.checked4 ? 1 : 0, assessmentId: state.checked4==1?Number(state.assessmentId):0, // testId: state.examInfo.examinationName ? state.EditTestId : null, - testId: state.examInfo.examinationName ? (state.examInfo.examinationTestId ? state.EditTestId : null): null; + testId: state.examInfo.examinationName ? (state.examInfo.examinationTestId ? state.EditTestId : null): null, homeWorkId: state.EditWorkId, name: state.xjkkinputV1, signFlag: state.xjkkradioV1 ? 1 : 0, //是否允许未报名的签到:1是0否