Merge branch 'master_1202' into test20250220

src/views/courselibrary/CoursewareManage.vue

@@ -3474,6 +3474,7 @@ function onFocusEnd(){
     };
     const logT = () => {
       state.examInfo = {};
+      state.EditTestId = null;
     };
     const removePG = () => {
       console.log("11111");
@@ -4019,7 +4020,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否
@@ -4030,12 +4032,11 @@ function onFocusEnd(){
         // teacher: state.member.name,
         offteachers: state.offteachers,
         workInfo: state.workInfo, //提交的作业信息
-         //提交的考试信息
+        // examInfo: state.examInfo, //提交的考试信息
         beforeStart: state.beforeValue, //考勤 开始前
         afterStart: state.afterStartValue, //考勤 开始后
         score: state.scoreParams,
       };
-      //todo 为了合并代码
       if(state.kk_eidt){
         console.log("编辑 gx state.kk_eidt",state.kk_eidt)
         console.log("编辑 gx state.kk_eidt",state.examInfo)