Merge branch 'xbnl_20260904(应知应会区分学生/教职工)' into SCHOOL-XiBeiNongLin

src/views/safetyEducationExaminationNew/dataStatistics/ExamSituation.vue

@@ -372,7 +372,7 @@ export default {
     examElStatisticsGetAcademicYear(){
       examElStatisticsGetAcademicYear({}).then(response => {
         this.$set(this,'optionList',response.data);
-        this.$set(this,'valueYear',response.data[0].value);
+        this.$set(this,'valueYear',response.data[0].gradeNumber);
         this.examElStatisticsExamList();
         this.examElStatisticsExamChart();
       });

src/views/safetyEducationExaminationNew/examManagement/examinationArrange/index.vue

@@ -277,6 +277,7 @@
             id:row.id,
             makeupExamId:row.makeupExamId,
             makeupStarted:row.makeupStarted,
+            examTypeId:row.examTypeId,
           });
           this.$set(this,'pageType',3);
         }else if(type == 3){

src/views/safetyEducationExaminationNew/examManagement/examinationArrange/studentsTakingMakeUpExams.vue

@@ -282,6 +282,7 @@
         this.examElExamDetail();
       }
       this.$set(this.newData,'parentExamId',this.propsData.id);
+      this.$set(this.newData,'examTypeId',this.propsData.examTypeId);
       this.examElDisciplineTypeList()
       this.systemDeptCurrentDept()
       this.systemUserGetAcademicYear()
@@ -389,6 +390,7 @@
       getList() {
         let obj = JSON.parse(JSON.stringify(this.queryParams))
         obj.examId = this.newData.parentExamId
+        obj.examTypeId = this.newData.examTypeId;
         if(this.makeupStarted == 0){
           examElExamMakeupCandidates(obj).then(response => {
             this.$set(this, 'dataList', response.data.records)