Merge branch 'master_20250318-lyc' into master_1202

# Conflicts:
#	src/views/courselibrary/CoursewareManage.vue
This commit is contained in:
joshen
2025-03-24 16:56:10 +08:00

View File

@@ -3471,6 +3471,9 @@ function onFocusEnd(){
};
const logW = () => {
state.workInfo = {};
state.EditWorkId = null;
state.homeWorkId = null;
};
const logT = () => {
state.examInfo = {};
@@ -4021,7 +4024,7 @@ function onFocusEnd(){
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,
homeWorkId: state.EditWorkId,
homeWorkId: state.workInfo.workName ? state.EditWorkId : null,
name: state.xjkkinputV1,
signFlag: state.xjkkradioV1 ? 1 : 0, //是否允许未报名的签到:1是0否
autoGraduateEnabled: state.xjkkradioVEnd ? 1 : 0,