diff --git a/src/components/backBox.vue b/src/components/backBox.vue
index 4681344..63308f5 100644
--- a/src/components/backBox.vue
+++ b/src/components/backBox.vue
@@ -11,10 +11,20 @@
 </template>
 
 <script>
+import BusEvent from "@/utils/busEvent";
 export default {
   name: "back",
+  props:{
+    params:{
+      type:Object,
+      default:function(){
+        return {}
+      }
+    }
+  },
   methods: {
     back() {
+      BusEvent.$emit("querySel", this.params);
       this.$router.go(-1);
     },
   },
diff --git a/src/components/setAnswer.vue b/src/components/setAnswer.vue
index 86d6797..d8b77bd 100644
--- a/src/components/setAnswer.vue
+++ b/src/components/setAnswer.vue
@@ -90,8 +90,15 @@
         <p>{{ setSubPro(formAns.qusType) }}：</p>
         <p class="ipt">
           <el-input
+            v-if="formAns.qusType == 2 || formAns.qusType == 3"
             v-model="formAns.answerList"
-            @keydown.native="keydownAnswer($event)"
+            @keydown.native="keydownAnswer($event, formAns.qusType)"
+            @input="setAllAnswer($event, formAns.qusType)"
+          ></el-input>
+          <el-input
+            v-if="formAns.qusType == 4"
+            v-model="formAns.answerList"
+            readonly=""
           ></el-input>
         </p>
         <p class="answer-box">
@@ -195,7 +202,7 @@ export default {
         let types = [{}];
         let addndex = 0;
         this.FormQuestionList?.map((sub, index) => {
-          if (!!sub.questionType && sub.questionType!=5) {
+          if (!!sub.questionType && sub.questionType != 5) {
             if (sub.questionType == types[addndex].qusType) {
               //同类型批量答案+1
               types[addndex].subNum += 1;
@@ -220,7 +227,7 @@ export default {
                 //不同类型时如果原有类型数量大于等于5，保存批量答案
                 types[addndex].endIndex =
                   this.questionList[index - 1].questionIndex;
-                types[addndex].index = index-1;
+                types[addndex].index = index - 1;
                 addndex += 1;
                 types[addndex] = {};
               }
@@ -300,8 +307,35 @@ export default {
       }
       return tit;
     },
-    keydownAnswer(event) {
-      //快速答案设置禁止输入
+    // keydownAnswer(event) {
+    //   //快速答案设置禁止输入
+    //   if (
+    //     event.key == "Meta" ||
+    //     event.key == "CapsLock" ||
+    //     event.key == "Shift" ||
+    //     event.key == "Enter" ||
+    //     event.key == "Alt" ||
+    //     event.key == "Backspace" ||
+    //     event.key == "Delete" ||
+    //     event.key == "ArrowUp" ||
+    //     event.key == "ArrowDown" ||
+    //     event.key == "ArrowLeft" ||
+    //     event.key == "v" ||
+    //     event.key == "V" ||
+    //     event.key == "ArrowRight"
+    //   ) {
+    //     return;
+    //   } else {
+    //     event.returnValue = "";
+    //   }
+    // },
+    keydownAnswer(event, type) {
+      let answerA = "ABCDEFG";
+      let answer_a = "abcdefg";
+      answerA = answerA.substring(0, this.formAns.subNum);
+      answer_a = answer_a.substring(0, this.formAns.subNum);
+      answerA += answer_a;
+      answerA = type == 2 ? answerA : answerA + ",";
       if (
         event.key == "Meta" ||
         event.key == "CapsLock" ||
@@ -316,12 +350,22 @@ export default {
         event.key == "v" ||
         event.key == "V" ||
         event.key == "ArrowRight"
-      ) {
+      )
         return;
-      } else {
+      if (!answerA.includes(event.key)) {
         event.returnValue = "";
       }
     },
+    setAllAnswer(event, type) {
+      let str = this.formAns.answerList;
+      let str2 = checkAnswer(
+        str,
+        type,
+        this.formAns.answerOptions.split(",").length,
+        this.formAns.subNum
+      );
+      this.formAns.answerList = str2;
+    },
     setAnswer(type, ans) {
       let txt = "";
       if (type == 2) {
@@ -329,7 +373,7 @@ export default {
       } else if (type == 3) {
         txt = ans + ",";
       } else if (type == 4) {
-        txt = ans == 1 ? "✓" : "✗";
+        txt = ans == 1 ? "✓" : ans == 2 ? "✗" : "";
       }
       return txt;
     },
diff --git a/src/utils/busEvent.js b/src/utils/busEvent.js
new file mode 100644
index 0000000..d3670d5
--- /dev/null
+++ b/src/utils/busEvent.js
@@ -0,0 +1,8 @@
+// busEvent.js
+import Vue from 'vue'
+ 
+/**
+ * 非父子组件传值
+ */
+var BusEvent = new Vue({});
+export default BusEvent;
\ No newline at end of file
diff --git a/src/views/examinationPaper/add.vue b/src/views/examinationPaper/add.vue
index e2e90c1..47551d3 100644
--- a/src/views/examinationPaper/add.vue
+++ b/src/views/examinationPaper/add.vue
@@ -519,8 +519,15 @@
               <p>{{ setSubPro(formAns.qusType) }}：</p>
               <p class="ipt">
                 <el-input
+                  v-if="formAns.qusType ==2 ||formAns.qusType==3"
                   v-model="formAns.answerList"
-                  @keydown.native="keydownAnswer($event)"
+                  @keydown.native="keydownAnswer($event,formAns.qusType)"
+                  @input="setAllAnswer($event, formAns.qusType)"
+                ></el-input>
+                <el-input
+                  v-if="formAns.qusType ==4"
+                  v-model="formAns.answerList"
+                  readonly=""
                 ></el-input>
               </p>
               <p class="answer-box">
@@ -856,8 +863,35 @@ export default {
       }
       this.diaSetAns = false;
     },
-    keydownAnswer(event) {
-      //快速答案设置禁止输入
+    // keydownAnswer(event) {
+    //   //快速答案设置禁止输入
+    //   if (
+    //     event.key == "Meta" ||
+    //     event.key == "CapsLock" ||
+    //     event.key == "Shift" ||
+    //     event.key == "Enter" ||
+    //     event.key == "Alt" ||
+    //     event.key == "Backspace" ||
+    //     event.key == "Delete" ||
+    //     event.key == "ArrowUp" ||
+    //     event.key == "ArrowDown" ||
+    //     event.key == "ArrowLeft" ||
+    //     event.key == "v" ||
+    //     event.key == "V" ||
+    //     event.key == "ArrowRight"
+    //   ) {
+    //     return;
+    //   } else {
+    //     event.returnValue = "";
+    //   }
+    // },
+    keydownAnswer(event, type) {
+      let answerA = "ABCDEFG";
+      let answer_a = "abcdefg";
+      answerA = answerA.substring(0, this.formAns.subNum);
+      answer_a = answer_a.substring(0, this.formAns.subNum);
+      answerA += answer_a;
+      answerA = type == 2 ? answerA : answerA + ",";
       if (
         event.key == "Meta" ||
         event.key == "CapsLock" ||
@@ -872,12 +906,22 @@ export default {
         event.key == "v" ||
         event.key == "V" ||
         event.key == "ArrowRight"
-      ) {
+      )
         return;
-      } else {
+      if (!answerA.includes(event.key)) {
         event.returnValue = "";
       }
     },
+    setAllAnswer(event, type){
+      let str = this.formAns.answerList;
+      let str2 = checkAnswer(
+        str,
+        type,
+        this.formAns.answerOptions.split(',').length,
+        this.formAns.subNum
+      );
+      this.formAns.answerList = str2;
+    },
     setAnswer(type, ans) {
       let txt = "";
       if (type == 2) {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index c723022..ffa3fe8 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -95,8 +95,8 @@ export default {
       loginForm: {
         // username: "15911715665",
         // password: "715665",
-        username: "18314340313",
-        password: "Pw340313#",
+        // username: "18314340313",
+        // password: "Pw340313#",
         // username: "18687826606",
         // password: "Pw826606#",
         // username: "18893712576",
diff --git a/src/views/test/editAnswer.vue b/src/views/test/editAnswer.vue
index 971c5f3..950448d 100644
--- a/src/views/test/editAnswer.vue
+++ b/src/views/test/editAnswer.vue
@@ -220,8 +220,15 @@
         <p>{{ setSubPro(formAns.qusType) }}：</p>
         <p class="ipt">
           <el-input
+            v-if="formAns.qusType == 2 || formAns.qusType == 3"
             v-model="formAns.answerList"
-            @keydown.native="keydownAnswer($event)"
+            @keydown.native="keydownAnswer($event, formAns.qusType)"
+            @input="setAllAnswer($event, formAns.qusType)"
+          ></el-input>
+          <el-input
+            v-if="formAns.qusType == 4"
+            v-model="formAns.answerList"
+            readonly=""
           ></el-input>
         </p>
         <p class="answer-box">
@@ -377,8 +384,35 @@ export default {
 
       return txt;
     },
-    keydownAnswer(event) {
-      //快速答案设置禁止输入
+    // keydownAnswer(event) {
+    //   //快速答案设置禁止输入
+    //   if (
+    //     event.key == "Meta" ||
+    //     event.key == "CapsLock" ||
+    //     event.key == "Shift" ||
+    //     event.key == "Enter" ||
+    //     event.key == "Alt" ||
+    //     event.key == "Backspace" ||
+    //     event.key == "Delete" ||
+    //     event.key == "ArrowUp" ||
+    //     event.key == "ArrowDown" ||
+    //     event.key == "ArrowLeft" ||
+    //     event.key == "v" ||
+    //     event.key == "V" ||
+    //     event.key == "ArrowRight"
+    //   ) {
+    //     return;
+    //   } else {
+    //     event.returnValue = "";
+    //   }
+    // },
+    keydownAnswer(event, type) {
+      let answerA = "ABCDEFG";
+      let answer_a = "abcdefg";
+      answerA = answerA.substring(0, this.formAns.subNum);
+      answer_a = answer_a.substring(0, this.formAns.subNum);
+      answerA += answer_a;
+      answerA = type == 2 ? answerA : answerA + ",";
       if (
         event.key == "Meta" ||
         event.key == "CapsLock" ||
@@ -393,12 +427,22 @@ export default {
         event.key == "v" ||
         event.key == "V" ||
         event.key == "ArrowRight"
-      ) {
+      )
         return;
-      } else {
+      if (!answerA.includes(event.key)) {
         event.returnValue = "";
       }
     },
+    setAllAnswer(event, type){
+      let str = this.formAns.answerList;
+      let str2 = checkAnswer(
+        str,
+        type,
+        this.formAns.answerOptions.split(',').length,
+        this.formAns.subNum
+      );
+      this.formAns.answerList = str2;
+    },
     setAnswer(type, ans) {
       let txt = "";
       if (type == 2) {
@@ -406,7 +450,7 @@ export default {
       } else if (type == 3) {
         txt = ans + ",";
       } else if (type == 4) {
-        txt = ans == 1 ? "✓" : "✗";
+        txt = ans == 1 ? "✓" : ans == 2 ? "✗" : "";
       }
       return txt;
     },