diff --git a/src/mock/index.js b/src/mock/index.js
index 4c2dbda..f048589 100644
--- a/src/mock/index.js
+++ b/src/mock/index.js
@@ -245,194 +245,225 @@ Mock.mock(
   data: {
     "name": "@ctitle",
     "id|+1": 11,
+    // "questionList": [
+    //   {
+    //     "examQuestionId|+1": 0,
+    //     "questionId|+1": 1,
+    //     "questionTitle": "@cname",
+    //     "questionType|1-4": 1,
+    //     "score|1-2": 1,
+    //     "partScore|0.5-1": 0.5,
+    //     "answerOptions": "A,B,C,D",
+    //     "correctAnswer|1": ["A", "B", "C", "D"],
+    //     "subQuestions": [
+    //       {
+    //         "questionType": 2,
+    //         "score": 1,
+    //         "partScore": 0,
+    //         "selectNum": 4,
+    //         "answerOptions": "A,B,C,D",
+    //         "correctAnswer|1": ["A", "B", "C", "D"],
+    //         "screenshot": "./1.html",
+    //         "knowledge": "数与式#有理数#正数和负数,数与式#有理数#有理数"
+    //       },
+    //       {
+    //         "questionType": 2,
+    //         "score": 1,
+    //         "partScore": 0,
+    //         "selectNum": 4,
+    //         "answerOptions": "A,B,C,D",
+    //         "correctAnswer|1": ["A", "B", "C", "D"],
+    //         "screenshot": "./1.html",
+    //         "knowledge": "数与式#有理数#正数和负数"
+    //       },
+    //       {
+    //         "questionType": 2,
+    //         "score": 1,
+    //         "partScore": 0,
+    //         "selectNum": 4,
+    //         "answerOptions": "A,B,C,D",
+    //         "correctAnswer|1": ["A", "B", "C", "D"],
+    //         "screenshot": "./1.html",
+    //       },
+    //       {
+    //         "questionType": 2,
+    //         "score": 1,
+    //         "partScore": 0,
+    //         "selectNum": 4,
+    //         "answerOptions": "A,B,C,D",
+    //         "correctAnswer|1": ["A", "B", "C", "D"],
+    //         "screenshot": "./1.html",
+    //       },
+    //       {
+    //         "questionType": 2,
+    //         "score": 1,
+    //         "partScore": 0,
+    //         "selectNum": 4,
+    //         "answerOptions": "A,B,C,D",
+    //         "correctAnswer|1": ["A", "B", "C", "D"],
+    //         "screenshot": "./1.html",
+    //       },
+    //       {
+    //         "questionType": 3,
+    //         "score": 1,
+    //         "partScore": 0,
+    //         "selectNum": 4,
+    //         "answerOptions": "A,B,C,D",
+    //         "correctAnswer|1": ["A", "B", "C", "D"],
+    //         "screenshot": "./1.html",
+    //       },
+    //     ]
+    //   },
+    //   {
+    //     "examQuestionId|+1": 0,
+    //     "questionId|+1": 1,
+    //     "questionTitle": "@cname",
+    //     "questionType|1-4": 1,
+    //     "score|1-2": 1,
+    //     "partScore|0.5-1": 0.5,
+    //     "answerOptions": "A,B,C,D",
+    //     "correctAnswer|1": ["A", "B", "C", "D"],
+    //     "subQuestions": [
+    //       {
+    //         "questionType": 2,
+    //         "score": 1,
+    //         "partScore": 0,
+    //         "selectNum": 4,
+    //         "answerOptions": "A,B,C,D",
+    //         "correctAnswer|1": ["A", "B", "C", "D"],
+    //         "screenshot": "./1.html",
+    //       },
+    //       {
+    //         "questionType": 2,
+    //         "score": 1,
+    //         "partScore": 0,
+    //         "selectNum": 4,
+    //         "answerOptions": "A,B,C,D",
+    //         "correctAnswer|1": ["A", "B", "C", "D"],
+    //         "screenshot": "./1.html",
+    //       },
+    //       {
+    //         "questionType": 2,
+    //         "score": 1,
+    //         "partScore": 0,
+    //         "selectNum": 4,
+    //         "answerOptions": "A,B,C,D",
+    //         "correctAnswer|1": ["A", "B", "C", "D"],
+    //         "screenshot": "./1.html",
+    //       },
+    //       {
+    //         "questionType": 2,
+    //         "score": 1,
+    //         "partScore": 0,
+    //         "selectNum": 4,
+    //         "answerOptions": "A,B,C,D",
+    //         "correctAnswer|1": ["A", "B", "C", "D"],
+    //         "screenshot": "./1.html",
+    //       },
+    //       {
+    //         "questionType": 2,
+    //         "score": 1,
+    //         "partScore": 0,
+    //         "selectNum": 4,
+    //         "answerOptions": "A,B,C,D",
+    //         "correctAnswer|1": ["A", "B", "C", "D"],
+    //         "screenshot": "./1.html",
+    //       },
+    //       {
+    //         "questionType": 3,
+    //         "score": 1,
+    //         "partScore": 0,
+    //         "selectNum": 4,
+    //         "answerOptions": "A,B,C,D",
+    //         "correctAnswer|1": ["A", "B", "C", "D"],
+    //         "screenshot": "./1.html",
+    //       },
+    //       {
+    //         "questionType": 2,
+    //         "score": 1,
+    //         "partScore": 0,
+    //         "selectNum": 4,
+    //         "answerOptions": "A,B,C,D",
+    //         "correctAnswer|1": ["A", "B", "C", "D"],
+    //         "screenshot": "./1.html",
+    //       },
+    //       {
+    //         "questionType": 2,
+    //         "score": 1,
+    //         "partScore": 0,
+    //         "selectNum": 4,
+    //         "answerOptions": "A,B,C,D",
+    //         "correctAnswer|1": ["A", "B", "C", "D"],
+    //         "screenshot": "./1.html",
+    //       },
+    //       {
+    //         "questionType": 2,
+    //         "score": 1,
+    //         "partScore": 0,
+    //         "selectNum": 4,
+    //         "answerOptions": "A,B,C,D",
+    //         "correctAnswer|1": ["A", "B", "C", "D"],
+    //         "screenshot": "./1.html",
+    //       },
+    //       {
+    //         "questionType": 2,
+    //         "score": 1,
+    //         "partScore": 0,
+    //         "selectNum": 4,
+    //         "answerOptions": "A,B,C,D",
+    //         "correctAnswer|1": ["A", "B", "C", "D"],
+    //         "screenshot": "./1.html",
+    //       },
+    //       {
+    //         "questionType": 2,
+    //         "score": 1,
+    //         "partScore": 0,
+    //         "selectNum": 4,
+    //         "answerOptions": "A,B,C,D",
+    //         "correctAnswer|1": ["A", "B", "C", "D"],
+    //         "screenshot": "./1.html",
+    //       },
+    //       {
+    //         "questionType": 2,
+    //         "score": 1,
+    //         "partScore": 0,
+    //         "selectNum": 4,
+    //         "answerOptions": "A,B,C,D",
+    //         "correctAnswer|1": ["A", "B", "C", "D"],
+    //         "screenshot": "./1.html",
+    //       }
+    //     ]
+    //   },
+    // ],
     "questionList": [
       {
-        "examQuestionId|+1": 0,
-        "questionId|+1": 1,
-        "questionTitle": "@cname",
-        "questionType|1-4": 1,
-        "score|1-2": 1,
-        "partScore|0.5-1": 0.5,
+        "questionType": 2,
+        "score": 1,
+        "partScore": 0,
+        "selectNum": 4,
         "answerOptions": "A,B,C,D",
         "correctAnswer|1": ["A", "B", "C", "D"],
-        "subQuestions": [
-          {
-            "questionType": 2,
-            "score": 1,
-            "partScore": 0,
-            "selectNum": 4,
-            "answerOptions": "A,B,C,D",
-            "correctAnswer|1": ["A", "B", "C", "D"],
-            "screenshot": "./1.html",
-            "knowledge": "数与式#有理数#正数和负数,数与式#有理数#有理数"
-          },
-          {
-            "questionType": 2,
-            "score": 1,
-            "partScore": 0,
-            "selectNum": 4,
-            "answerOptions": "A,B,C,D",
-            "correctAnswer|1": ["A", "B", "C", "D"],
-            "screenshot": "./1.html",
-            "knowledge": "数与式#有理数#正数和负数"
-          },
-          {
-            "questionType": 2,
-            "score": 1,
-            "partScore": 0,
-            "selectNum": 4,
-            "answerOptions": "A,B,C,D",
-            "correctAnswer|1": ["A", "B", "C", "D"],
-            "screenshot": "./1.html",
-          },
-          {
-            "questionType": 2,
-            "score": 1,
-            "partScore": 0,
-            "selectNum": 4,
-            "answerOptions": "A,B,C,D",
-            "correctAnswer|1": ["A", "B", "C", "D"],
-            "screenshot": "./1.html",
-          },
-          {
-            "questionType": 2,
-            "score": 1,
-            "partScore": 0,
-            "selectNum": 4,
-            "answerOptions": "A,B,C,D",
-            "correctAnswer|1": ["A", "B", "C", "D"],
-            "screenshot": "./1.html",
-          },
-          {
-            "questionType": 3,
-            "score": 1,
-            "partScore": 0,
-            "selectNum": 4,
-            "answerOptions": "A,B,C,D",
-            "correctAnswer|1": ["A", "B", "C", "D"],
-            "screenshot": "./1.html",
-          },
-        ]
+        "screenshot": "./1.html",
+        "knowledge": "数与式#有理数#正数和负数,数与式#有理数#有理数"
       },
       {
-        "examQuestionId|+1": 0,
-        "questionId|+1": 1,
-        "questionTitle": "@cname",
-        "questionType|1-4": 1,
-        "score|1-2": 1,
-        "partScore|0.5-1": 0.5,
+        "questionType": 2,
+        "score": 1,
+        "partScore": 0,
+        "selectNum": 4,
         "answerOptions": "A,B,C,D",
         "correctAnswer|1": ["A", "B", "C", "D"],
-        "subQuestions": [
-          {
-            "questionType": 2,
-            "score": 1,
-            "partScore": 0,
-            "selectNum": 4,
-            "answerOptions": "A,B,C,D",
-            "correctAnswer|1": ["A", "B", "C", "D"],
-            "screenshot": "./1.html",
-          },
-          {
-            "questionType": 2,
-            "score": 1,
-            "partScore": 0,
-            "selectNum": 4,
-            "answerOptions": "A,B,C,D",
-            "correctAnswer|1": ["A", "B", "C", "D"],
-            "screenshot": "./1.html",
-          },
-          {
-            "questionType": 2,
-            "score": 1,
-            "partScore": 0,
-            "selectNum": 4,
-            "answerOptions": "A,B,C,D",
-            "correctAnswer|1": ["A", "B", "C", "D"],
-            "screenshot": "./1.html",
-          },
-          {
-            "questionType": 2,
-            "score": 1,
-            "partScore": 0,
-            "selectNum": 4,
-            "answerOptions": "A,B,C,D",
-            "correctAnswer|1": ["A", "B", "C", "D"],
-            "screenshot": "./1.html",
-          },
-          {
-            "questionType": 2,
-            "score": 1,
-            "partScore": 0,
-            "selectNum": 4,
-            "answerOptions": "A,B,C,D",
-            "correctAnswer|1": ["A", "B", "C", "D"],
-            "screenshot": "./1.html",
-          },
-          {
-            "questionType": 3,
-            "score": 1,
-            "partScore": 0,
-            "selectNum": 4,
-            "answerOptions": "A,B,C,D",
-            "correctAnswer|1": ["A", "B", "C", "D"],
-            "screenshot": "./1.html",
-          },
-          {
-            "questionType": 2,
-            "score": 1,
-            "partScore": 0,
-            "selectNum": 4,
-            "answerOptions": "A,B,C,D",
-            "correctAnswer|1": ["A", "B", "C", "D"],
-            "screenshot": "./1.html",
-          },
-          {
-            "questionType": 2,
-            "score": 1,
-            "partScore": 0,
-            "selectNum": 4,
-            "answerOptions": "A,B,C,D",
-            "correctAnswer|1": ["A", "B", "C", "D"],
-            "screenshot": "./1.html",
-          },
-          {
-            "questionType": 2,
-            "score": 1,
-            "partScore": 0,
-            "selectNum": 4,
-            "answerOptions": "A,B,C,D",
-            "correctAnswer|1": ["A", "B", "C", "D"],
-            "screenshot": "./1.html",
-          },
-          {
-            "questionType": 2,
-            "score": 1,
-            "partScore": 0,
-            "selectNum": 4,
-            "answerOptions": "A,B,C,D",
-            "correctAnswer|1": ["A", "B", "C", "D"],
-            "screenshot": "./1.html",
-          },
-          {
-            "questionType": 2,
-            "score": 1,
-            "partScore": 0,
-            "selectNum": 4,
-            "answerOptions": "A,B,C,D",
-            "correctAnswer|1": ["A", "B", "C", "D"],
-            "screenshot": "./1.html",
-          },
-          {
-            "questionType": 2,
-            "score": 1,
-            "partScore": 0,
-            "selectNum": 4,
-            "answerOptions": "A,B,C,D",
-            "correctAnswer|1": ["A", "B", "C", "D"],
-            "screenshot": "./1.html",
-          }
-        ]
+        "screenshot": "./1.html",
+        "knowledge": "数与式#有理数#正数和负数"
+      },
+      {
+        "questionType": 2,
+        "score": 1,
+        "partScore": 0,
+        "selectNum": 4,
+        "answerOptions": "A,B,C,D",
+        "correctAnswer|1": ["A", "B", "C", "D"],
+        "screenshot": "./1.html",
       },
     ]
   }
diff --git a/src/views/examinationPaper/add.vue b/src/views/examinationPaper/add.vue
index a0b1d4c..df66b55 100644
--- a/src/views/examinationPaper/add.vue
+++ b/src/views/examinationPaper/add.vue
@@ -15,7 +15,7 @@
       <div v-show="step == 0">
         <el-form ref="forms" :model="form" :rules="formRules" label-width="140px">
           <el-form-item label="答题卡名称：" prop="title">
-            <el-input class="sel2" type="text" placeholder="请输入答题卡名称" v-model.trim="form.title" maxlength="30" size="45"
+            <el-input class="sel2" type="text" placeholder="请输入答题卡名称" v-model.trim="form.title" maxlength="50" size="45"
               show-word-limit>
             </el-input>
           </el-form-item>
@@ -642,8 +642,8 @@ export default {
           { required: true, message: "请输入答题卡名称", trigger: "blur" },
           {
             min: 1,
-            max: 30,
-            message: "长度在 1 到 30 个字符",
+            max: 50,
+            message: "长度在 1 到 50 个字符",
             trigger: "blur",
           },
         ],
@@ -1489,7 +1489,7 @@ export default {
     },
     async _QuerySubjectList(grade) {
       //查询科目列表
-      if (!grade && this.role != "ROLE_PERSONAL") {
+      if (!grade) {
         return;
       }
       let query = {};
@@ -1565,7 +1565,7 @@ export default {
           item.subQuestions?.map((items) => {
             return {
               ...items,
-              selectNum: items.answerOptions.split(",").length,
+              selectNum: items.answerOptions?.split(",").length,
               answerOptions: items.answerOptions || "A,B,C,D",
               screenshot: items.screenshot || "",
               correctAnswer: items.correctAnswer || "",
diff --git a/src/views/examinationPaper/addAsk.vue b/src/views/examinationPaper/addAsk.vue
index d1f4384..ef5ae8f 100644
--- a/src/views/examinationPaper/addAsk.vue
+++ b/src/views/examinationPaper/addAsk.vue
@@ -14,7 +14,7 @@
       <div v-show="step == 0">
         <el-form ref="forms" :model="form" :rules="formRules" label-width="140px">
           <el-form-item label="课件名称：" prop="title">
-            <el-input class="sel2" type="text" placeholder="请输入答题卡名称" v-model.trim="form.title" maxlength="30" size="45"
+            <el-input class="sel2" type="text" placeholder="请输入答题卡名称" v-model.trim="form.title" maxlength="50" size="45"
               show-word-limit>
             </el-input>
           </el-form-item>
@@ -57,8 +57,8 @@
               <div class="qs-options qs-options2">选项设置</div>
               <div class="qs-upload">提干</div>
               <div class="qs-upload">题目解析</div>
-              <div class="qs-upload">知识点</div>
-              <div class="qs-set"></div>
+              <div class="qs-upload" v-if="knowledgeData.length">知识点</div>
+              <div class="qs-set">操作</div>
             </li>
             <li v-for="(subQuestions, index) in form.questionList" :key="index">
               <p class="set-ans-btn" v-if="subQuestions.qusType &&
@@ -142,7 +142,7 @@
                       icon="el-icon-tickets"></el-button>
                   </el-popover>
                 </div>
-                <div class="qs-upload">
+                <div class="qs-upload" v-if="knowledgeData.length">
                   <el-button type="primary" circle size="mini" icon="el-icon-price-tag"
                     @click="openKnowledge(subQuestions, index)"></el-button>
                 </div>
@@ -274,33 +274,6 @@
 import { deepClone, checkAnswer } from "utils";
 import knowledgeList from "assets/js/knowledgeList.js";
 export default {
-  computed: {
-    // 知识点列表 根据学段-科目筛选
-    knowledgeData: function () {
-      let jsons = []
-      if (this.form.gradeName && this.form.subjectName) {
-        let sectionName = ""
-        this.gradeClassList.map(item => {
-          if (this.form.gradeName == item.gradeName) {
-            sectionName = item.sectionName
-          }
-        })
-        if (sectionName && Object.keys(this.knowledgeList).includes(sectionName)) {
-          if (Object.keys(this.knowledgeList[sectionName]).includes(this.form.subjectName)) {
-            jsons = this.knowledgeList[sectionName][this.form.subjectName]
-          }
-        }
-      }
-      return jsons
-    },
-  },
-  watch: {
-    step: function () {
-      this.$nextTick(function () {
-        this.$refs.content.scrollTop = 0;
-      });
-    },
-  },
   data() {
     return {
       role: "",
@@ -322,8 +295,8 @@ export default {
           { required: true, message: "请输入答题卡名称", trigger: "blur" },
           {
             min: 1,
-            max: 30,
-            message: "长度在 1 到 30 个字符",
+            max: 50,
+            message: "长度在 1 到 50 个字符",
             trigger: "blur",
           },
         ],
@@ -363,6 +336,33 @@ export default {
       knowledgeList: { ...knowledgeList }
     };
   },
+  computed: {
+    // 知识点列表 根据学段-科目筛选
+    knowledgeData: function () {
+      let jsons = []
+      if (this.form.gradeName && this.form.subjectName) {
+        let sectionName = ""
+        this.gradeClassList.map(item => {
+          if (this.form.gradeName == item.gradeName) {
+            sectionName = item.sectionName
+          }
+        })
+        if (sectionName && Object.keys(this.knowledgeList).includes(sectionName)) {
+          if (Object.keys(this.knowledgeList[sectionName]).includes(this.form.subjectName)) {
+            jsons = this.knowledgeList[sectionName][this.form.subjectName]
+          }
+        }
+      }
+      return jsons
+    },
+  },
+  watch: {
+    step: function () {
+      this.$nextTick(function () {
+        this.$refs.content.scrollTop = 0;
+      });
+    },
+  },
   async created() {
     this.type = this.$route.query.type ? this.$route.query.type : 1;
     this.role =
@@ -391,6 +391,7 @@ export default {
     openStem(obj, index, type) {
       this.stem.index = index;
       this.stem.screenshot = obj.screenshot || "";
+      this.stem.type = type
       if (type == 1) {
         this.stem.screenshot = obj.screenshot || "";
         this.stem.answerScreenshot = "";
@@ -710,7 +711,7 @@ export default {
       this.form.questionList.splice(index, 1);
       this.formateQuestion()
     },
-    //切换多题型-小题题型
+    //切换题型
     changeSubQuestions(val, subQuestions) {
       const that = this;
       subQuestions.score = 1;
@@ -737,28 +738,6 @@ export default {
           break;
       }
     },
-    //添加选项
-    addOptions(subQuestions) {
-      let length = subQuestions.answerOptions.split(",").length;
-      if (length > 9) return;
-      subQuestions.selectNum = length + 1;
-      subQuestions.answerOptions = this.rightOptions
-        .slice(0, subQuestions.selectNum)
-        .join(",");
-    },
-    //删除选项
-    removeOptions(subQuestions) {
-      let length = subQuestions.answerOptions.split(",").length;
-      if (length < 3) return;
-      subQuestions.selectNum = length - 1;
-      subQuestions.answerOptions = this.rightOptions
-        .slice(0, subQuestions.selectNum)
-        .join(",");
-      subQuestions.correctAnswer = subQuestions.correctAnswer.slice(
-        0,
-        subQuestions.selectNum
-      );
-    },
     //设置多选答案
     changAnswer(sub, option) {
       let str = new RegExp(option, "g");
@@ -900,12 +879,12 @@ export default {
       }
       this.form.questionList = data.questionList?.map((item) => {
         return {
-          ...items,
-          selectNum: items.answerOptions.split(",").length,
-          answerOptions: items.answerOptions || "A,B,C,D",
-          screenshot: items.screenshot || "",
-          correctAnswer: items.correctAnswer || "",
-          knowledge: items.knowledge || "",
+          ...item,
+          selectNum: item.answerOptions?.split(",").length || 4,
+          answerOptions: item.answerOptions || "A,B,C,D",
+          screenshot: item.screenshot || "",
+          correctAnswer: item.correctAnswer || "",
+          knowledge: item.knowledge || "",
         }
       });
     }
diff --git a/src/views/examinationPaper/index.vue b/src/views/examinationPaper/index.vue
index 71f3b97..ac19916 100644
--- a/src/views/examinationPaper/index.vue
+++ b/src/views/examinationPaper/index.vue
@@ -146,6 +146,7 @@
 </template>
 
 <script>
+import { downloadFile } from "@/utils";
 export default {
   name: "examinationPaper",
   data() {