diff --git a/src/views/basic/test/components/test.vue b/src/views/basic/test/components/test.vue
index 91ed041..de95710 100644
--- a/src/views/basic/test/components/test.vue
+++ b/src/views/basic/test/components/test.vue
@@ -430,17 +430,19 @@
           >打印</el-button
         >
       </div>
-      <div v-if="!status">
+      <div
+        v-if="
+          (!status &&
+            examReport.subjectiveScore != examReport.examPaperScore) ||
+          examReport.examPaperId != 0
+        "
+      >
         <el-button type="primary" round @click="openScoreSet"
           >答卷录分</el-button
         >
 
         <template v-if="role != 'ROLE_BANZHUREN'">
-          <el-button
-            @click="edit"
-            type="primary"
-            v-if="examReport.subjectiveScore != examReport.examPaperScore"
-            round
+          <el-button @click="edit" type="primary" round
             >查看题目</el-button
           ></template
         >
diff --git a/src/views/basic/test/list.vue b/src/views/basic/test/list.vue
index d0fbb7c..6771d44 100644
--- a/src/views/basic/test/list.vue
+++ b/src/views/basic/test/list.vue
@@ -155,8 +155,9 @@
                 </template>
                 <el-tooltip
                   v-if="
-                    scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-                    scoped.row.answerNum != 0
+                    role != 'ROLE_BANZHUREN' &&
+                    scoped.row.subjectiveScore != scoped.row.examPaperScore &&
+                    scoped.row.examPaperId != 0
                   "
                   effect="dark"
                   content="答卷录分"
@@ -392,26 +393,26 @@ export default {
     },
     // 班主任教学班不能与行政班汇总
     checkboxDisabled(obj) {
-      if (this.role == "ROLE_BANZHUREN") {
-        let id = this.multipleSelection[0] || "";
-        if (id) {
-          let classId;
-          for (let i = 0; i < this.tableData.length; i++) {
-            if (this.tableData[i].id == id) {
-              classId = this.tableData[i].classId;
-              break;
+      if (obj.examStartTime) {
+        if (this.role == "ROLE_BANZHUREN") {
+          let id = this.multipleSelection[0] || "";
+          if (id) {
+            let classId;
+            for (let i = 0; i < this.tableData.length; i++) {
+              if (this.tableData[i].id == id) {
+                classId = this.tableData[i].classId;
+                break;
+              }
             }
+            return obj.classId == classId ? false : true;
+          } else {
+            return false;
           }
-          return obj.classId == classId ? false : true;
         } else {
           return false;
         }
       } else {
-        if (obj.examStartTime) {
-          return false;
-        } else {
-          return true;
-        }
+        return true;
       }
     },
     handleSelectionChange(val) {
@@ -512,7 +513,11 @@ export default {
             this.isMultipleClass = true;
             //多班级
             let tableObj = {};
-            data?.list?.map((item) => {
+            let dataList =
+              data?.list?.filter((item) => {
+                return item.examStatus == 2;
+              }) || [];
+            dataList?.map((item) => {
               if (tableObj[item.examPaperId] && item.examPaperId != 0) {
                 // 没有班级考试的添加
                 if (
diff --git a/src/views/examinationPaper/addQs.vue b/src/views/examinationPaper/addQs.vue
index 258de2b..778579c 100644
--- a/src/views/examinationPaper/addQs.vue
+++ b/src/views/examinationPaper/addQs.vue
@@ -945,7 +945,7 @@ export default {
     //整理问题
     formateQuestion() {
       this.formatQuestionList();
-      if (this.form.questionList[0]?.subQuestions) {
+      if (questionList[0]?.subQuestions) {
         this.form.questionList?.map((item) => {
           let types = [{}];
           let addndex = 0;
@@ -1005,7 +1005,8 @@ export default {
       } else {
         let types = [{}];
         let addndex = 0;
-        this.form.questionList = this.form.questionList.map((sub, index) => {
+        let questionList = [...this.form.questionList];
+        this.form.questionList = questionList.map((sub, index) => {
           if (!!sub.questionType) {
             if (
               sub.questionType == types[addndex].qusType &&
@@ -1023,7 +1024,7 @@ export default {
               //   sub.correctAnswer
               // );
               types[addndex].answerList = "";
-              if (index == this.form.questionList.length - 1) {
+              if (index == questionList.length - 1) {
                 //循环最后类型数量大于等于5，保存批量答案
                 if (types[addndex].subNum && types[addndex].subNum >= 5) {
                   types[addndex].endIndex = sub.questionIndex;
@@ -1033,8 +1034,7 @@ export default {
             } else {
               if (types[addndex].subNum && types[addndex].subNum >= 5) {
                 //不同类型时如果原有类型数量大于等于5，保存批量答案
-                types[addndex].endIndex =
-                  this.form.questionList[index - 1].questionIndex;
+                types[addndex].endIndex = questionList[index - 1].questionIndex;
                 types[addndex].index = index - 1;
                 addndex += 1;
                 types[addndex] = {};
diff --git a/src/views/examinationPaper/edit.vue b/src/views/examinationPaper/edit.vue
index fce8ab0..aa56d59 100644
--- a/src/views/examinationPaper/edit.vue
+++ b/src/views/examinationPaper/edit.vue
@@ -1102,6 +1102,7 @@ export default {
             ) {
               //同类型批量答案+1
               types[addndex].subNum += 1;
+              //最大选项
               if (
                 types[addndex].answerOptions.length < sub.answerOptions.length
               ) {
@@ -1111,7 +1112,8 @@ export default {
                 sub.questionType,
                 sub.correctAnswer
               );
-              if (index == this.questionList.length - 1) {
+
+              if (index == arr.length - 1) {
                 //循环最后类型数量大于等于5，保存批量答案
                 if (types[addndex].subNum && types[addndex].subNum >= 5) {
                   types[addndex].endIndex = sub.questionIndex;
@@ -1139,6 +1141,7 @@ export default {
           }
           return sub;
         });
+        console.log(types);
         for (let i = 0; i < types.length; i++) {
           if (types[i].qusType == 3) {
             types[i].answerList = types[i].answerList.slice(0, -1);