diff --git a/src/components/setAnswer.vue b/src/components/setAnswer.vue
new file mode 100644
index 0000000..bdea248
--- /dev/null
+++ b/src/components/setAnswer.vue
@@ -0,0 +1,347 @@
+<template>
+  <el-dialog :visible.sync="diaVisible" width="400" center>
+    <div slot="title">
+      <p>
+        <!-- 设置答案 <i class="fa fa-exchange" @click="editType = !editType"></i> -->
+        设置答案
+      </p>
+    </div>
+    <div v-show="editType">
+      <div v-for="(item, index) in FormQuestionList" :key="index">
+        <template v-for="(subQuestions, indexs) in item.subQuestions">
+          <div
+            class="sub-questions"
+            :key="indexs"
+            v-if="subQuestions.correctAnswer"
+          >
+            <div class="qs-num">题{{ subQuestions.questionIndex }}</div>
+            <div class="qs-options qs-options2">
+              <p v-if="subQuestions.questionType == 4" class="answer-box">
+                <span
+                  class="answer-s"
+                  :class="subQuestions.correctAnswer == 1 ? 'active' : ''"
+                  @click="subQuestions.correctAnswer = 1"
+                  >✓</span
+                >
+                <span
+                  class="answer-s"
+                  :class="subQuestions.correctAnswer == 2 ? 'active' : ''"
+                  @click="subQuestions.correctAnswer = 2"
+                  >✗</span
+                >
+              </p>
+              <p v-if="subQuestions.questionType == 3" class="answer-box">
+                <span
+                  class="answer-s"
+                  v-for="option in subQuestions.answerOptions"
+                  :class="
+                    subQuestions.correctAnswer.includes(option) ? 'active' : ''
+                  "
+                  :key="option"
+                  @click="changAnswer(subQuestions, option)"
+                  >{{ option }}</span
+                >
+              </p>
+              <p v-if="subQuestions.questionType == 2" class="answer-box">
+                <span
+                  class="answer-s"
+                  v-for="option in subQuestions.answerOptions"
+                  :class="subQuestions.correctAnswer == option ? 'active' : ''"
+                  :key="option"
+                  @click="subQuestions.correctAnswer = option"
+                  >{{ option }}</span
+                >
+              </p>
+            </div>
+          </div>
+        </template>
+      </div>
+    </div>
+    <!-- <div v-show="!editType">
+        <p class="dia-tips">
+            请点击选项按钮设置答案,多选题题目之间用“,”隔开，若添加5道题：“AC,AD,BD,AC,CD”
+          </p>
+        <div class="dia-question-box">
+          <div v-for="(item, index) in FormQuestionList2" :key="index">
+            <template v-for="(items, indexs) in item.subQuestions">
+              <div class="set-questions" :key="indexs">
+                <div class="qs-num">
+                  <p>{{ items.name }}</p>
+                  <p>共{{ items.list.length }}题</p>
+                </div>
+                <div class="qs-options">
+                  <p class="ipt">
+                    <el-input
+                      v-model="items.answerList"
+                      @keydown.native="keydownAnswer($event)"
+                    ></el-input>
+                  </p>
+                  <p class="answer-box">
+                    <template v-if="items.list[0].questionType == 4">
+                      <span
+                        class="answer-s active"
+                        @click="
+                          items.answerList.length < items.list.length
+                            ? (items.answerList += '✓')
+                            : ''
+                        "
+                        >✓</span
+                      >
+                      <span
+                        class="answer-s active"
+                        @click="
+                          items.answerList.length < items.list.length
+                            ? (items.answerList += '✗')
+                            : ''
+                        "
+                        >✗</span
+                      >
+                    </template>
+                    <template v-if="items.list[0].questionType == 3">
+                      <span
+                        class="answer-s active"
+                        v-for="option in items.list[0].answerOptions"
+                        :key="option"
+                        @click="setAnswer(items,option)"
+                        >{{ option }}</span
+                      >
+                      <span
+                        class="answer-s active"
+                        @click="
+                          items.answerList.split(',').length < items.list.length
+                            ? (items.answerList += ',')
+                            : ''
+                        "
+                        >,</span
+                      >
+                    </template>
+                    <template
+                      v-if="items.list[0].questionType == 2"
+                      class="answer-box"
+                    >
+                      <span
+                        class="answer-s active"
+                        v-for="option in items.list[0].answerOptions"
+                        :key="option"
+                        @click="
+                          items.answerList.length < items.list.length
+                            ? (items.answerList += option)
+                            : ''
+                        "
+                        >{{ option }}</span
+                      >
+                    </template>
+                    <span
+                      class="answer-s delButton"
+                      @click="items.answerList = items.answerList.slice(0, -1)"
+                      >x</span
+                    >
+                    <span
+                      class="answer-s ac"
+                      @click="items.answerList = ''"
+                      >AC</span
+                    >
+                  </p>
+                </div>
+              </div>
+            </template>
+          </div>
+        </div>
+      </div> -->
+    <div slot="footer">
+      <el-button class="dia-btn" type="primary" @click="saveAnswer"
+        >确 定</el-button
+      >
+      <el-button class="dia-btn" type="danger" @click="cancel">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { deepClone } from "utils";
+export default {
+  name: "SetAnswer",
+  props: {
+    diaVisible: false, //修改答案
+    paperId: "",
+    questionList: Array,
+  },
+  data() {
+    return {
+      editType: true, //修改答案模式
+      FormQuestionList: [],
+    };
+  },
+  watch: {
+    questionList: {
+      handler: function () {
+        this.FormQuestionList = deepClone(this.questionList);
+        console.log(this.questionList);
+        //组合每道大题中的相同题目
+        // let questionList = deepClone(item.questionList);
+        // for (let i = 0; i < questionList.length; i++) {
+        //   let jsons = {};
+        //   let answerOptions = [];
+        //   questionList[i].subQuestions.map((items) => {
+        //     let txt = this.setSubPro(items.questionType);
+        //     if (jsons[txt]) {
+        //       jsons[txt].push(items);
+        //     } else {
+        //       jsons[txt] = [items];
+        //     }
+        //     if (items.questionType == 2 || items.questionType == 3) {
+        //       if (items.answerOptions.length > answerOptions.length) {
+        //         answerOptions = items.answerOptions;
+        //       }
+        //       jsons[txt][0].answerOptions = answerOptions;
+        //     }
+        //   });
+        //     this.FormQuestionList2[i].subQuestions = Object.keys(jsons).map(
+        //     (item) => {
+        //       return {
+        //         name: item,
+        //         list: jsons[item],
+        //         answerList: "",
+        //       };
+        //     }
+        //   );
+        // }
+      },
+      deep: true,
+    },
+  },
+  methods: {
+    setSubPro(type) {
+      let tit;
+      switch (type) {
+        case 2:
+          tit = "单选题";
+          break;
+        case 3:
+          tit = "多选题";
+          break;
+        case 4:
+          tit = "判断题";
+          break;
+        case 5:
+          tit = "主观题";
+          break;
+      }
+      return tit;
+    },
+    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 = "";
+      }
+    },
+    setAnswer(obj, answer) {
+      //多选答案设置
+      obj.answerList += answer;
+      let str = obj.answerList;
+      let str2 = checkAnswer(
+        str,
+        3,
+        obj.list[0].answerOptions,
+        obj.list.length
+      );
+      obj.answerList = str2;
+    },
+    changAnswer(sub, option) {
+      //设置多选答案
+      let str = new RegExp(option, "g");
+      if (sub.correctAnswer?.includes(option)) {
+        sub.correctAnswer = sub.correctAnswer.replace(str, "");
+      } else {
+        let arrs = (sub.correctAnswer && sub.correctAnswer.split("")) || [];
+        arrs.push(option);
+        sub.correctAnswer = arrs.sort().join("");
+      }
+    },
+    async saveAnswer() {
+      const { data, status, message } = await this.$request.modifyPaper({
+        paperId: this.paperId,
+        questionList: questionList,
+      });
+      if (status == 0) {
+        this.$emit('saveSuccess')
+      } else {
+        this.$message.error(message);
+      }
+    },
+    cancel() {
+      this.$emit('cancel')
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.sub-questions {
+  width: 100%;
+  display: flex;
+  &:hover {
+    background: #f8f8f8;
+  }
+  & > div {
+    min-height: 40px;
+    padding: 5px;
+    flex-shrink: 0;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+  .qs-num {
+    width: 80px;
+    font-size: 16px;
+    color: #333;
+    font-weight: 500;
+  }
+  .qs-options {
+    flex: 1;
+  }
+  .qs-options2 {
+    text-align: left;
+    justify-content: flex-start;
+    padding-left: 20px;
+    .answer-s {
+      cursor: pointer;
+      border-color: #667ffd;
+      color: #667ffd;
+      margin: 0 15px;
+      &.active {
+        color: #fff;
+      }
+    }
+  }
+  :deep(.el-select) {
+    .el-input__inner {
+      border-radius: 20px;
+      border-color: #667ffd;
+      width: 150px;
+      height: 32px;
+      line-height: 32px;
+      background: rgba($color: #667ffd, $alpha: 0.05);
+    }
+    .el-input__icon {
+      line-height: 32px;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/userForm/userInfo.vue b/src/components/userForm/userInfo.vue
deleted file mode 100644
index c6467cb..0000000
--- a/src/components/userForm/userInfo.vue
+++ /dev/null
@@ -1,278 +0,0 @@
-<template>
-  <el-dialog :title="title" width="800px" :visible.sync="visible" destroy-on-close @close="closeCallback">
-    <div class="card">
-    <p class="title"><i class="fa fa-th-large fa-lg"></i>个人资料</p>
-    <el-form :model="ruleForm2" status-icon :rules="rules" ref="ruleForm2" label-width="100px" class="demo-ruleForm">
-      <el-form-item label="用户名" prop="username">
-        <el-input v-model="ruleForm2.username" autocomplete="off"></el-input>
-      </el-form-item>
-      <el-form-item v-if="!userId" label="密码" prop="password">
-        <el-input type="password" v-model="ruleForm2.password" autocomplete="off"></el-input>
-      </el-form-item>
-      <el-form-item v-if="!userId" label="确认密码" prop="checkPass">
-        <el-input type="password" v-model="ruleForm2.checkPass" autocomplete="off"></el-input>
-      </el-form-item>
-      <el-form-item label="角色">
-        <el-select v-if="roleName" v-model="ruleForm2.roleId" disabled  placeholder="请选择等级">
-          <el-option
-            v-for="item in roleData"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id">
-          </el-option>
-        </el-select>
-        <el-select v-else v-model="ruleForm2.roleId"  placeholder="请选择等级">
-          <el-option
-            v-for="item in roleData"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-            :disabled="item.disabled">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="姓名" prop="name">
-        <el-input v-model="ruleForm2.name" autocomplete="off"></el-input>
-      </el-form-item>
-      <el-form-item label="性别">
-        <el-radio-group v-model="ruleForm2.sex">
-          <el-radio label="1">男</el-radio>
-          <el-radio label="2">女</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="年龄" prop="age">
-        <el-input v-model="ruleForm2.age" autocomplete="off"></el-input>
-      </el-form-item>
-      <el-form-item label="手机号" prop="mobilePhone">
-        <el-input v-model="ruleForm2.mobilePhone" autocomplete="off"></el-input>
-      </el-form-item>
-      <el-form-item label="是否启用">
-        <el-switch v-model="ruleForm2.status"></el-switch>
-      </el-form-item>
-      <el-form-item label="头像上传">
-        <el-upload
-          class="avatar-uploader"
-          action="/api/editor/uploadImg"
-          :show-file-list="false"
-          :on-success="handleAvatarSuccess"
-          :before-upload="beforeAvatarUpload">
-          <img v-if="ruleForm2.avatar" :src="ruleForm2.avatar" class="avatar">
-          <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-        </el-upload>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" @click="submitForm('ruleForm2')">确 定</el-button>
-        <el-button @click="resetForm('ruleForm2')">重 置</el-button>
-      </el-form-item>
-    </el-form>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-export default {
-  name: "userInfo",
-  props: {
-    title: {
-      type: String,
-      default: "账号信息"
-    },
-    dialogVisible: {
-      type: Boolean,
-      default: false
-    },
-    userId: {
-      type: String,
-      default: ""
-    }
-  },
-  data () {
-    var validatePass = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("请输入密码"))
-      } else {
-        if (this.ruleForm2.checkPass !== "") {
-          this.$refs.ruleForm2.validateField("checkPass")
-        }
-        callback()
-      }
-    }
-    var validatePass2 = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("请再次输入密码"))
-      } else if (value !== this.ruleForm2.password) {
-        callback(new Error("两次输入密码不一致!"))
-      } else {
-        callback()
-      }
-    }
-    return {
-      roleName: false,
-      roleData: "",
-      visible: this.dialogVisible,
-      ruleForm2: {
-        mobilePhone: "",
-        username: "",
-        password: "",
-        checkPass: "",
-        roleId: "",
-        status: "",
-        sex: "1",
-        age: 0,
-        name: "",
-        avatar: ""
-      },
-      rules: {
-        username: [
-          { required: true, message: "请输入用户名", trigger: "blur" },
-          { min: 3, max: 18, message: "长度在 3 到 18 个字符", trigger: "blur" }
-        ],
-        password: [
-          {required: true, validator: validatePass, trigger: "blur"}
-        ],
-        checkPass: [
-          {required: true, validator: validatePass2, trigger: "blur"}
-        ],
-        roleId: [
-          { required: true, message: "请选择用户角色", trigger: "change" }
-        ]
-      }
-    }
-  },
-  methods: {
-    handleAvatarSuccess (res, file) {
-      this.ruleForm2.avatar = res.data[0]
-    },
-    closeCallback () {
-      this.$emit("successCallback")
-    },
-    beforeAvatarUpload (file) {
-      const isJPG = file.type === "image/jpeg"
-      const isPNG = file.type === "image/png"
-      const isLt2M = file.size / 1024 / 1024 < 2
-
-      if (!(isJPG || isPNG)) {
-        this.$message.error("上传头像图片只能是 JPG/PNG 格式!")
-      }
-      if (!isLt2M) {
-        this.$message.error("上传头像图片大小不能超过 2MB!")
-      }
-      // eslint-disable-next-line no-mixed-operators
-      return isLt2M && isJPG || isPNG
-    },
-    getList () {
-      let that = this
-      this.$request.fetchGetRoleList().then(function (response) {
-        that.roleData = response.data.rows
-        let userId = that.userId
-        if (!userId) {
-          return false
-        }
-        that.$request.fetchGetUserInfoId({id: userId})
-          .then(function (res) {
-            console.log(res)
-            res.data.password = ""
-            if (res.data.status === "1") {
-              res.data.status = true
-            } else {
-              res.data.status = false
-            }
-
-            that.ruleForm2 = res.data
-            that.roleName = true
-            for (let i = 0; i < that.roleData.length; i++) {
-              if (that.$store.getters.info.role === "超级管理员" && that.$store.getters.info.uid !== userId) {
-                that.roleName = false
-              }
-            }
-            return false
-          })
-          .catch(function (error) {
-            console.log(error)
-          })
-      })
-        .catch(function (error) {
-          console.log(error)
-        })
-    },
-    submitForm (formName) {
-      let that = this
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          let newData = {}
-          let fetchFn = this.$request.fetchEditUser
-          if (!that.userId) {
-            for (let item in that.ruleForm2) {
-              if (item !== "checkPass") {
-                newData[item] = that.ruleForm2[item]
-              }
-            }
-            fetchFn = this.$request.fetchRegister
-          } else {
-            for (let item in that.ruleForm2) {
-              if (item !== "password" && item !== "checkPass") {
-                newData[item] = that.ruleForm2[item]
-              }
-            }
-          }
-          fetchFn(newData).then((res) => {
-            that.$message({
-              showClose: true,
-              message: res.data.message,
-              type: "success"
-            })
-          }).catch((err) => {
-            console.log(err)
-          })
-        } else {
-          console.log("error submit!!")
-          return false
-        }
-      })
-    },
-    resetForm (formName) {
-      this.$refs[formName].resetFields()
-    }
-  },
-  mounted () {
-    // this.getList()
-  }
-}
-</script>
-<style scoped>
-  .demo-ruleForm {
-    width: 460px;
-    padding-top: 25px;
-  }
-  .el-select {
-    width: 100%;
-  }
-  .card {
-    width: 560px;
-    padding-bottom: 15px;
-    margin: 0px auto;
-  }
-  .avatar-uploader .el-upload {
-    border: 1px dashed #d9d9d9;
-    border-radius: 6px;
-    cursor: pointer;
-    position: relative;
-    overflow: hidden;
-  }
-  .avatar-uploader .el-upload:hover {
-    border-color: #409EFF;
-  }
-  .avatar-uploader-icon {
-    font-size: 28px;
-    color: #8c939d;
-    width: 178px;
-    height: 178px;
-    line-height: 178px;
-    text-align: center;
-  }
-  .avatar {
-    width: 178px;
-    height: 178px;
-    display: block;
-  }
-</style>
diff --git a/src/views/ask/index.vue b/src/views/ask/index.vue
index 8b80103..c79d8a5 100644
--- a/src/views/ask/index.vue
+++ b/src/views/ask/index.vue
@@ -9,8 +9,8 @@
       <div class="sel-box">
         <el-select
           class="sel"
-          v-model="query.clazzId"
-          placeholder=""
+          v-model="query.classId"
+          placeholder="选择班级"
           @change="changClazz"
         >
           <el-option
@@ -18,11 +18,11 @@
             :key="item.value"
             :label="item.label"
             :value="item.value"
-            >{{ item.label }}
+          >
           </el-option>
         </el-select>
         <el-select
-          v-if="role == '班主任'"
+          v-if="role == 'ROLE_BANZHUREN'"
           class="sel"
           multiple
           collapse-tags
@@ -89,7 +89,7 @@
     <div class="table-box">
       <el-radio-group v-model="tabIndex" style="margin-bottom: 20px">
         <el-radio-button :label="1">单课时报表</el-radio-button>
-        <el-radio-button :label="2" v-if="this.role != '班主任'"
+        <el-radio-button :label="2" v-if="this.role != 'ROLE_BANZHUREN'"
           >阶段问答报表</el-radio-button
         >
         <el-radio-button :label="3">阶段互动报表</el-radio-button>
@@ -283,187 +283,23 @@
         <el-button type="info" plain round icon="fa fa-cloud-download">导出报表</el-button>
       </p>
     </div>
-    <el-dialog :visible.sync="dialogVisible" width="400" center>
-      <div slot="title">
-        <p>
-          <!-- 设置答案 <i class="fa fa-exchange" @click="editType = !editType"></i> -->
-          设置答案
-        </p>
-      </div>
-      <div v-show="editType">
-        <div v-for="(item, index) in form.questionList" :key="index">
-          <template v-for="(subQuestions, indexs) in item.subQuestions">
-            <div
-              class="sub-questions"
-              :key="indexs"
-              v-if="subQuestions.correctAnswer"
-            >
-              <div class="qs-num">题{{ subQuestions.questionIndex }}</div>
-              <div class="qs-options qs-options2">
-                <p v-if="subQuestions.questionType == 4" class="answer-box">
-                  <span
-                    class="answer-s"
-                    :class="subQuestions.correctAnswer == 1 ? 'active' : ''"
-                    @click="subQuestions.correctAnswer = 1"
-                    >✓</span
-                  >
-                  <span
-                    class="answer-s"
-                    :class="subQuestions.correctAnswer == 2 ? 'active' : ''"
-                    @click="subQuestions.correctAnswer = 2"
-                    >✗</span
-                  >
-                </p>
-                <p v-if="subQuestions.questionType == 3" class="answer-box">
-                  <span
-                    class="answer-s"
-                    v-for="option in subQuestions.answerOptions"
-                    :class="
-                      subQuestions.correctAnswer.includes(option)
-                        ? 'active'
-                        : ''
-                    "
-                    :key="option"
-                    @click="changAnswer(subQuestions, option)"
-                    >{{ option }}</span
-                  >
-                </p>
-                <p v-if="subQuestions.questionType == 2" class="answer-box">
-                  <span
-                    class="answer-s"
-                    v-for="option in subQuestions.answerOptions"
-                    :class="
-                      subQuestions.correctAnswer == option ? 'active' : ''
-                    "
-                    :key="option"
-                    @click="subQuestions.correctAnswer = option"
-                    >{{ option }}</span
-                  >
-                </p>
-              </div>
-            </div>
-          </template>
-        </div>
-      </div>
-      <!-- <div v-show="!editType">
-        <p class="dia-tips">
-            请点击选项按钮设置答案,多选题题目之间用“,”隔开，若添加5道题：“AC,AD,BD,AC,CD”
-          </p>
-        <div class="dia-question-box">
-          <div v-for="(item, index) in form2.questionList" :key="index">
-            <template v-for="(items, indexs) in item.subQuestions">
-              <div class="set-questions" :key="indexs">
-                <div class="qs-num">
-                  <p>{{ items.name }}</p>
-                  <p>共{{ items.list.length }}题</p>
-                </div>
-                <div class="qs-options">
-                  <p class="ipt">
-                    <el-input
-                      v-model="items.answerList"
-                      @keydown.native="keydownAnswer($event)"
-                    ></el-input>
-                  </p>
-                  <p class="answer-box">
-                    <template v-if="items.list[0].questionType == 4">
-                      <span
-                        class="answer-s active"
-                        @click="
-                          items.answerList.length < items.list.length
-                            ? (items.answerList += '✓')
-                            : ''
-                        "
-                        >✓</span
-                      >
-                      <span
-                        class="answer-s active"
-                        @click="
-                          items.answerList.length < items.list.length
-                            ? (items.answerList += '✗')
-                            : ''
-                        "
-                        >✗</span
-                      >
-                    </template>
-                    <template v-if="items.list[0].questionType == 3">
-                      <span
-                        class="answer-s active"
-                        v-for="option in items.list[0].answerOptions"
-                        :key="option"
-                        @click="setAnswer(items,option)"
-                        >{{ option }}</span
-                      >
-                      <span
-                        class="answer-s active"
-                        @click="
-                          items.answerList.split(',').length < items.list.length
-                            ? (items.answerList += ',')
-                            : ''
-                        "
-                        >,</span
-                      >
-                    </template>
-                    <template
-                      v-if="items.list[0].questionType == 2"
-                      class="answer-box"
-                    >
-                      <span
-                        class="answer-s active"
-                        v-for="option in items.list[0].answerOptions"
-                        :key="option"
-                        @click="
-                          items.answerList.length < items.list.length
-                            ? (items.answerList += option)
-                            : ''
-                        "
-                        >{{ option }}</span
-                      >
-                    </template>
-                    <span
-                      class="answer-s delButton"
-                      @click="items.answerList = items.answerList.slice(0, -1)"
-                      >x</span
-                    >
-                    <span
-                      class="answer-s ac"
-                      @click="items.answerList = ''"
-                      >AC</span
-                    >
-                  </p>
-                </div>
-              </div>
-            </template>
-          </div>
-        </div>
-      </div> -->
-      <div slot="footer">
-        <el-button class="dia-btn" type="primary" @click="saveAnswer"
-          >确 定</el-button
-        >
-        <el-button class="dia-btn" type="danger" @click="dialogVisible = false"
-          >取 消</el-button
-        >
-      </div>
-    </el-dialog>
+    <set-answer :diaVisible="dialogVisible" :questionList="form.questionList" :paperId="form.id" @saveSuccess="handleSuccess" @cancel="cancel"/>
   </div>
 </template>
 
 <script>
-import { formatDate, deepClone,checkAnswer } from "utils";
+import { formatDate, deepClone, checkAnswer } from "utils";
 export default {
   data() {
     return {
       role: "",
       loading: false,
-      dialogVisible: false, //修改答案
-      editType: true, //修改答案模式
-      editId: "",
+      dialogVisible:false,
       form: { questionList: [] },
-      form2: { questionList: [] },
       date: "", //今天-昨天-本周
       query: {
         //搜索条件
-        clazzId: "",
+        classId: "",
         subjectId: "",
         startDay: "",
         endDay: "",
@@ -563,7 +399,7 @@ export default {
           ],
         },
       ],
-      tableAsk:[
+      tableAsk: [
         {
           xuehao: 1,
           xingming: "丁芳菲",
@@ -571,8 +407,8 @@ export default {
           dadui: 60,
           canyudu: 90,
           allzheng: 80,
-          yidazheng:50,
-          zongpaiming:5
+          yidazheng: 50,
+          zongpaiming: 5,
         },
         {
           xuehao: 1,
@@ -581,11 +417,11 @@ export default {
           dadui: 20,
           canyudu: 80,
           allzheng: 60,
-          yidazheng:65,
-          zongpaiming:4
-        }
+          yidazheng: 65,
+          zongpaiming: 4,
+        },
       ],
-      tableStage:[
+      tableStage: [
         {
           xuehao: 1,
           xingming: "丁芳菲",
@@ -593,19 +429,19 @@ export default {
           dadui: 60,
           chouda: 90,
           choudadui: 80,
-          canyu:50,
-          duicuo:5
-        }
-      ]
+          canyu: 50,
+          duicuo: 5,
+        },
+      ],
     };
   },
   async created() {
-    this.role = this.$store.getters.info.permissions[0]?.roleName;
-    if (this.role == "班主任") {
+    this.role = this.$store.getters.info.permissions[0]?.role||"";
+    if (this.role == "ROLE_BANZHUREN") {
       this.query.subjectId = [];
     }
-    // await this._QueryClassList();
-    // await this._QuerySubjectList();
+    await this._QueryClassList();
+    await this._QuerySubjectList();
     // await this.setDate(1);
     let startDay = this.query?.startDay;
     if (!startDay) {
@@ -623,90 +459,7 @@ export default {
         },
       });
     },
-    setSubPro(type) {
-      let tit;
-      switch (type) {
-        case 2:
-          tit = "单选题";
-          break;
-        case 3:
-          tit = "多选题";
-          break;
-        case 4:
-          tit = "判断题";
-          break;
-        case 5:
-          tit = "主观题";
-          break;
-      }
-      return tit;
-    },
-    edit(item) {
-      this.form = deepClone(item);
-      // this.form2 = deepClone(item);
-      // //组合每道大题中的相同题目
-      // let questionList = deepClone(item.questionList);
-      // for (let i = 0; i < questionList.length; i++) {
-      //   let jsons = {};
-      //   let answerOptions = [];
-      //   questionList[i].subQuestions.map((items) => {
-      //     let txt = this.setSubPro(items.questionType);
-      //     if (jsons[txt]) {
-      //       jsons[txt].push(items);
-      //     } else {
-      //       jsons[txt] = [items];
-      //     }
-      //     if (items.questionType == 2 || items.questionType == 3) {
-      //       if (items.answerOptions.length > answerOptions.length) {
-      //         answerOptions = items.answerOptions;
-      //       }
-      //       jsons[txt][0].answerOptions = answerOptions;
-      //     }
-      //   });
-      //   this.form2.questionList[i].subQuestions = Object.keys(jsons).map(
-      //     (item) => {
-      //       return {
-      //         name: item,
-      //         list: jsons[item],
-      //         answerList: "",
-      //       };
-      //     }
-      //   );
-      // }
-      this.dialogVisible = true;
-    },
-    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 = "";
-      }
-    },
-    setAnswer(obj,answer){//多选答案设置
-      obj.answerList+=answer
-       let str = obj.answerList;
-      let str2 = checkAnswer(
-        str,
-        3,
-        obj.list[0].answerOptions,
-        obj.list.length
-      );
-      obj.answerList = str2;
-    },
+    
     setDate(index) {
       const that = this;
       this.date = index == this.date ? "" : index;
@@ -762,68 +515,55 @@ export default {
         }
       }
     },
-    changAnswer(sub, option) {
-      //设置多选答案
-      let str = new RegExp(option, "g");
-      if (sub.correctAnswer?.includes(option)) {
-        sub.correctAnswer = sub.correctAnswer.replace(str, "");
-      } else {
-        let arrs = (sub.correctAnswer && sub.correctAnswer.split("")) || [];
-        arrs.push(option);
-        sub.correctAnswer = arrs.sort().join("");
-      }
+    edit(item) {
+      this.form = deepClone(item);
+      this.dialogVisible = true;
     },
-    async saveAnswer(){
-       // const { data, code, message } = await this.$request.modifyPaper({...this.form});
-      // if (code == 0) {
-       this.dialogVisible = false
-      // } else {
-      //   this.$message.error(message);
-      // }
+    cancel(){
+      this.dialogVisible = false
+    },
+    handleSuccess(){
+      this.dialogVisible = false
+      this._QueryData()
     },
     async changClazz() {
       await this._QuerySubjectList();
       await this.setDate(1);
     },
     async _QueryClassList() {
-      const { data, code, message } = await this.$request.fetchClassList();
-      if (code === 0) {
+      const { data, status, info } = await this.$request.fetchClassList();
+      if (status === 0) {
         this.classList = data.list.map((item) => {
           return {
-            value: item.clazzId,
+            value: item.classId,
             label: item.clazzName,
           };
         });
-        this.query.clazzId = this.classList[0].value;
+        this.query.classId = this.classList[0]?.value;
       } else {
-        this.$message.error(message);
+        this.$message.error(info);
       }
     },
     async _QuerySubjectList() {
-      const datas = this.query.clazzId
-        ? {
-            clazzId: this.query.clazzId,
-          }
-        : {};
-      const { data, code, message } = await this.$request.fetchSubjectList(
-        datas
+      const { data, status, info } = await this.$request.fetchSubjectList(
+        {classId: this.query.classId,}
       );
-      if (code === 0) {
-        this.subjectList = data.list.map((item) => {
+      if (status === 0) {
+        this.subjectList = data.list?.map((item) => {
           return {
             value: item.subjectId,
             label: item.subjectName,
           };
-        });
-        if (this.role == "班主任") {
+        })||[];
+        if (this.role == "ROLE_BANZHUREN") {
           this.subjectList.unshift({
             value: "",
             label: "全部",
           });
         }
-        this.query.subjectId = this.subjectList[0].value;
+        this.query.subjectId = this.subjectList[0]?.value;
       } else {
-        this.$message.error(message);
+        this.$message.error(info);
       }
     },
     async _QueryData() {
@@ -835,13 +575,13 @@ export default {
           query[key] = this.query[key];
         }
       }
-      const { data, code, message } = await this.$request.fetchQuizList({
+      const { data, status, info } = await this.$request.fetchQuizList({
         ...query,
       });
       this.loading = false;
-      if (code === 0) {
+      if (status === 0) {
       } else {
-        this.$message.error(message);
+        this.$message.error(info);
       }
     },
   },
@@ -862,57 +602,7 @@ export default {
   }
 }
 
-.sub-questions {
-  width: 100%;
-  display: flex;
-  &:hover {
-    background: #f8f8f8;
-  }
-  & > div {
-    min-height: 40px;
-    padding: 5px;
-    flex-shrink: 0;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
-  .qs-num {
-    width: 80px;
-    font-size: 16px;
-    color: #333;
-    font-weight: 500;
-  }
-  .qs-options {
-    flex: 1;
-  }
-  .qs-options2 {
-    text-align: left;
-    justify-content: flex-start;
-    padding-left: 20px;
-    .answer-s {
-      cursor: pointer;
-      border-color: #667ffd;
-      color: #667ffd;
-      margin: 0 15px;
-      &.active {
-        color: #fff;
-      }
-    }
-  }
-  :deep(.el-select) {
-    .el-input__inner {
-      border-radius: 20px;
-      border-color: #667ffd;
-      width: 150px;
-      height: 32px;
-      line-height: 32px;
-      background: rgba($color: #667ffd, $alpha: 0.05);
-    }
-    .el-input__icon {
-      line-height: 32px;
-    }
-  }
-}
+
 .fa-exchange {
   color: #667ffd;
   cursor: pointer;
@@ -924,14 +614,14 @@ export default {
   margin: 0 20px;
   padding: 10px 20px;
 }
-.dia-tips{
-    padding-bottom:10px;
-  }
+.dia-tips {
+  padding-bottom: 10px;
+}
 .dia-question-box {
   padding: 16px 16px 1px;
   background: #f8f8f8;
   border-radius: 10px;
-  
+
   .answer-s {
     width: 36px;
     height: 28px;
@@ -958,13 +648,13 @@ export default {
     background-size: 19px;
     color: transparent;
   }
-  .ac{
+  .ac {
     border-color: #ff6868;
     background: #ff6868;
-    color:#fff
+    color: #fff;
   }
 }
-.down{
-padding-top:16px;
+.down {
+  padding-top: 16px;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/examinationPaper/add.vue b/src/views/examinationPaper/add.vue
index 836e4c4..4ed635b 100644
--- a/src/views/examinationPaper/add.vue
+++ b/src/views/examinationPaper/add.vue
@@ -807,7 +807,7 @@ export default {
       });
       if (status == 0) {
         this.answerTypeList =
-          data.list.map((item) => {
+          data.list?.map((item) => {
             return {
               typeName: item.tag,
               id: item.tagId,
@@ -824,7 +824,7 @@ export default {
       //查询年级列表
       const { data, status, info } = await this.$request.fetchGradeList();
       if (status == 0) {
-        this.gradeList = [...data.gradeNames] || [];
+        this.gradeList = data.gradeNames&&[...data.gradeNames] || [];
         if (this.type != 2) {
           this.form.gradeName = this.gradeList[0];
         }
@@ -838,12 +838,12 @@ export default {
         gradeName: grade,
       });
       if (status === 0) {
-        this.subjectList = data.subjectNames.map((item) => {
+        this.subjectList = data.subjectNames?.map((item) => {
           return {
             value: item,
             label: item,
           };
-        });
+        })||[];
         console.log(this.subjectList);
         if (this.subjectList.length) {
           this.form.subjectName = this.subjectList[0].value;
diff --git a/src/views/examinationPaper/index.vue b/src/views/examinationPaper/index.vue
index 693d49c..3343864 100644
--- a/src/views/examinationPaper/index.vue
+++ b/src/views/examinationPaper/index.vue
@@ -296,12 +296,12 @@ export default {
       console.log(status)
       if (status === 0) {
         if (!!data.list) {
-          this.classList = data.list.map((item) => {
+          this.classList = data.list?.map((item) => {
             return {
               value: item.classId,
               label: item.className,
             };
-          });
+          })||[];
           this.query.classId = this.classList[0]?.value;
         }
       } else {
@@ -314,12 +314,12 @@ export default {
         classId: this.query.classId,
       });
       if (status === 0) {
-        this.subjectList = data.subjectNames.map((item) => {
+        this.subjectList = data.subjectNames?.map((item) => {
           return {
             value: item,
             label: item,
           };
-        });
+        })||[];
         this.query.subjectName = this.subjectList[0]?.value;
       } else {
         this.$message.error(info);
diff --git a/src/views/examinationPaper/recycle.vue b/src/views/examinationPaper/recycle.vue
index 339d146..48bed6a 100644
--- a/src/views/examinationPaper/recycle.vue
+++ b/src/views/examinationPaper/recycle.vue
@@ -250,12 +250,12 @@ export default {
       console.log(status);
       if (status === 0) {
         if (!!data.list) {
-          this.classList = data.list.map((item) => {
+          this.classList = data.list?.map((item) => {
             return {
               value: item.classId,
               label: item.className,
             };
-          });
+          })||[];
           this.query.classId = this.classList[0]?.value;
         }
       } else {
@@ -268,12 +268,12 @@ export default {
         classId: this.query.classId,
       });
       if (status === 0) {
-        this.subjectList = data.subjectNames.map((item) => {
+        this.subjectList = data.subjectNames?.map((item) => {
           return {
             value: item,
             label: item,
           };
-        });
+        })||[];
         this.query.subjectName = this.subjectList[0]?.value;
       } else {
         this.$message.error(info);
@@ -287,7 +287,7 @@ export default {
       });
       if (status === 0) {
         this.typeList =
-          data.list.map((item) => {
+          data.list?.map((item) => {
             return {
               value: item.tagId,
               label: item.tag,
diff --git a/src/views/layout/header/header.vue b/src/views/layout/header/header.vue
index e37892d..a23ba97 100644
--- a/src/views/layout/header/header.vue
+++ b/src/views/layout/header/header.vue
@@ -63,11 +63,10 @@
 import Cookies from "js-cookie";
 import langSelect from "../../../components/lang/langSelect";
 import tabNav from "./tabNav";
-import UserInfo from "../../../components/userForm/userInfo";
 
 export default {
   name: "Header",
-  components: { tabNav, langSelect, UserInfo },
+  components: { tabNav, langSelect },
   computed: {
     permissions: function () {
       return this.$store.getters.info.permissions || [];