diff --git a/src/views/examinationPaper/add.vue b/src/views/examinationPaper/add.vue
index 7da6a3b..a0b1d4c 100644
--- a/src/views/examinationPaper/add.vue
+++ b/src/views/examinationPaper/add.vue
@@ -394,7 +394,9 @@
                           v-if="subQuestions.screenshot && !subQuestions.screenshot.includes('html')"
                           :src="subQuestions.screenshot" alt="">
                         <p style="textAlign:center"><el-button type="primary" round size="mini" icon="el-icon-upload"
-                            @click="openStem(subQuestions, index, indexs, 1)">{{subQuestions.answerScreenshot?"重新选择图片":"上传题干"}}</el-button></p>
+                            @click="openStem(subQuestions, index, indexs, 1)">{{ subQuestions.answerScreenshot ? "重新选择图片"
+                              : "上传题干" }}</el-button>
+                        </p>
                       </div>
                       <el-button slot="reference" class="icon-tickets" type="primary" circle size="mini"
                         icon="el-icon-tickets"></el-button>
@@ -410,7 +412,9 @@
                           v-if="subQuestions.answerScreenshot && !subQuestions.answerScreenshot.includes('html')"
                           :src="subQuestions.answerScreenshot" alt="">
                         <p style="textAlign:center"><el-button type="primary" round size="mini" icon="el-icon-upload"
-                            @click="openStem(subQuestions, index, indexs, 2)">{{subQuestions.answerScreenshot?"重新选择图片":"上传题目解析"}}</el-button></p>
+                            @click="openStem(subQuestions, index, indexs, 2)">{{ subQuestions.answerScreenshot ? "重新选择图片"
+                              : "上传题目解析" }}</el-button>
+                        </p>
                       </div>
                       <el-button slot="reference" class="icon-tickets" type="primary" circle size="mini"
                         icon="el-icon-tickets"></el-button>
@@ -542,7 +546,8 @@
           <el-form ref="form" :model="stem" label-width="160px">
             <el-form-item label="知识点：">
               <el-cascader size="small" filterable :show-all-levels="false" collapse clearable placeholder="选择知识点"
-                v-model="stem.knowledge" :options="knowledgeData" :props="{ expandTrigger: 'hover' }"></el-cascader>
+                v-model="stem.knowledge" :options="knowledgeData"
+                :props="{ expandTrigger: 'hover', multiple: true }"></el-cascader>
             </el-form-item>
           </el-form>
         </div>
@@ -742,13 +747,7 @@ export default {
 
       this.dialogStem = true;
     },
-    // 知识点
-    openKnowledge(obj, index, indexs) {
-      this.stem.index = index;
-      this.stem.indexs = indexs;
-      this.stem.knowledge = (obj.knowledge && obj.knowledge.split(",")) || [];
-      this.dialogKnowledge = true;
-    },
+
     // 图片上传成功
     upSuccess(res) {
       if (res && res.status == 0) {
@@ -767,11 +766,26 @@ export default {
     upError(res) {
       this.$message.error("上传失败");
     },
-    // 知识点
+    // 打开知识点
+    openKnowledge(obj, index, indexs) {
+      this.stem.index = index;
+      this.stem.indexs = indexs;
+      let knowledgeArr = (obj.knowledge && obj.knowledge.split(",")) || [];
+      console.log(obj.knowledge)
+      console.log(knowledgeArr)
+      this.stem.knowledge = knowledgeArr.map(item => {
+        return item.split("#")
+      })
+      this.dialogKnowledge = true;
+    },
+    // 选择知识点
     setKnowledge() {
+      let knowledge = this.stem.knowledge.map(item => {
+        return item.join("#")
+      })
       this.form.questionList[this.stem.index].subQuestions[
         this.stem.indexs
-      ].knowledge = this.stem.knowledge.join(",");
+      ].knowledge = knowledge.join(",")
       this.dialogKnowledge = false;
     },
     //end
@@ -1550,13 +1564,12 @@ export default {
         let subQuestions =
           item.subQuestions?.map((items) => {
             return {
-              questionType: items.questionType,
-              score: items.score,
-              partScore: items.partScore,
+              ...items,
               selectNum: items.answerOptions.split(",").length,
               answerOptions: items.answerOptions || "A,B,C,D",
-              correctAnswer: items.correctAnswer,
               screenshot: items.screenshot || "",
+              correctAnswer: items.correctAnswer || "",
+              knowledge: items.knowledge || "",
             };
           }) || [];
         return {
diff --git a/src/views/examinationPaper/addAsk.vue b/src/views/examinationPaper/addAsk.vue
index 224ea76..d1f4384 100644
--- a/src/views/examinationPaper/addAsk.vue
+++ b/src/views/examinationPaper/addAsk.vue
@@ -56,6 +56,8 @@
               <div class="qs-partScore">漏选得分</div>
               <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>
             </li>
             <li v-for="(subQuestions, index) in form.questionList" :key="index">
@@ -116,12 +118,34 @@
                         v-if="subQuestions.screenshot && !subQuestions.screenshot.includes('html')"
                         :src="subQuestions.screenshot" alt="">
                       <p style="textAlign:center"><el-button type="primary" round size="mini" icon="el-icon-upload"
-                          @click="openStem(subQuestions, index)">重新选择图片</el-button></p>
+                          @click="openStem(subQuestions, index, 1)">重新选择图片</el-button></p>
                     </div>
                     <el-button slot="reference" class="icon-tickets" type="primary" circle size="mini"
                       icon="el-icon-tickets"></el-button>
                   </el-popover>
                 </div>
+                <div class="qs-upload">
+                  <el-popover placement="right" width="400" trigger="click">
+                    <div class="screenshot-box">
+                      <iframe class="screenshot"
+                        v-if="subQuestions.answerScreenshot && subQuestions.answerScreenshot.includes('html')"
+                        :src="subQuestions.answerScreenshot"></iframe>
+                      <img class="screenshot screenshot-img"
+                        v-if="subQuestions.answerScreenshot && !subQuestions.answerScreenshot.includes('html')"
+                        :src="subQuestions.answerScreenshot" alt="">
+                      <p style="textAlign:center"><el-button type="primary" round size="mini" icon="el-icon-upload"
+                          @click="openStem(subQuestions, index, 2)">{{ subQuestions.answerScreenshot ? "重新选择图片" :
+                            "上传题目解析" }}</el-button>
+                      </p>
+                    </div>
+                    <el-button slot="reference" class="icon-tickets" type="primary" circle size="mini"
+                      icon="el-icon-tickets"></el-button>
+                  </el-popover>
+                </div>
+                <div class="qs-upload">
+                  <el-button type="primary" circle size="mini" icon="el-icon-price-tag"
+                    @click="openKnowledge(subQuestions, index)"></el-button>
+                </div>
                 <div class="qs-set">
                   <el-popconfirm title="确定删除这道题吗？" @confirm="delTabData(index)">
                     <el-button slot="reference" class="delete" type="danger" size="mini" circle
@@ -184,20 +208,44 @@
           <el-button round @click="step = 0">上一步</el-button>
           <el-button type="primary" round @click="toStep(2)">下一步</el-button>
         </div>
-        <el-dialog :close-on-click-modal="false" title="上传题干" :visible.sync="dialogStem" v-if="dialogStem" width="500">
+        <el-dialog :close-on-click-modal="false" :title="stem.type == 1 ? '上传题干' : '上传题目解析'" :visible.sync="dialogStem"
+          v-if="dialogStem" width="500">
           <div class="upload-box">
-            <img v-if="stem.screenshot && !stem.screenshot.includes('html')" :src="stem.screenshot" class="stem-pic" />
+            <template v-show="stem.type == 1">
+              <img v-if="stem.screenshot && !stem.screenshot.includes('html')" :src="stem.screenshot" class="stem-pic" />
+            </template>
+            <template v-show="stem.type == 2">
+              <img v-if="stem.answerScreenshot && !stem.answerScreenshot.includes('html')" :src="stem.answerScreenshot"
+                class="stem-pic" />
+            </template>
             <el-upload class="upload-demo" action="http://121.40.127.171/file/uploadImg" :limit="1"
               :on-success="upSuccess" :on-error="upError" accept="image/*">
-              <el-button size="small" type="primary">{{
+              <el-button v-show="stem.type == 1" size="small" type="primary">{{
                 stem.screenshot && !stem.screenshot.includes('html') ? "重新上传" : "选择照片"
               }}</el-button>
+              <el-button v-show="stem.type == 2" size="small" type="primary">{{
+                stem.answerScreenshot && !stem.answerScreenshot.includes('html') ? "重新上传" : "选择照片"
+              }}</el-button>
             </el-upload>
           </div>
           <div slot="footer">
             <el-button @click="dialogStem = false">确定</el-button>
           </div>
         </el-dialog>
+        <el-dialog :close-on-click-modal="false" title="知识点" :visible.sync="dialogKnowledge" width="500">
+          <div>
+            <el-form ref="form" :model="stem" label-width="160px">
+              <el-form-item label="知识点：">
+                <el-cascader size="small" filterable :show-all-levels="false" collapse clearable placeholder="选择知识点"
+                  v-model="stem.knowledge" :options="knowledgeData" :props="{ expandTrigger: 'hover' }"></el-cascader>
+              </el-form-item>
+            </el-form>
+          </div>
+          <div slot="footer">
+            <el-button @click="dialogKnowledge = false">取 消</el-button>
+            <el-button type="primary" @click="setKnowledge">确 定</el-button>
+          </div>
+        </el-dialog>
       </div>
       <div v-show="step == 2">
         <div class="answer-title">
@@ -224,15 +272,28 @@
 
 <script>
 import { deepClone, checkAnswer } from "utils";
-const subQuesOptions = {
-  questionType: 2,
-  score: 1,
-  partScore: 0,
-  selectNum: 4,
-  answerOptions: "A,B,C,D",
-  correctAnswer: "",
-};
+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 () {
@@ -244,6 +305,7 @@ export default {
     return {
       role: "",
       step: 0, //步骤
+      gradeClassList: [], //年级-班级数据
       gradeList: [], //年级
       subjectList: [], //科目
       form: {
@@ -274,6 +336,7 @@ export default {
       },
       tagList: [],
       diaSetAns: false, //答案开关
+      dialogKnowledge: false, //知识点
       dialogStem: false, //截图开关
       formAns: {
         index: 0, //相同题目最后一位题目的位置
@@ -283,8 +346,11 @@ export default {
         answerList: "", //答案列表-字符串
       },
       stem: {
+        type: 1,
         index: 0, //大题位置
         screenshot: "", //题干图片地址
+        answerScreenshot: "", //题目解析图片地址
+        knowledge: [], //知识点
       },
       type: 1, //1-创建，2-复制答题卡
       questionOptions: [
@@ -294,6 +360,7 @@ export default {
         { label: "主观题", value: 5 },
       ],
       rightOptions: ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J"],
+      knowledgeList: { ...knowledgeList }
     };
   },
   async created() {
@@ -321,16 +388,28 @@ export default {
   methods: {
     // v1.5
     //上传截图
-    openStem(obj, index) {
+    openStem(obj, index, type) {
       this.stem.index = index;
       this.stem.screenshot = obj.screenshot || "";
+      if (type == 1) {
+        this.stem.screenshot = obj.screenshot || "";
+        this.stem.answerScreenshot = "";
+      } else {
+        this.stem.answerScreenshot = obj.answerScreenshot || "";
+        this.stem.screenshot = "";
+      }
       this.dialogStem = true;
     },
     //图片上传成功
     upSuccess(res, file) {
       if (res && res.status == 0) {
-        this.stem.screenshot = res.data.url;
-        this.form.questionList[this.stem.index].screenshot = this.stem.screenshot;
+        if (this.stem.type == 1) {
+          this.stem.screenshot = res.data.url;
+          this.form.questionList[this.stem.index].screenshot = this.stem.screenshot;
+        } else {
+          this.stem.answerScreenshot = res.data.url;
+          this.form.questionList[this.stem.index].answerScreenshot = this.stem.answerScreenshot;
+        }
         this.$message.success("上传成功");
       } else {
         this.$message.error(res.info);
@@ -340,6 +419,24 @@ export default {
     upError(res) {
       this.$message.error("上传失败");
     },
+    // 知识点
+    openKnowledge(obj, index) {
+      this.stem.index = index;
+      let knowledgeArr = (obj.knowledge && obj.knowledge.split(",")) || [];
+      this.stem.knowledge = knowledgeArr.map(item => {
+        return item.split("#")
+      })
+      this.dialogKnowledge = true;
+    },
+    // 知识点
+    setKnowledge() {
+      let knowledge = this.stem.knowledge.join(",");
+      this.form.questionList[this.stem.index].knowledge = knowledge.map(item => {
+        item = item.join("#")
+      })
+      this.dialogKnowledge = false;
+    },
+
     //end
     linkBack() {
       this.$confirm(
@@ -579,7 +676,7 @@ export default {
     toStep(step) {
       this.formatQuestionList();
       this.step = step;
-      if(step==1){
+      if (step == 1) {
         this.formateQuestion()
       }
     },
@@ -706,9 +803,24 @@ export default {
 
     async _GradeList() {
       //查询年级列表
-      const { data, status, info } = await this.$request.fetchGradeList();
+      // const { data, status, info } = await this.$request.fetchGradeList();
+      // 查找班级
+
+      let fetchClassList =
+        this.role == "ROLE_PERSONAL"
+          ? this.$request.pClassList
+          : this.$request.fetchClassList;
+
+      const { data, status, info } = await fetchClassList();
       if (status == 0) {
-        this.gradeList = (data.gradeNames && [...data.gradeNames]) || [];
+        this.gradeClassList = data.list?.map((item) => {
+          console.log(!this.gradeList.includes(item.gradeName))
+          if (!this.gradeList.includes(item.gradeName)) {
+            this.gradeList.push(item.gradeName)
+          }
+          return item
+        })
+        // this.gradeList = (data.gradeNames && [...data.gradeNames]) || [];
         if (this.type != 2) {
           this.form.gradeName = this.gradeList[0];
         }
@@ -788,14 +900,12 @@ export default {
       }
       this.form.questionList = data.questionList?.map((item) => {
         return {
-          questionTitle: item.questionTitle,
-          questionType: item.questionType,
-          score: item.score,
-          partScore: item.partScore,
-          selectNum: item.answerOptions.split(",").length,
-          answerOptions: item.answerOptions || "A,B,C,D",
-          correctAnswer: item.correctAnswer,
-          screenshot: item.screenshot || "",
+          ...items,
+          selectNum: items.answerOptions.split(",").length,
+          answerOptions: items.answerOptions || "A,B,C,D",
+          screenshot: items.screenshot || "",
+          correctAnswer: items.correctAnswer || "",
+          knowledge: items.knowledge || "",
         }
       });
     }
@@ -1125,9 +1235,11 @@ export default {
   .qs-options {
     flex: 1;
   }
-  .qs-upload{
+
+  .qs-upload {
     width: 60px;
   }
+
   .qs-set {
     width: 60px;
   }