修改添加组卷题目解析，知识点梳理等

梁保满
1 parent 8af7657f
Showing 2 changed files with 180 additions and 50 deletions
src/views/examinationPaper/add.vue
src/views/examinationPaper/index.vue
@@ -326,6 +326,8 @@
               <div class="qs-partScore">漏选得分</div>
               <div class="qs-options qs-options2">选项设置</div>
               <div class="qs-upload" v-if="isUpload">提干</div>
+              <div class="qs-upload" v-if="isUpload">题目解析</div>
+              <div class="qs-upload" v-if="isUpload">知识点</div>
               <div class="qs-set">操作</div>
             </li>
             <li v-for="(subQuestions, indexs) in question.subQuestions" :key="indexs">
@@ -381,22 +383,44 @@
                       " :key="option" @click="subQuestions.correctAnswer = option">{{ option }}</span>
                   </p>
                 </div>
-                <div class="qs-upload" v-if="isUpload">
-                  <el-popover placement="right" width="400" trigger="click">
-                    <div class="screenshot-box">
-                      <iframe class="screenshot"
-                        v-if="subQuestions.screenshot && subQuestions.screenshot.includes('html')"
-                        :src="subQuestions.screenshot"></iframe>
-                      <img class="screenshot screenshot-img"
-                        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)">重新选择图片</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>
+                <template v-if="isUpload">
+                  <div class="qs-upload">
+                    <el-popover placement="right" width="400" trigger="click">
+                      <div class="screenshot-box">
+                        <iframe class="screenshot"
+                          v-if="subQuestions.screenshot && subQuestions.screenshot.includes('html')"
+                          :src="subQuestions.screenshot"></iframe>
+                        <img class="screenshot screenshot-img"
+                          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>
+                      </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, 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>
+                    </el-popover>
+                  </div>
+                  <div class="qs-upload">
+                    <el-button type="primary" circle size="mini" icon="el-icon-price-tag"
+                      @click="openKnowledge(subQuestions, index, indexs)"></el-button>
+                  </div>
+                </template>
                 <div class="qs-set">
                   <el-popconfirm title="确定删除这道题吗？" @confirm="delTabData(indexs, index)">
@@ -489,20 +513,44 @@
           <el-button type="primary" round @click="save">保存</el-button>
         </div>
       </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>
 </template>
@@ -526,6 +574,7 @@ const subQuesOptions = {
   answerOptions: "A,B,C,D",
   correctAnswer: "",
 };
+import knowledgeList from "assets/js/knowledgeList.js";
 export default {
   computed: {
     allScore: function () {
@@ -537,6 +586,24 @@ export default {
       }, 0);
       return Number(score).toFixed(2);
     },
+    // 知识点列表 根据学段-科目筛选
+    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 () {
@@ -549,6 +616,7 @@ export default {
     return {
       role: "",
       step: 0, //步骤
+      gradeClassList: [], //年级-班级数据
       gradeList: [], //年级
       subjectList: [], //科目
       answerTypeList: [], //测验类型
@@ -617,12 +685,17 @@ export default {
       addSubQuestionsType: "",
       //v1.5
+      knowledgeList: { ...knowledgeList },
       isUpload: false,
       dialogStem: false, //截图开关
+      dialogKnowledge: false, //知识点开关
       stem: {
+        type: 1,
         index: 0, //大题位置
         indexs: 0, //小题位置
         screenshot: "", //题干图片地址
+        answerScreenshot: "", //题目解析图片地址
+        knowledge: [], //知识点
       },
     };
   },
@@ -655,26 +728,52 @@ export default {
   methods: {
     // v1.5
     //上传截图
-    openStem(obj, index, indexs) {
+    openStem(obj, index, indexs, type) {
       this.stem.index = index;
       this.stem.indexs = indexs;
-      this.stem.screenshot = obj.screenshot || "";
+      this.stem.type = type;
+      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) {
+    // 知识点
+    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) {
-        this.stem.screenshot = res.data.url;
-        this.form.questionList[this.stem.index].subQuestions[this.stem.indexs].screenshot = this.stem.screenshot;
+        if (this.stem.type == 1) {
+          this.stem.screenshot = res.data.url;
+          this.form.questionList[this.stem.index].subQuestions[this.stem.indexs].screenshot = this.stem.screenshot;
+        } else {
+          this.stem.answerScreenshot = res.data.url;
+          this.form.questionList[this.stem.index].subQuestions[this.stem.indexs].answerScreenshot = this.stem.answerScreenshot;
+        }
         this.$message.success("上传成功");
       } else {
         this.$message.error(res.info);
       }
     },
-
     upError(res) {
       this.$message.error("上传失败");
     },
+    // 知识点
+    setKnowledge() {
+      this.form.questionList[this.stem.index].subQuestions[
+        this.stem.indexs
+      ].knowledge = this.stem.knowledge.join(",");
+      this.dialogKnowledge = false;
+    },
     //end
     //取消创建
@@ -849,7 +948,7 @@ export default {
           return this.formAns.endIndex == item.questionIndex
         }
       );
-        console.log(EndIndex)
+      console.log(EndIndex)
       for (let i = 0; i <= subNum; i++) {
         let correctAnswer = "";
         if (this.formAns.qusType == 2) {
@@ -1349,9 +1448,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];
         }
@@ -12,18 +12,15 @@
     </back-box>
     <div class="examinationPaper-type">
       <el-button-group>
-        <el-button size="large" :type="examinationPaperType == 1 ? 'primary' : 'default'"
-          @click="examinationPaperType = 1">备题</el-button>
-        <el-button size="large" :type="examinationPaperType == 2 ? 'primary' : 'default'"
-          @click="examinationPaperType = 2">组卷</el-button>
+        <el-button size="large" :type="query.type == 1 ? 'primary' : 'default'" @click="changPaperType(1)">备题</el-button>
+        <el-button size="large" :type="query.type == 2 ? 'primary' : 'default'" @click="changPaperType(2)">组卷</el-button>
       </el-button-group>
       <p>
-        <el-button v-if="examinationPaperType == 1" type="primary" size="mini" icon="el-icon-plus" round
-          @click="diaUp = true">
+        <el-button v-if="query.type == 1" type="primary" size="mini" icon="el-icon-plus" round @click="diaUp = true">
           导入课件</el-button>
-        <el-dropdown v-if="examinationPaperType == 2" trigger="click" @command="handleAdd">
+        <el-dropdown v-if="query.type == 2" trigger="click" @command="handleAdd">
           <el-button type="primary" size="mini" icon="el-icon-plus" round>添加试卷</el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item :command="1">导入试卷</el-dropdown-item>
@@ -54,9 +51,9 @@
     </p>
     <div class="content">
       <p class="tab-box">
-        <span :class="['tab-s', query.type == 1 ? 'active' : '']" @click="changType(1)">我自编的 ({{ totalCount.my
+        <span :class="['tab-s', query.share == 0 ? 'active' : '']" @click="changShare(0)">我自编的 ({{ totalCount.my
         }})</span>
-        <span :class="['tab-s', query.type == 2 ? 'active' : '']" @click="changType(2)">年级共享的 ({{ totalCount.share
+        <span :class="['tab-s', query.share == 1 ? 'active' : '']" @click="changShare(1)">年级共享的 ({{ totalCount.share
         }})</span>
       </p>
       <ul v-if="tableData && tableData.length" v-loading="loading">
@@ -102,7 +99,7 @@
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item :command="1"
                   v-if="userName == item.realName && role != 'ROLE_PERSONAL'">修改分享范围</el-dropdown-item>
-                <el-dropdown-item :command="2">复制</el-dropdown-item>
+                <el-dropdown-item v-show="query.type == 2" :command="2">复制</el-dropdown-item>
                 <el-dropdown-item :command="3">放入回收站</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
@@ -133,7 +130,7 @@
       </div>
     </el-dialog>
     <el-dialog :close-on-click-modal="false" title="上传word文档" :visible.sync="diaUp" width="600">
-      <upload :url="url" :params="{ type: examinationPaperType }" @upSuccess="upSuccess" fileName="下载">
+      <upload :url="url" :params="{ type: query.type }" @upSuccess="upSuccess" fileName="下载">
         <div class="down-box" slot="down">
           <p>第一步：导出菁优网试卷或
             <el-link type="danger" @click="downExcel">模板下载</el-link> 。
@@ -163,6 +160,7 @@ export default {
         subjectName: "",
         title: "",
         type: 1, //试卷类型
+        share: 0, //分享类型
       },
       classList: [],
       subjectList: [],
@@ -187,7 +185,6 @@ export default {
         share: 0,
       },
       diaUp: false,//上传word弹窗开关
-      examinationPaperType: 1,//题型类型
       url: "/api_html/common/paper/upload",//上传文档地址
     };
   },
@@ -217,6 +214,7 @@ export default {
         path: "/examinationPaperArchiving",
       });
     },
+    //去备题
     toAdd(query) {
       if (!this.query.classId) {
         this.$message.warning("没有任课班级，请先设置。");
@@ -228,6 +226,18 @@ export default {
       query ? (routerItem["query"] = { ...query }) : "";
       this.$router.push(routerItem);
     },
+    //去组卷
+    toAddAsk(query) {
+      if (!this.query.classId) {
+        this.$message.warning("没有任课班级，请先设置。");
+        return;
+      }
+      let routerItem = {
+        path: "/examinationPaperAddAsk",
+      };
+      query ? (routerItem["query"] = { ...query }) : "";
+      this.$router.push(routerItem);
+    },
     toEdit(item) {
       this.$router.push({
         path: "/examinationPaperEdit",
@@ -255,6 +265,10 @@ export default {
           break;
       }
     },
+    changPaperType(type) {
+      this.query.type = type
+      this.changShare(1)
+    },
     changePage(page) {
       this.page = page;
       this._QueryData(this.query.title);
@@ -295,18 +309,20 @@ export default {
     },
     //根据试卷名称查找
     async getData(bool) {
+      this.page = 1;
       this._QueryData(bool);
       this._QueryTotal();
     },
     //切换班级
     async changClazz() {
+      this.page = 1;
       await this._QuerySubjectList();
       this._QueryData(false);
       this._QueryTotal();
     },
     //切换类型
-    async changType(type) {
-      this.query.type = type
+    async changShare(share) {
+      this.query.share = share
       this.page = 1;
       this._QueryData(false);
     },
@@ -380,14 +396,10 @@ export default {
       let query = {};
       if (!type) {
         this.query.title = "";
-        query = { ...this.query };
-      } else {
-        query = { title: this.query.title };
       }
-      query.classId = this.query.classId;
-      query.subjectName = this.query.subjectName;
+      query = { ...this.query };
       for (let key in query) {
-        if (!query[key]) {
+        if (!query[key] && query[key] !== 0) {
           delete query[key]
         }
       }
@@ -451,7 +463,11 @@ export default {
         });
         this.diaUp = false;
         let params = JSON.stringify(res.data)
-        this.toAdd({ params, isUpload: 1 })
+        if (this.query.type == 2) {
+          this.toAdd({ params, isUpload: 1 })
+        } else {
+          this.toAddAsk({ params })
+        }
       }
     },
     handleAdd(value) {