diff --git a/src/views/basic/ask/index.vue b/src/views/basic/ask/index.vue
index 6c3ba87..2f1545c 100644
--- a/src/views/basic/ask/index.vue
+++ b/src/views/basic/ask/index.vue
@@ -8,41 +8,93 @@
       <div class="select-box">
         <div class="sel-item">
           <span class="sel-label">班级：</span>
-          <el-select class="sel" v-model="query.classId" placeholder="选择班级" @change="changeclass">
-            <el-option v-for="item in classList" :key="item.value" :label="item.label" :value="item.value">
+          <el-select
+            class="sel"
+            v-model="query.classId"
+            placeholder="选择班级"
+            @change="changeclass"
+          >
+            <el-option
+              v-for="item in classList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
             </el-option>
           </el-select>
         </div>
-        <div class="sel-item sel-item2">
+        <div class="sel-item sel-item2" v-if="role == 'ROLE_BANZHUREN'">
           <span class="sel-label">科目：</span>
           <div class="sel-d">
             <p class="p-all">
-              <el-checkbox :indeterminate="isIndeterminate" v-model="allSubject"
-                @change="handleCheckAllChange">全选</el-checkbox>
+              <el-checkbox
+                :indeterminate="isIndeterminate"
+                v-model="allSubject"
+                @change="handleCheckAllChange"
+                >全选</el-checkbox
+              >
             </p>
             <p class="sel-p">
-              <el-checkbox-group v-model="query.subjectNames" @change="handleChecked">
-                <el-checkbox v-for="item in subjectList" :label="item" :key="item">{{ item
-                }}</el-checkbox>
+              <el-checkbox-group
+                v-model="query.subjectNames"
+                @change="handleChecked"
+              >
+                <el-checkbox
+                  v-for="item in subjectList"
+                  :label="item"
+                  :key="item"
+                  >{{ item }}</el-checkbox
+                >
               </el-checkbox-group>
             </p>
           </div>
         </div>
+        <div class="sel-item sel-item2" v-else>
+          <span class="sel-label">科目：</span>
+          <div class="sel-d">
+            <p class="sel-p">
+              <el-radio-group v-model="query.subjectNames">
+                <el-radio
+                  v-for="item in subjectList"
+                  :label="item"
+                  :key="item"
+                  >{{ item }}</el-radio
+                >
+              </el-radio-group>
+            </p>
+          </div>
+        </div>
         <div class="sel-item">
           <span class="sel-label">日期：</span>
           <div class="d1">
-            <el-date-picker v-model="query.startDay" type="date" @change="handleChangeTimeStart" placeholder="选择日期时间"
-              value-format="yyyy-MM-dd">
+            <el-date-picker
+              v-model="query.startDay"
+              type="date"
+              @change="handleChangeTimeStart"
+              placeholder="选择日期时间"
+              value-format="yyyy-MM-dd"
+            >
             </el-date-picker>
             ~
-            <el-date-picker v-model="query.endDay" type="date" placeholder="选择日期时间" @change="handleChangeTimeEnd"
-              value-format="yyyy-MM-dd">
+            <el-date-picker
+              v-model="query.endDay"
+              type="date"
+              placeholder="选择日期时间"
+              @change="handleChangeTimeEnd"
+              value-format="yyyy-MM-dd"
+            >
             </el-date-picker>
           </div>
           <p class="p1">
-            <span @click="setDate(1)" :class="[date == 1 ? 'active' : '', 's1']">本周</span>
-            <span @click="setDate(2)" :class="[date == 2 ? 'active' : '', 's1']">本月</span>
-            <span @click="setDate(3)" :class="[date == 3 ? 'active' : '', 's1']">本季度</span>
+            <span @click="setDate(1)" :class="[date == 1 ? 'active' : '', 's1']"
+              >本周</span
+            >
+            <span @click="setDate(2)" :class="[date == 2 ? 'active' : '', 's1']"
+              >本月</span
+            >
+            <span @click="setDate(3)" :class="[date == 3 ? 'active' : '', 's1']"
+              >本季度</span
+            >
           </p>
         </div>
       </div>
@@ -72,8 +124,8 @@ export default {
       classList: [], //班级
       subjectList: [], //科目
 
-      isIndeterminate: true,//全选样式
-      allSubject: false,//全选状态
+      isIndeterminate: true, //全选样式
+      allSubject: false, //全选状态
     };
   },
   async created() {
@@ -101,10 +153,11 @@ export default {
       this.query.subjectNames = val ? this.subjectList : [];
     },
     handleChecked(value) {
-      console.log(value)
+      console.log(value);
       let checkedCount = value.length;
       this.allSubject = checkedCount === this.subjectList.length;
-      this.isIndeterminate = checkedCount > 0 && checkedCount < this.subjectList.length;
+      this.isIndeterminate =
+        checkedCount > 0 && checkedCount < this.subjectList.length;
     },
     setDate(index) {
       const that = this;
@@ -168,18 +221,18 @@ export default {
     },
 
     async changeclass() {
-      this.allSubject = false
-      this.query.subjectNames = []
+      this.allSubject = false;
+      this.query.subjectNames = [];
       await this._QuerySubjectList();
     },
 
     async _QueryClassList() {
       const fetchClassList =
         this.role == "ROLE_BANZHUREN"
-          ? this.$request.cTClassList :
-          this.role == "ROLE_PERSONAL"
-            ? this.$request.pClassList
-            : this.$request.tClassList;
+          ? this.$request.cTClassList
+          : this.role == "ROLE_PERSONAL"
+          ? this.$request.pClassList
+          : this.$request.tClassList;
       const { data, status, info } = await fetchClassList();
       if (status === 0) {
         this.classList = data.list.map((item) => {
@@ -196,10 +249,10 @@ export default {
     async _QuerySubjectList() {
       const fetchSubjectList =
         this.role == "ROLE_BANZHUREN"
-          ? this.$request.cTSubjectList :
-          this.role == "ROLE_PERSONAL"
-            ? this.$request.pSubjectList
-            : this.$request.tSubjectList;
+          ? this.$request.cTSubjectList
+          : this.role == "ROLE_PERSONAL"
+          ? this.$request.pSubjectList
+          : this.$request.tSubjectList;
 
       const { data, status, info } = await fetchSubjectList({
         classId: this.query.classId,
@@ -207,9 +260,11 @@ export default {
       if (status === 0) {
         this.subjectList = data.subjectNames || [];
         if (this.role == "ROLE_BANZHUREN") {
-          this.query.subjectNames = this.subjectList
+          this.query.subjectNames = this.subjectList;
         } else {
-          this.subjectList.length ? this.query.subjectNames.push(this.subjectList[0]) : "";
+          this.subjectList.length
+            ? (this.query.subjectNames = this.subjectList[0])
+            : "";
         }
       } else {
         this.$message.error(info);
@@ -219,29 +274,29 @@ export default {
     //回主页
     goHome() {
       this.$router.push({
-        path: '/index'
-      })
+        path: "/index",
+      });
     },
     //去列表
     goList() {
       let className;
-      this.classList.map(item => {
+      this.classList.map((item) => {
         if (item.value == this.query.classId) {
-          className = item.label
+          className = item.label;
         }
-      })
-      if(this.query.subjectNames.length == 0){
-        this.$message.warning("请选择科目！")
-        return
+      });
+      if (this.query.subjectNames.length == 0) {
+        this.$message.warning("请选择科目！");
+        return;
       }
       this.$router.push({
-        path: '/askList',
+        path: "/askList",
         query: {
           className: className,
-          params: JSON.stringify(this.query)
-        }
-      })
-    }
+          params: JSON.stringify(this.query),
+        },
+      });
+    },
   },
 };
 </script>
@@ -259,7 +314,7 @@ div::-webkit-scrollbar-thumb {
 <style lang="scss" scoped>
 .main {
   height: 100%;
-  background: rgba($color: #000000, $alpha: .3);
+  background: rgba($color: #000000, $alpha: 0.3);
   display: flex;
   justify-content: center;
 }
diff --git a/src/views/basic/test/index.vue b/src/views/basic/test/index.vue
index e782f5f..ab02b30 100644
--- a/src/views/basic/test/index.vue
+++ b/src/views/basic/test/index.vue
@@ -59,7 +59,7 @@
           <span class="sel-label">科目：</span>
           <div class="sel-d">
             <p class="sel-p">
-              <el-radio-group v-model="query.subjectNames" @change="CheckedSub">
+              <el-radio-group v-model="query.subjectNames">
                 <el-radio
                   v-for="item in subjectList"
                   :label="item"
diff --git a/src/views/examinationPaper/addQs.vue b/src/views/examinationPaper/addQs.vue
index 10efdd7..a669ac1 100644
--- a/src/views/examinationPaper/addQs.vue
+++ b/src/views/examinationPaper/addQs.vue
@@ -177,7 +177,7 @@
                       <p v-if="question.questionType == 3" class="answer-box">
                         <span
                           class="answer-s"
-                          v-for="option in question.answerOptions.split(',')"
+                          v-for="option in question.answerOptions?.split(',')"
                           :class="
                             question.correctAnswer?.includes(option)
                               ? 'active'
@@ -191,7 +191,7 @@
                       <p v-if="question.questionType == 2" class="answer-box">
                         <span
                           class="answer-s"
-                          v-for="option in question.answerOptions.split(',')"
+                          v-for="option in question.answerOptions?.split(',')"
                           :class="
                             question.correctAnswer == option ? 'active' : ''
                           "
@@ -361,7 +361,7 @@
                       >
                         <span
                           class="answer-s"
-                          v-for="option in subQuestions.answerOptions.split(
+                          v-for="option in subQuestions.answerOptions?.split(
                             ','
                           )"
                           :class="
@@ -380,7 +380,7 @@
                       >
                         <span
                           class="answer-s"
-                          v-for="option in subQuestions.answerOptions.split(
+                          v-for="option in subQuestions.answerOptions?.split(
                             ','
                           )"
                           :class="
@@ -1115,7 +1115,7 @@ export default {
     },
     //添加选项
     addOptions(subQuestions) {
-      let length = subQuestions.answerOptions.split(",").length;
+      let length = subQuestions.answerOptions?.split(",").length || 0;
       if (length > 9) return;
       subQuestions.selectNum = length + 1;
       subQuestions.answerOptions = this.rightOptions
@@ -1124,7 +1124,7 @@ export default {
     },
     //删除选项
     removeOptions(subQuestions) {
-      let length = subQuestions.answerOptions.split(",").length;
+      let length = subQuestions.answerOptions?.split(",").length || 0;
       if (length < 3) return;
       subQuestions.selectNum = length - 1;
       subQuestions.answerOptions = this.rightOptions
@@ -1497,6 +1497,7 @@ export default {
             show: false,
           };
         } else {
+          item.correctAnswer = item.correctAnswer || "";
           return {
             ...item,
           };
diff --git a/src/views/examinationPaper/edit.vue b/src/views/examinationPaper/edit.vue
index aa56d59..2f9bad9 100644
--- a/src/views/examinationPaper/edit.vue
+++ b/src/views/examinationPaper/edit.vue
@@ -23,7 +23,10 @@
         <p class="totals">卷面总分：{{ allScore }}分</p>
       </div>
       <div class="question-box">
-        <ul class="questions-ul questions-ul2" v-if="examType == 1">
+        <ul
+          class="questions-ul questions-ul2"
+          v-if="!questionList[0]?.subQuestions"
+        >
           <li class="sub-questions">
             <div class="qs-num">题号</div>
             <div class="qs-type">题型</div>
@@ -34,126 +37,10 @@
             <div class="qs-set">题目解析</div>
             <div class="qs-set">知识点</div>
           </li>
-          <li v-for="(subQuestions, indexs) in questionList" :key="indexs">
-            <p
-              class="set-ans-btn"
-              v-if="
-                subQuestions.qusType &&
-                subQuestions.subNum &&
-                subQuestions.subNum > 4
-              "
-            >
-              <el-button type="primary" @click="setFormAns(indexs)"
-                >批量设置答案</el-button
-              >
-            </p>
-            <div v-else class="sub-questions">
-              <div class="qs-num">{{ subQuestions.questionIndex }}</div>
-              <div class="qs-type">
-                {{ setSubPro(subQuestions.questionType) }}
-              </div>
-              <div class="qs-score">
-                {{ subQuestions.score }}
-              </div>
-              <div class="qs-partScore">
-                <p v-if="subQuestions.questionType != 3">--</p>
-                <el-input-number
-                  class="number-ipt"
-                  v-else
-                  size="medium"
-                  :min="0"
-                  :precision="2"
-                  :max="subQuestions.score"
-                  :step="0.5"
-                  v-model="subQuestions.partScore"
-                  label="漏选得分"
-                ></el-input-number>
-              </div>
-              <div class="qs-options qs-options2">
-                <p v-if="subQuestions.questionType == 5">--</p>
-                <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">
-                  <template
-                    v-for="option in subQuestions.answerOptions?.split(',')"
-                  >
-                    <span
-                      v-if="option"
-                      class="answer-s"
-                      :class="
-                        subQuestions.correctAnswer.includes(option)
-                          ? 'active'
-                          : ''
-                      "
-                      :key="option"
-                      @click="changAnswer(subQuestions, option)"
-                      >{{ option }}</span
-                    >
-                  </template>
-                </p>
-                <p v-if="subQuestions.questionType == 2" class="answer-box">
-                  <template
-                    v-for="option in subQuestions.answerOptions?.split(',')"
-                  >
-                    <span
-                      class="answer-s"
-                      v-if="option"
-                      :class="
-                        subQuestions.correctAnswer == option ? 'active' : ''
-                      "
-                      :key="option"
-                      @click="subQuestions.correctAnswer = option"
-                      >{{ option }}</span
-                    >
-                  </template>
-                </p>
-              </div>
-              <div class="qs-set">
-                <el-button
-                  class="icon-tickets"
-                  type="primary"
-                  circle
-                  size="mini"
-                  icon="el-icon-tickets"
-                  @click="openStem(subQuestions, 1, indexs)"
-                ></el-button>
-              </div>
-              <div class="qs-set">
-                <el-button
-                  class="icon-tickets"
-                  type="primary"
-                  circle
-                  size="mini"
-                  icon="el-icon-tickets"
-                  @click="openStem(subQuestions, 2, indexs)"
-                ></el-button>
-              </div>
-              <div class="qs-set">
-                <el-button
-                  type="primary"
-                  circle
-                  size="mini"
-                  icon="el-icon-price-tag"
-                  @click="openKnowledge(subQuestions, indexs)"
-                ></el-button>
-              </div>
-            </div>
-          </li>
         </ul>
-        <template v-if="examType == 2">
-          <template v-for="(question, index) in questionList">
+
+        <template v-for="(question, index) in questionList">
+          <template v-if="question.subQuestions">
             <p class="question-title" v-if="paperType == 2">
               <span>{{ setBigNum(index) }}、</span>
               <el-input
@@ -249,7 +136,7 @@
                           v-if="option"
                           class="answer-s"
                           :class="
-                            subQuestions.correctAnswer.includes(option)
+                            subQuestions.correctAnswer?.includes(option)
                               ? 'active'
                               : ''
                           "
@@ -309,6 +196,124 @@
               </div>
             </div>
           </template>
+          <div v-else>
+            <p
+              class="set-ans-btn"
+              v-if="question.qusType && question.subNum && question.subNum > 4"
+            >
+              <el-button type="primary" @click="setFormAns(index)"
+                >批量设置答案</el-button
+              >
+            </p>
+            <div v-else class="sub-questions">
+              <div class="qs-num">{{ question.questionIndex }}</div>
+              <div class="qs-type">
+                {{ setSubPro(question.questionType) }}
+              </div>
+              <div class="qs-score">
+                <el-input-number
+                  class="number-ipt"
+                  size="medium"
+                  :min="1"
+                  :max="200"
+                  :precision="2"
+                  :step="1"
+                  v-model="question.score"
+                  label="单题分值"
+                ></el-input-number>
+              </div>
+              <div class="qs-partScore">
+                <p v-if="question.questionType != 3">--</p>
+                <el-input-number
+                  class="number-ipt"
+                  v-else
+                  size="medium"
+                  :min="0"
+                  :precision="2"
+                  :max="question.score"
+                  :step="0.5"
+                  v-model="question.partScore"
+                  label="漏选得分"
+                ></el-input-number>
+              </div>
+              <div class="qs-options qs-options2">
+                <p v-if="question.questionType == 5">--</p>
+                <p v-if="question.questionType == 4" class="answer-box">
+                  <span
+                    class="answer-s"
+                    :class="question.correctAnswer == 1 ? 'active' : ''"
+                    @click="question.correctAnswer = 1"
+                    >✓</span
+                  >
+                  <span
+                    class="answer-s"
+                    :class="question.correctAnswer == 2 ? 'active' : ''"
+                    @click="question.correctAnswer = 2"
+                    >✗</span
+                  >
+                </p>
+                <p v-if="question.questionType == 3" class="answer-box">
+                  <template
+                    v-for="option in question.answerOptions?.split(',')"
+                  >
+                    <span
+                      v-if="option"
+                      class="answer-s"
+                      :class="
+                        question.correctAnswer?.includes(option) ? 'active' : ''
+                      "
+                      :key="option"
+                      @click="changAnswer(question, option)"
+                      >{{ option }}</span
+                    >
+                  </template>
+                </p>
+                <p v-if="question.questionType == 2" class="answer-box">
+                  <template
+                    v-for="option in question.answerOptions?.split(',')"
+                  >
+                    <span
+                      class="answer-s"
+                      v-if="option"
+                      :class="question.correctAnswer == option ? 'active' : ''"
+                      :key="option"
+                      @click="question.correctAnswer = option"
+                      >{{ option }}</span
+                    >
+                  </template>
+                </p>
+              </div>
+              <div class="qs-set">
+                <el-button
+                  class="icon-tickets"
+                  type="primary"
+                  circle
+                  size="mini"
+                  icon="el-icon-tickets"
+                  @click="openStem(question, 1, index)"
+                ></el-button>
+              </div>
+              <div class="qs-set">
+                <el-button
+                  class="icon-tickets"
+                  type="primary"
+                  circle
+                  size="mini"
+                  icon="el-icon-tickets"
+                  @click="openStem(question, 2, index)"
+                ></el-button>
+              </div>
+              <div class="qs-set">
+                <el-button
+                  type="primary"
+                  circle
+                  size="mini"
+                  icon="el-icon-price-tag"
+                  @click="openKnowledge(question, index)"
+                ></el-button>
+              </div>
+            </div>
+          </div>
         </template>
       </div>
       <div class="btn-box">
@@ -750,8 +755,8 @@ export default {
       }, 0);
       return Number(score).toFixed(2);
     },
+    //设置多选答案
     changAnswer(sub, option) {
-      //设置多选答案
       let str = new RegExp(option, "g");
       if (sub.correctAnswer?.includes(option)) {
         sub.correctAnswer = sub.correctAnswer.replace(str, "");
@@ -1015,24 +1020,41 @@ export default {
             ...this.form.paperModifyLog,
           };
           this.form = deepClone(data);
-          questionList = deepClone(this.form.questionList);
+          questionList = this.form.questionList.map((item) => {
+            if (item.subQuestions) {
+              item.subQuestions.map((subQuestion) => {
+                subQuestion.questionType == 2 || subQuestion.questionType == 3
+                  ? (subQuestion.answerOptions =
+                      subQuestion.answerOptions || "A,B,C,D")
+                  : "";
+                subQuestion.correctAnswer = subQuestion.correctAnswer || "";
+              });
+            } else {
+              item.questionType == 2 || item.questionType == 3
+                ? (item.answerOptions = item.answerOptions || "A,B,C,D")
+                : "";
+              item.correctAnswer = item.correctAnswer || "";
+            }
+            return item;
+          });
         } else {
           questionList = data.list.sort((a, b) => {
             return a.questionIndex - b.questionIndex;
           });
         }
-        this.formateQuestion(questionList);
+        this.questionList = questionList;
+        this.formateQuestion();
       } else {
         this.$message.error(info);
       }
     },
-    formateQuestion(arr) {
+    formateQuestion() {
+      let arr = this.questionList;
       if (arr[0]?.subQuestions) {
         this.questionList = arr.map((item) => {
           let types = [{}];
           let addndex = 0;
           item.subQuestions.map((sub, index) => {
-            sub.answerOptions = sub.answerOptions || "A,B,C,D";
             if (!!sub.questionType) {
               if (
                 sub.questionType == types[addndex].qusType &&
@@ -1094,7 +1116,6 @@ export default {
         let types = [{}];
         let addndex = 0;
         this.questionList = arr.map((sub, index) => {
-          sub.answerOptions = sub.answerOptions || "A,B,C,D";
           if (!!sub.questionType) {
             if (
               sub.questionType == types[addndex].qusType &&