From ddcd75d7fd690526dfacd033d635167296859b8e Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Mon, 5 Feb 2024 16:48:21 +0800
Subject: [PATCH] 教师二次管理数据问题

---
 src/views/basic/ask/analysis.vue     |   9 +++++----
 src/views/basic/setUp/teacher.vue    |  19 +------------------
 src/views/basic/test/index.vue       |   4 ++--
 src/views/examinationPaper/add.vue   | 122 ++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------
 src/views/examinationPaper/addQs.vue | 534 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/examinationPaper/edit.vue  | 570 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 6 files changed, 843 insertions(+), 415 deletions(-)

diff --git a/src/views/basic/ask/analysis.vue b/src/views/basic/ask/analysis.vue
index 68d5e06..493dbef 100644
--- a/src/views/basic/ask/analysis.vue
+++ b/src/views/basic/ask/analysis.vue
@@ -167,16 +167,17 @@ export default {
   },
   methods: {
     print() {
+      let title = this.detail.title || this.subjectNames.join();
       let name = "";
       this.tabList.map((item) => {
         if (item.value == this.type) {
           name = item.name;
         }
       });
-      tablePrint(
-        "print-content",
-        (this.detail.title || this.subjectNames.join()) + "_" + name
-      );
+      if (this.types == 2) {
+        title = this.subjectNames.join();
+      }
+      tablePrint("print-content", this.className + title + "_" + name);
     },
     setType(type) {
       this.type = type;
diff --git a/src/views/basic/setUp/teacher.vue b/src/views/basic/setUp/teacher.vue
index ca209ac..94a848f 100644
--- a/src/views/basic/setUp/teacher.vue
+++ b/src/views/basic/setUp/teacher.vue
@@ -993,10 +993,6 @@ export default {
         ...query,
       });
       if (status === 0) {
-        this.classList = [];
-        this.gradeClassList = [];
-        this.gradeClassSubList = [];
-        this.gradeSubListClass = [];
         this.gradeList =
           data.list?.map((item) => {
             let subList = item.subjectNames?.map((items) => {
@@ -1019,20 +1015,6 @@ export default {
                   };
                 }),
               });
-
-              let subjectNames = item.classList.map((clazz) => {
-                return {
-                  value: clazz.subjectName,
-                  label: clazz.subjectName,
-                  children: [
-                    {
-                      value: clazz.id,
-                      label: clazz.className,
-                    },
-                  ],
-                };
-              });
-
               //学校-科目-班级
               this.gradeSubListClass.push({
                 value: item.grade,
@@ -1063,6 +1045,7 @@ export default {
                 }),
               });
             } else {
+              this.gradeClassSubList = [];
               if (this.query.classType == 0) {
                 //学校-年级-科目
                 this.gradeClassSubList.push({
diff --git a/src/views/basic/test/index.vue b/src/views/basic/test/index.vue
index 9fba0d5..54cac30 100644
--- a/src/views/basic/test/index.vue
+++ b/src/views/basic/test/index.vue
@@ -157,14 +157,14 @@ export default {
       }
     },
     handleCheckAllChangeSub(val) {
-      this.isIndeterminate = false;
+      this.isIndeterminateSub = false;
       this.query.subjectNames = val ? this.subjectList : [];
     },
     CheckedSub(value) {
       console.log(value);
       let checkedCount = value.length;
       this.allSubject = checkedCount === this.subjectList.length;
-      this.isIndeterminate =
+      this.isIndeterminateSub =
         checkedCount > 0 && checkedCount < this.subjectList.length;
     },
     setDate(index) {
diff --git a/src/views/examinationPaper/add.vue b/src/views/examinationPaper/add.vue
index 4f9f6f5..ddb613e 100644
--- a/src/views/examinationPaper/add.vue
+++ b/src/views/examinationPaper/add.vue
@@ -805,70 +805,26 @@
                 </div>
                 <template v-if="isUpload">
                   <div class="qs-upload">
-                    <el-popover placement="right" width="600" trigger="click">
-                      <div class="screenshot-box">
-                        <iframe
-                          class="screenshot"
-                          v-if="subQuestions.screenshot"
-                          :src="subQuestions.screenshot"
-                        ></iframe>
-                        <p style="textalign: center">
-                          <el-button
-                            type="primary"
-                            round
-                            size="mini"
-                            icon="el-icon-upload"
-                            @click="openStem(subQuestions, index, indexs, 1)"
-                            >{{
-                              subQuestions.screenshot
-                                ? "重新选择图片"
-                                : "上传题干"
-                            }}</el-button
-                          >
-                        </p>
-                      </div>
-                      <el-button
-                        slot="reference"
-                        class="icon-tickets"
-                        type="primary"
-                        circle
-                        size="mini"
-                        icon="el-icon-tickets"
-                      ></el-button>
-                    </el-popover>
+                    <el-button
+                      slot="reference"
+                      class="icon-tickets"
+                      type="primary"
+                      circle
+                      size="mini"
+                      icon="el-icon-tickets"
+                      @click="openStem(subQuestions, index, indexs, 1)"
+                    ></el-button>
                   </div>
                   <div class="qs-upload">
-                    <el-popover placement="right" width="600" trigger="click">
-                      <div class="screenshot-box">
-                        <iframe
-                          class="screenshot"
-                          v-if="subQuestions.answerScreenshot"
-                          :src="subQuestions.answerScreenshot"
-                        ></iframe>
-                        <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>
+                    <el-button
+                      slot="reference"
+                      class="icon-tickets"
+                      type="primary"
+                      circle
+                      size="mini"
+                      icon="el-icon-tickets"
+                      @click="openStem(subQuestions, index, indexs, 2)"
+                    ></el-button>
                   </div>
                   <div class="qs-upload">
                     <el-button
@@ -1039,20 +995,26 @@
         width="500"
       >
         <div class="upload-box">
-          <template v-show="stem.type == 1">
-            <iframe
-              class="screenshot"
-              v-if="stem.screenshot"
-              :src="stem.screenshot"
-            ></iframe>
-          </template>
-          <template v-show="stem.type == 2">
-            <iframe
-              class="screenshot"
-              v-if="stem.answerScreenshot"
-              :src="stem.answerScreenshot"
-            ></iframe>
-          </template>
+          <div v-loading="iframeLoading">
+            <template v-if="stem.type == 1">
+              <iframe
+                ref="screenshot"
+                class="screenshot"
+                v-if="stem.screenshot"
+                :src="stem.screenshot"
+                @load="iframeLoading = false"
+              ></iframe>
+            </template>
+            <template v-else="stem.type == 2">
+              <iframe
+                ref="screenshot"
+                class="screenshot"
+                v-if="stem.answerScreenshot"
+                :src="stem.answerScreenshot"
+                @load="iframeLoading = false"
+              ></iframe>
+            </template>
+          </div>
           <el-upload
             class="upload-demo"
             :action="uploadUrl"
@@ -1254,6 +1216,7 @@ export default {
       listType: 1,
       listShare: 0,
       uploadUrl: "/file/uploadImgToHtml",
+      iframeLoading: false,
     };
   },
   async created() {
@@ -1292,13 +1255,20 @@ export default {
     // v1.5
     //上传截图
     openStem(obj, index, indexs, type) {
+      this.iframeLoading = true;
       this.stem.index = index;
       this.stem.indexs = indexs;
       this.stem.type = type;
       if (type == 1) {
+        if (obj.screenshot == "") {
+          this.iframeLoading = false;
+        }
         this.stem.screenshot = obj.screenshot || "";
         this.stem.answerScreenshot = "";
       } else {
+        if (obj.answerScreenshot == "") {
+          this.iframeLoading = false;
+        }
         this.stem.answerScreenshot = obj.answerScreenshot || "";
         this.stem.screenshot = "";
       }
diff --git a/src/views/examinationPaper/addQs.vue b/src/views/examinationPaper/addQs.vue
index 4ef7cb3..c9e154e 100644
--- a/src/views/examinationPaper/addQs.vue
+++ b/src/views/examinationPaper/addQs.vue
@@ -7,32 +7,71 @@
       </template>
     </back-box>
     <div class="content">
-      <el-steps :active="step" finish-status="success" simple style="margin: 20px 0">
+      <el-steps
+        :active="step"
+        finish-status="success"
+        simple
+        style="margin: 20px 0"
+      >
         <el-step title="基础信息" icon="el-icon-edit"></el-step>
         <el-step title="题目编辑" icon="el-icon-tickets"></el-step>
         <el-step title="课件预览" icon="el-icon-edit-outline"></el-step>
       </el-steps>
       <div v-show="step == 0">
-        <el-form ref="forms" :model="form" :rules="formRules" label-width="140px">
+        <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="50" size="45"
-              show-word-limit>
+            <el-input
+              class="sel2"
+              type="text"
+              placeholder="请输入答题卡名称"
+              v-model.trim="form.title"
+              maxlength="50"
+              size="45"
+              show-word-limit
+            >
             </el-input>
           </el-form-item>
-          <el-form-item v-if="role != 'ROLE_PERSONAL'" label="年级：" prop="gradeName">
-            <el-select class="sel" v-model="form.gradeName" placeholder="" @change="changeGrade">
-              <el-option v-for="item in gradeList" :key="item" :label="item" :value="item">
+          <el-form-item
+            v-if="role != 'ROLE_PERSONAL'"
+            label="年级："
+            prop="gradeName"
+          >
+            <el-select
+              class="sel"
+              v-model="form.gradeName"
+              placeholder=""
+              @change="changeGrade"
+            >
+              <el-option
+                v-for="item in gradeList"
+                :key="item"
+                :label="item"
+                :value="item"
+              >
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="科目：" prop="subjectName">
             <el-select class="sel" v-model="form.subjectName" placeholder="">
-              <el-option v-for="item in subjectList" :key="item.value" :label="item.label" :value="item.value">{{
-                item.label }}
+              <el-option
+                v-for="item in subjectList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+                >{{ item.label }}
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item v-if="role != 'ROLE_PERSONAL'" label="分享范围：" prop="sharingType">
+          <el-form-item
+            v-if="role != 'ROLE_PERSONAL'"
+            label="分享范围："
+            prop="sharingType"
+          >
             <el-radio-group v-model="form.sharingType">
               <el-radio :label="0">任课班级分享</el-radio>
               <el-radio :label="1">全年级分享</el-radio>
@@ -40,7 +79,9 @@
           </el-form-item>
         </el-form>
         <div class="btn-box">
-          <el-button type="danger" plain round @click="linkBack">取消</el-button>
+          <el-button type="danger" plain round @click="linkBack"
+            >取消</el-button
+          >
           <el-button type="primary" round @click="setStep1">下一步</el-button>
         </div>
       </div>
@@ -64,78 +105,174 @@
           </ul>
           <template v-for="(question, index) in form.questionList">
             <ul class="questions-ul">
-              <li v-for="(subQuestions, indexs) in question.subQuestions" :key="indexs">
-                <p class="set-ans-btn" v-if="subQuestions.qusType &&
-                  subQuestions.subNum &&
-                  subQuestions.subNum > 4
-                  ">
-                  <el-button type="primary" @click="setFormAns(indexs, index)">批量设置答案</el-button>
+              <li
+                v-for="(subQuestions, indexs) in question.subQuestions"
+                :key="indexs"
+              >
+                <p
+                  class="set-ans-btn"
+                  v-if="
+                    subQuestions.qusType &&
+                    subQuestions.subNum &&
+                    subQuestions.subNum > 4
+                  "
+                >
+                  <el-button type="primary" @click="setFormAns(indexs, index)"
+                    >批量设置答案</el-button
+                  >
                 </p>
                 <div v-else class="sub-questions">
                   <div class="qs-num">
                     {{ setNum(index, indexs, subQuestions) }}
                   </div>
                   <div class="qs-type">
-                    <el-select v-model="subQuestions.questionType" placeholder="选择题目类型"
-                      @change="changeSubQuestions($event, subQuestions)">
-                      <el-option v-for="options in questionOptions" :key="options.value" :label="options.label"
-                        :value="options.value"></el-option>
+                    <el-select
+                      v-model="subQuestions.questionType"
+                      placeholder="选择题目类型"
+                      @change="changeSubQuestions($event, subQuestions)"
+                    >
+                      <el-option
+                        v-for="options in questionOptions"
+                        :key="options.value"
+                        :label="options.label"
+                        :value="options.value"
+                      ></el-option>
                     </el-select>
                   </div>
                   <div class="qs-score">
-                    <el-input-number class="number-ipt" size="medium" :min="1" :max="200" :precision="2"
-                      v-model="subQuestions.score" label="单题分值"></el-input-number>
+                    <el-input-number
+                      class="number-ipt"
+                      size="medium"
+                      :min="1"
+                      :max="200"
+                      :precision="2"
+                      v-model="subQuestions.score"
+                      label="单题分值"
+                    ></el-input-number>
                   </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>
+                    <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>
+                      <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.split(',')" :class="subQuestions.correctAnswer?.includes(option)
-                        ? 'active'
-                        : ''
-                        " :key="option" @click="changAnswer(subQuestions, option)">{{ option }}</span>
+                      <span
+                        class="answer-s"
+                        v-for="option in subQuestions.answerOptions.split(',')"
+                        :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.split(',')" :class="subQuestions.correctAnswer == option ? 'active' : ''
-                        " :key="option" @click="subQuestions.correctAnswer = option">{{ option }}</span>
+                      <span
+                        class="answer-s"
+                        v-for="option in subQuestions.answerOptions.split(',')"
+                        :class="
+                          subQuestions.correctAnswer == option ? 'active' : ''
+                        "
+                        :key="option"
+                        @click="subQuestions.correctAnswer = option"
+                        >{{ option }}</span
+                      >
                     </p>
-                    <p v-if="subQuestions.questionType == 3 ||
-                      subQuestions.questionType == 2
-                      " class="answer-box answer-box2">
-                      <el-button size="mini" type="primary" icon="el-icon-plus" circle
-                        @click="addOptions(subQuestions)"></el-button>
-                      <el-button size="mini" type="primary" icon="el-icon-minus" round circle
-                        @click="removeOptions(subQuestions)"></el-button>
+                    <p
+                      v-if="
+                        subQuestions.questionType == 3 ||
+                        subQuestions.questionType == 2
+                      "
+                      class="answer-box answer-box2"
+                    >
+                      <el-button
+                        size="mini"
+                        type="primary"
+                        icon="el-icon-plus"
+                        circle
+                        @click="addOptions(subQuestions)"
+                      ></el-button>
+                      <el-button
+                        size="mini"
+                        type="primary"
+                        icon="el-icon-minus"
+                        round
+                        circle
+                        @click="removeOptions(subQuestions)"
+                      ></el-button>
                     </p>
                   </div>
 
                   <div class="qs-upload">
-                    <el-button slot="reference" class="icon-tickets" type="primary" circle size="mini"
-                      icon="el-icon-tickets" @click="openStem(subQuestions, index, indexs, 1)"></el-button>
+                    <el-button
+                      class="icon-tickets"
+                      type="primary"
+                      circle
+                      size="mini"
+                      icon="el-icon-tickets"
+                      @click="openStem(subQuestions, index, indexs, 1)"
+                    ></el-button>
                   </div>
                   <div class="qs-upload">
-                    <el-button slot="reference" class="icon-tickets" type="primary" circle size="mini"
-                      icon="el-icon-tickets" @click="openStem(subQuestions, index, indexs, 2)"></el-button>
+                    <el-button
+                      class="icon-tickets"
+                      type="primary"
+                      circle
+                      size="mini"
+                      icon="el-icon-tickets"
+                      @click="openStem(subQuestions, index, indexs, 2)"
+                    ></el-button>
                   </div>
                   <div class="qs-upload" v-if="knowledgeData.length">
-                    <el-button type="primary" circle size="mini" icon="el-icon-price-tag"
-                      @click="openKnowledge(subQuestions, index, indexs)"></el-button>
+                    <el-button
+                      type="primary"
+                      circle
+                      size="mini"
+                      icon="el-icon-price-tag"
+                      @click="openKnowledge(subQuestions, index, indexs)"
+                    ></el-button>
                   </div>
                   <div class="qs-set">
-                    <el-popconfirm title="确定删除这道题吗？" @confirm="delTabData(indexs, index)">
-                      <el-button slot="reference" class="delete" type="danger" size="mini" circle
-                        icon="el-icon-delete"></el-button>
+                    <el-popconfirm
+                      title="确定删除这道题吗？"
+                      @confirm="delTabData(indexs, index)"
+                    >
+                      <el-button
+                        slot="reference"
+                        class="delete"
+                        type="danger"
+                        size="mini"
+                        circle
+                        icon="el-icon-delete"
+                      ></el-button>
                     </el-popconfirm>
                   </div>
                 </div>
@@ -143,46 +280,88 @@
             </ul>
           </template>
         </div>
-        <el-dialog :close-on-click-modal="false" title="批量设置答案" :visible.sync="diaSetAns" width="400"
-          :modal-append-to-body="false">
+        <el-dialog
+          :close-on-click-modal="false"
+          title="批量设置答案"
+          :visible.sync="diaSetAns"
+          width="400"
+          :modal-append-to-body="false"
+        >
           <div class="qs-options">
             <p class="dia-tips">
               请点击选项按钮设置答案,多选题题目之间用“,”隔开，若添加5道题：“AC,AD,BD,AC,CD”
             </p>
             <p>{{ setSubPro(formAns.qusType) }}：</p>
             <p class="ipt">
-              <el-input v-if="formAns.qusType == 2 || formAns.qusType == 3" ref="formAnsIpt" v-model="formAns.answerList"
+              <el-input
+                v-if="formAns.qusType == 2 || formAns.qusType == 3"
+                ref="formAnsIpt"
+                v-model="formAns.answerList"
                 @keydown.native="keydownAnswer($event, formAns.qusType)"
-                @input="setAllAnswer($event, formAns.qusType)"></el-input>
-              <el-input v-if="formAns.qusType == 4" v-model="formAns.answerList" readonly=""></el-input>
+                @input="setAllAnswer($event, formAns.qusType)"
+              ></el-input>
+              <el-input
+                v-if="formAns.qusType == 4"
+                v-model="formAns.answerList"
+                readonly=""
+              ></el-input>
             </p>
             <p class="answer-box">
               <template v-if="formAns.qusType == 4">
-                <span class="answer-s active" @click="
-                  formAns.answerList.length < formAns.subNum
-                    ? (formAns.answerList += '✓')
-                    : ''
-                  ">✓</span>
-                <span class="answer-s active" @click="
-                  formAns.answerList.length < formAns.subNum
-                    ? (formAns.answerList += '✗')
-                    : ''
-                  ">✗</span>
+                <span
+                  class="answer-s active"
+                  @click="
+                    formAns.answerList.length < formAns.subNum
+                      ? (formAns.answerList += '✓')
+                      : ''
+                  "
+                  >✓</span
+                >
+                <span
+                  class="answer-s active"
+                  @click="
+                    formAns.answerList.length < formAns.subNum
+                      ? (formAns.answerList += '✗')
+                      : ''
+                  "
+                  >✗</span
+                >
               </template>
               <template v-if="formAns.qusType == 3">
-                <span class="answer-s active" v-for="option in formAns.answerOptions.split(',')" :key="option"
-                  @click="setMultiple(formAns, option, 2)">{{ option }}</span>
-                <span class="answer-s active" @click="setMultiple(formAns, ',', 2)">,</span>
+                <span
+                  class="answer-s active"
+                  v-for="option in formAns.answerOptions.split(',')"
+                  :key="option"
+                  @click="setMultiple(formAns, option, 2)"
+                  >{{ option }}</span
+                >
+                <span
+                  class="answer-s active"
+                  @click="setMultiple(formAns, ',', 2)"
+                  >,</span
+                >
               </template>
               <template v-if="formAns.qusType == 2">
-                <span class="answer-s active" v-for="option in formAns.answerOptions.split(',')" :key="option" @click="
-                  formAns.answerList.length < formAns.subNum
-                    ? (formAns.answerList += option)
-                    : ''
-                  ">{{ option }}</span>
+                <span
+                  class="answer-s active"
+                  v-for="option in formAns.answerOptions.split(',')"
+                  :key="option"
+                  @click="
+                    formAns.answerList.length < formAns.subNum
+                      ? (formAns.answerList += option)
+                      : ''
+                  "
+                  >{{ option }}</span
+                >
               </template>
-              <span class="answer-s delButton" @click="formAns.answerList = formAns.answerList.slice(0, -1)">x</span>
-              <span class="answer-s ac" @click="formAns.answerList = ''">ac</span>
+              <span
+                class="answer-s delButton"
+                @click="formAns.answerList = formAns.answerList.slice(0, -1)"
+                >x</span
+              >
+              <span class="answer-s ac" @click="formAns.answerList = ''"
+                >ac</span
+              >
             </p>
           </div>
           <div class="dialog-footer" slot="footer">
@@ -191,21 +370,48 @@
           </div>
         </el-dialog>
         <div class="btn-box">
-          <el-button type="danger" plain round @click="linkBack">取消</el-button>
+          <el-button type="danger" plain round @click="linkBack"
+            >取消</el-button
+          >
           <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="stem.type == 1 ? '上传题干' : '上传题目解析'" :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">
-            <template v-show="stem.type == 1">
-              <iframe class="screenshot" v-if="stem.screenshot" :src="stem.screenshot"></iframe>
-            </template>
-            <template v-show="stem.type == 2">
-              <iframe class="screenshot" v-if="stem.answerScreenshot" :src="stem.answerScreenshot"></iframe>
-            </template>
-            <el-upload class="upload-demo" :action="uploadUrl" :limit="1" :on-success="upSuccess" :on-error="upError"
-              accept="image/*">
+            <div v-loading="iframeLoading">
+              <template v-if="stem.type == 1">
+                <iframe
+                  ref="screenshot"
+                  class="screenshot"
+                  v-if="stem.screenshot"
+                  :src="stem.screenshot"
+                  @load="iframeLoading = false"
+                ></iframe>
+              </template>
+              <template v-else="stem.type == 2">
+                <iframe
+                  ref="screenshot"
+                  class="screenshot"
+                  v-if="stem.answerScreenshot"
+                  :src="stem.answerScreenshot"
+                  @load="iframeLoading = false"
+                ></iframe>
+              </template>
+            </div>
+            <el-upload
+              class="upload-demo"
+              :action="uploadUrl"
+              :limit="1"
+              :on-success="upSuccess"
+              :on-error="upError"
+              accept="image/*"
+            >
               <el-button size="small" type="primary">选择上传照片</el-button>
             </el-upload>
           </div>
@@ -213,12 +419,26 @@
             <el-button @click="dialogStem = false">保存</el-button>
           </div>
         </el-dialog>
-        <el-dialog :close-on-click-modal="false" title="知识点" :visible.sync="dialogKnowledge" width="500">
+        <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-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>
@@ -234,13 +454,22 @@
         </div>
         <div class="question-box">
           <template v-for="question in form.questionList">
-            <div class="screenshot-box" v-for="subQuestions in question.subQuestions">
-              <iframe class="screenshot" v-if="subQuestions.screenshot" :src="subQuestions.screenshot"></iframe>
+            <div
+              class="screenshot-box"
+              v-for="subQuestions in question.subQuestions"
+            >
+              <iframe
+                class="screenshot"
+                v-if="subQuestions.screenshot"
+                :src="subQuestions.screenshot"
+              ></iframe>
             </div>
           </template>
         </div>
         <div class="btn-box">
-          <el-button type="danger" plain round @click="linkBack">取消</el-button>
+          <el-button type="danger" plain round @click="linkBack"
+            >取消</el-button
+          >
           <el-button round @click="toStep(1)">上一步</el-button>
           <el-button type="primary" round @click="save">保存</el-button>
         </div>
@@ -279,9 +508,7 @@ export default {
             trigger: "blur",
           },
         ],
-        gradeName: [
-          { required: true, message: "请选择年级", trigger: "blur" },
-        ],
+        gradeName: [{ required: true, message: "请选择年级", trigger: "blur" }],
         subjectName: [
           { required: true, message: "请选择科目", trigger: "blur" },
         ],
@@ -318,27 +545,35 @@ export default {
       //返回列表页参数记录
       listType: 1,
       listShare: 0,
-      uploadUrl: "/file/uploadImgToHtml"
+      uploadUrl: "/file/uploadImgToHtml",
+      iframeLoading: false,
     };
   },
   computed: {
     // 知识点列表 根据学段-科目筛选
     knowledgeData: function () {
-      let jsons = []
+      let jsons = [];
       if (this.form.gradeName && this.form.subjectName) {
-        let sectionName = ""
-        this.gradeClassList.map(item => {
+        let sectionName = "";
+        this.gradeClassList.map((item) => {
           if (this.form.gradeName == item.gradeName) {
-            sectionName = item.sectionName
+            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]
+        });
+        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
+      return jsons;
     },
   },
   watch: {
@@ -350,19 +585,23 @@ export default {
   },
   async created() {
     this.listType = this.$route.query.listType ? this.$route.query.listType : 1;
-    this.listShare = this.$route.query.listShare ? this.$route.query.listShare : 0;
+    this.listShare = this.$route.query.listShare
+      ? this.$route.query.listShare
+      : 0;
     this.type = this.$route.query.type ? this.$route.query.type : 1;
     this.role =
       this.$store.getters.info.showRole ||
       this.$store.getters.info.permissions[0].role;
     if (this.type != 2) {
-      let params = this.$route.query.params && JSON.parse(this.$route.query.params) || null
-      this.form.title = params?.name
-      this.form.id = params?.id
-      this.form.sharingType = params?.sharingType || 0
-      this.formatData(params)
+      let params =
+        (this.$route.query.params && JSON.parse(this.$route.query.params)) ||
+        null;
+      this.form.title = params?.name;
+      this.form.id = params?.id;
+      this.form.sharingType = params?.sharingType || 0;
+      this.formatData(params);
     }
-    console.log(this.form)
+    console.log(this.form);
     if (this.role != "ROLE_PERSONAL") {
       this.formRules.gradeName = [
         { required: true, message: "请选择年级", trigger: "blur" },
@@ -378,13 +617,20 @@ export default {
     // v1.5
     //上传截图
     openStem(obj, index, indexs, type) {
+      this.iframeLoading = true;
       this.stem.index = index;
       this.stem.indexs = indexs;
       this.stem.type = type;
       if (type == 1) {
+        if (obj.screenshot == "") {
+          this.iframeLoading = false;
+        }
         this.stem.screenshot = obj.screenshot || "";
         this.stem.answerScreenshot = "";
       } else {
+        if (obj.answerScreenshot == "") {
+          this.iframeLoading = false;
+        }
         this.stem.answerScreenshot = obj.answerScreenshot || "";
         this.stem.screenshot = "";
       }
@@ -397,10 +643,14 @@ export default {
       if (res && res.status == 0) {
         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;
+          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.form.questionList[this.stem.index].subQuestions[
+            this.stem.indexs
+          ].answerScreenshot = this.stem.answerScreenshot;
         }
         this.$message.success("上传成功");
       } else {
@@ -420,15 +670,16 @@ export default {
     },
     // 知识点
     setKnowledge() {
-      this.form.questionList[this.stem.index].subQuestions[this.stem.indexs].knowledge = this.stem.knowledge.join("#");
+      this.form.questionList[this.stem.index].subQuestions[
+        this.stem.indexs
+      ].knowledge = this.stem.knowledge.join("#");
       this.dialogKnowledge = false;
     },
 
     //end
     linkBack() {
       this.$confirm(
-        (this.type == 2 ? "修改复制的" : "导入的") +
-        "课件未保存，确认退出吗？",
+        (this.type == 2 ? "修改复制的" : "导入的") + "课件未保存，确认退出吗？",
         "提示",
         {
           confirmButtonText: "取消",
@@ -441,14 +692,14 @@ export default {
           type: "warning",
         }
       )
-        .then(() => { })
+        .then(() => {})
         .catch(() => {
           this.$router.push({
             path: "/examinationPaper",
             query: {
               type: this.listType,
               share: this.listShare,
-            }
+            },
           });
         });
     },
@@ -473,8 +724,8 @@ export default {
     },
     //计算题号
     setNum(index, indexs, sub) {
-      let lengths = 0;//所在大题之前的所有小题数量
-      let subIndex = 0;//所在大题的位置
+      let lengths = 0; //所在大题之前的所有小题数量
+      let subIndex = 0; //所在大题的位置
       for (let i = 0; i < index; i++) {
         let subArr = this.form.questionList[i].subQuestions.filter((item) => {
           return !!item.questionType;
@@ -490,7 +741,7 @@ export default {
     },
     //整理问题
     formateQuestion() {
-      this.formatQuestionList()
+      this.formatQuestionList();
       this.form.questionList?.map((item) => {
         let types = [{}];
         let addndex = 0;
@@ -641,7 +892,7 @@ export default {
           if (this.formAns.endIndex == item.questionIndex) {
             EndIndex = index;
           }
-          return this.formAns.endIndex == item.questionIndex
+          return this.formAns.endIndex == item.questionIndex;
         }
       );
       for (let i = 0; i <= subNum; i++) {
@@ -655,8 +906,8 @@ export default {
             this.formAns.answerList[subNum - i] == "✓"
               ? 1
               : this.formAns.answerList[subNum - i] == "✗"
-                ? 2
-                : "";
+              ? 2
+              : "";
         }
         this.form.questionList[this.formAns.listIndex].subQuestions[
           EndIndex - i
@@ -694,7 +945,6 @@ export default {
       }
     },
     setAllAnswer(event, type) {
-
       let str = this.formAns.answerList;
       let str2 = checkAnswer(
         str,
@@ -703,7 +953,6 @@ export default {
         this.formAns.subNum
       );
       this.formAns.answerList = str2;
-
     },
     setAnswer(type, ans) {
       let txt = "";
@@ -720,7 +969,7 @@ export default {
       this.formatQuestionList();
       this.step = step;
       if (step == 1) {
-        this.formateQuestion()
+        this.formateQuestion();
       }
     },
     setStep1() {
@@ -731,7 +980,7 @@ export default {
       this.$refs["forms"].validate((valid) => {
         // 验证通过：保存
         if (valid) {
-          this.formateQuestion()
+          this.formateQuestion();
           this.step = 1;
         } else {
           this.$message.error("数据有误，请检查！");
@@ -757,7 +1006,7 @@ export default {
     //删除题
     delTabData(subIndex, index) {
       this.form.questionList[index].subQuestions.splice(subIndex, 1);
-      this.formateQuestion()
+      this.formateQuestion();
     },
     //切换题型
     changeSubQuestions(val, subQuestions) {
@@ -785,7 +1034,7 @@ export default {
           subQuestions.selectNum = 0;
           break;
       }
-      this.formateQuestion()
+      this.formateQuestion();
     },
     //设置多选答案
     changAnswer(sub, option) {
@@ -799,9 +1048,6 @@ export default {
       }
     },
 
-
-
-
     async save() {
       if (this.saveLoading) return;
       this.saveLoading = true;
@@ -822,7 +1068,7 @@ export default {
           query: {
             type: this.listType,
             share: this.listShare,
-          }
+          },
         });
       } else {
         this.$message.error(info);
@@ -846,12 +1092,12 @@ export default {
       const { data, status, info } = await fetchClassList();
       if (status == 0) {
         this.gradeClassList = data.list?.map((item) => {
-          console.log(!this.gradeList.includes(item.gradeName))
+          console.log(!this.gradeList.includes(item.gradeName));
           if (!this.gradeList.includes(item.gradeName)) {
-            this.gradeList.push(item.gradeName)
+            this.gradeList.push(item.gradeName);
           }
-          return item
-        })
+          return item;
+        });
         // this.gradeList = (data.gradeNames && [...data.gradeNames]) || [];
         if (this.type != 2) {
           this.form.gradeName = this.gradeList[0];
@@ -906,7 +1152,7 @@ export default {
           this.form.sharingType = data.sharingType;
         }
         this.form.tagId = "";
-        this.formatData(data)
+        this.formatData(data);
       } else {
         this.$message.error(info);
       }
@@ -951,7 +1197,7 @@ export default {
           show: false,
         };
       });
-    }
+    },
   },
 };
 </script>
@@ -1255,7 +1501,7 @@ export default {
   display: flex;
   border-bottom: 1px solid #e2e2e2;
 
-  &>div {
+  & > div {
     min-height: 40px;
     padding: 5px;
     flex-shrink: 0;
diff --git a/src/views/examinationPaper/edit.vue b/src/views/examinationPaper/edit.vue
index e5b9a07..bd3e2c3 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="!questionList[0]?.subQuestions">
+        <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>
@@ -35,11 +38,17 @@
             <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
+              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>
@@ -51,58 +60,97 @@
               </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>
+                <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>
+                  <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
+                    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
+                    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-popover placement="right" width="600" trigger="click">
-                  <div class="screenshot-box">
-                    <iframe class="screenshot" v-if="subQuestions.screenshot" :src="subQuestions.screenshot"></iframe>
-                    <p style="textAlign:center"><el-button type="primary" round size="mini" icon="el-icon-upload"
-                        @click="openStem(subQuestions, 1, 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>
+                <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-popover placement="right" width="600" trigger="click">
-                  <div class="screenshot-box">
-                    <iframe class="screenshot" v-if="subQuestions.answerScreenshot"
-                      :src="subQuestions.answerScreenshot"></iframe>
-                    <p style="textAlign:center"><el-button type="primary" round size="mini" icon="el-icon-upload"
-                        @click="openStem(subQuestions, 2, 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>
+                <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>
+                <el-button
+                  type="primary"
+                  circle
+                  size="mini"
+                  icon="el-icon-price-tag"
+                  @click="openKnowledge(subQuestions, indexs)"
+                ></el-button>
               </div>
             </div>
           </li>
@@ -111,7 +159,12 @@
           <template v-for="(question, index) in questionList">
             <p class="question-title">
               <span>{{ setBigNum(index) }}、</span>
-              <el-input class="ipt" v-model.trim="question.questionTitle" maxlength="30" placeholder="填写大题名称"></el-input>
+              <el-input
+                class="ipt"
+                v-model.trim="question.questionTitle"
+                maxlength="30"
+                placeholder="填写大题名称"
+              ></el-input>
               <span>共 {{ setScore(question) }} 分</span>
             </p>
             <div class="questions-ul">
@@ -125,12 +178,21 @@
                 <div class="qs-set">题目解析</div>
                 <div class="qs-set">知识点</div>
               </div>
-              <div v-for="(subQuestions, indexs) in question.subQuestions" :key="indexs">
-                <p class="set-ans-btn" v-if="subQuestions.qusType &&
-                  subQuestions.subNum &&
-                  subQuestions.subNum > 4
-                  ">
-                  <el-button type="primary" @click="setFormAns(indexs, index)">批量设置答案</el-button>
+              <div
+                v-for="(subQuestions, indexs) in question.subQuestions"
+                :key="indexs"
+              >
+                <p
+                  class="set-ans-btn"
+                  v-if="
+                    subQuestions.qusType &&
+                    subQuestions.subNum &&
+                    subQuestions.subNum > 4
+                  "
+                >
+                  <el-button type="primary" @click="setFormAns(indexs, index)"
+                    >批量设置答案</el-button
+                  >
                 </p>
                 <div v-else class="sub-questions">
                   <div class="qs-num">{{ subQuestions.questionIndex }}</div>
@@ -138,73 +200,110 @@
                     {{ setSubPro(subQuestions.questionType) }}
                   </div>
                   <div class="qs-score">
-                    <el-input-number class="number-ipt" size="medium" :min="1" :max="200" :precision="2" :step="1"
-                      v-model="subQuestions.score" label="单题分值"></el-input-number>
+                    <el-input-number
+                      class="number-ipt"
+                      size="medium"
+                      :min="1"
+                      :max="200"
+                      :precision="2"
+                      :step="1"
+                      v-model="subQuestions.score"
+                      label="单题分值"
+                    ></el-input-number>
                   </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>
+                    <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>
+                      <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
+                        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
+                        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-popover placement="right" width="600" 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, 1, 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>
+                    <el-button
+                      class="icon-tickets"
+                      type="primary"
+                      circle
+                      size="mini"
+                      icon="el-icon-tickets"
+                      @click="openStem(subQuestions, 1, index, indexs)"
+                    ></el-button>
                   </div>
                   <div class="qs-set">
-                    <el-popover placement="right" width="600" 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, 2, 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>
+                    <el-button
+                      class="icon-tickets"
+                      type="primary"
+                      circle
+                      size="mini"
+                      icon="el-icon-tickets"
+                      @click="openStem(subQuestions, 2, index, indexs)"
+                    ></el-button>
                   </div>
                   <div class="qs-set">
-                    <el-button type="primary" circle size="mini" icon="el-icon-price-tag"
-                      @click="openKnowledge(subQuestions, index, indexs)"></el-button>
+                    <el-button
+                      type="primary"
+                      circle
+                      size="mini"
+                      icon="el-icon-price-tag"
+                      @click="openKnowledge(subQuestions, index, indexs)"
+                    ></el-button>
                   </div>
                 </div>
               </div>
@@ -216,45 +315,83 @@
         <el-button type="danger" plain round @click="linkBack">取消</el-button>
         <el-button type="primary" round @click="save">保存</el-button>
       </div>
-      <el-dialog :close-on-click-modal="false" title="批量设置答案" :visible.sync="diaSetAns" width="400"
-        :modal-append-to-body="false">
+      <el-dialog
+        :close-on-click-modal="false"
+        title="批量设置答案"
+        :visible.sync="diaSetAns"
+        width="400"
+        :modal-append-to-body="false"
+      >
         <div class="qs-options set-questions">
           <p class="dia-tips">
             请点击选项按钮设置答案,多选题题目之间用“,”隔开，若添加5道题：“AC,AD,BD,AC,CD”
           </p>
           <p>{{ setSubPro(formAns.qusType) }}：</p>
           <p class="ipt">
-            <el-input ref="formAnsIpt" v-if="formAns.qusType == 2 || formAns.qusType == 3" v-model="formAns.answerList"
+            <el-input
+              ref="formAnsIpt"
+              v-if="formAns.qusType == 2 || formAns.qusType == 3"
+              v-model="formAns.answerList"
               @keydown.native="keydownAnswer($event, formAns.qusType)"
-              @input="setAllAnswer($event, formAns.qusType)"></el-input>
-            <el-input v-if="formAns.qusType == 4" v-model="formAns.answerList" readonly=""></el-input>
+              @input="setAllAnswer($event, formAns.qusType)"
+            ></el-input>
+            <el-input
+              v-if="formAns.qusType == 4"
+              v-model="formAns.answerList"
+              readonly=""
+            ></el-input>
           </p>
           <p class="answer-box">
             <template v-if="formAns.qusType == 4">
-              <span class="answer-s active" @click="
-                formAns.answerList.length < formAns.subNum
-                  ? (formAns.answerList += '✓')
-                  : ''
-                ">✓</span>
-              <span class="answer-s active" @click="
-                formAns.answerList.length < formAns.subNum
-                  ? (formAns.answerList += '✗')
-                  : ''
-                ">✗</span>
+              <span
+                class="answer-s active"
+                @click="
+                  formAns.answerList.length < formAns.subNum
+                    ? (formAns.answerList += '✓')
+                    : ''
+                "
+                >✓</span
+              >
+              <span
+                class="answer-s active"
+                @click="
+                  formAns.answerList.length < formAns.subNum
+                    ? (formAns.answerList += '✗')
+                    : ''
+                "
+                >✗</span
+              >
             </template>
             <template v-if="formAns.qusType == 3">
-              <span class="answer-s active" v-for="option in formAns.answerOptions.split(',')" :key="option"
-                @click="setMultiple(formAns, option)">{{ option }}</span>
-              <span class="answer-s active" @click="setMultiple(formAns, ',')">,</span>
+              <span
+                class="answer-s active"
+                v-for="option in formAns.answerOptions.split(',')"
+                :key="option"
+                @click="setMultiple(formAns, option)"
+                >{{ option }}</span
+              >
+              <span class="answer-s active" @click="setMultiple(formAns, ',')"
+                >,</span
+              >
             </template>
             <template v-if="formAns.qusType == 2">
-              <span class="answer-s active" v-for="option in formAns.answerOptions.split(',')" :key="option" @click="
-                formAns.answerList.length < formAns.subNum
-                  ? (formAns.answerList += option)
-                  : ''
-                ">{{ option }}</span>
+              <span
+                class="answer-s active"
+                v-for="option in formAns.answerOptions.split(',')"
+                :key="option"
+                @click="
+                  formAns.answerList.length < formAns.subNum
+                    ? (formAns.answerList += option)
+                    : ''
+                "
+                >{{ option }}</span
+              >
             </template>
-            <span class="answer-s delButton" @click="formAns.answerList = formAns.answerList.slice(0, -1)">x</span>
+            <span
+              class="answer-s delButton"
+              @click="formAns.answerList = formAns.answerList.slice(0, -1)"
+              >x</span
+            >
             <span class="answer-s ac" @click="formAns.answerList = ''">ac</span>
           </p>
         </div>
@@ -263,18 +400,42 @@
           <el-button @click="diaSetAns = false">取 消</el-button>
         </div>
       </el-dialog>
-      <el-dialog :close-on-click-modal="false" :title="stem.type == 1 ? '上传题干' : '上传题目解析'" :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">
-          <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="uploadUrl" :limit="1" :on-success="upSuccess" :on-error="upError"
-            accept="image/*">
+          <div v-loading="iframeLoading">
+            <template v-if="stem.type == 1">
+              <iframe
+                ref="screenshot"
+                class="screenshot"
+                v-if="stem.screenshot"
+                :src="stem.screenshot"
+                @load="iframeLoading = false"
+              ></iframe>
+            </template>
+            <template v-else>
+              <iframe
+                ref="screenshot"
+                class="screenshot"
+                v-if="stem.answerScreenshot"
+                :src="stem.answerScreenshot"
+                @load="iframeLoading = false"
+              ></iframe>
+            </template>
+          </div>
+          <el-upload
+            class="upload-demo"
+            :action="uploadUrl"
+            :limit="1"
+            :on-success="upSuccess"
+            :on-error="upError"
+            accept="image/*"
+          >
             <el-button size="small" type="primary">选择照片</el-button>
           </el-upload>
         </div>
@@ -282,13 +443,29 @@
           <el-button @click="dialogStem = false">确定</el-button>
         </div>
       </el-dialog>
-      <el-dialog :close-on-click-modal="false" title="知识点" :visible.sync="dialogKnowledge" width="500">
+      <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" clearable placeholder="选择知识点"
-                v-model="stem.knowledge" :options="knowledgeData"
-                :props="{ expandTrigger: 'hover', multiple: true, checkStrictly: true }"></el-cascader>
+              <el-cascader
+                size="small"
+                filterable
+                :show-all-levels="false"
+                clearable
+                placeholder="选择知识点"
+                v-model="stem.knowledge"
+                :options="knowledgeData"
+                :props="{
+                  expandTrigger: 'hover',
+                  multiple: true,
+                  checkStrictly: true,
+                }"
+              ></el-cascader>
             </el-form-item>
           </el-form>
         </div>
@@ -311,7 +488,7 @@ export default {
       title: "",
       type: 1,
       questionList: [],
-      paperType: 1,//1 备题（随堂问） /2 组卷
+      paperType: 1, //1 备题（随堂问） /2 组卷
       //答题卡详情
       form: {
         examType: 2, //考试类型：0-未知/1-随堂问/2-即时测/3-xx考
@@ -352,7 +529,8 @@ export default {
         knowledge: [], //知识点
       },
       gradeClassList: [], //学段列表
-      uploadUrl: "/file/uploadImgToHtml"
+      uploadUrl: "/file/uploadImgToHtml",
+      iframeLoading: false,
     };
   },
   computed: {
@@ -364,30 +542,37 @@ export default {
             return a + (Number(b.score) || 0);
           }, 0);
         } else {
-          score += (item.score || 0);
+          score += item.score || 0;
         }
       }, 0);
       return Number(score).toFixed(2);
     },
     // 知识点列表 根据学段-科目筛选
     knowledgeData: function () {
-      let jsons = []
+      let jsons = [];
       if (this.form.gradeName && this.form.subjectName) {
-        let sectionName = ""
-        this.gradeClassList?.map(item => {
+        let sectionName = "";
+        this.gradeClassList?.map((item) => {
           if (this.form.gradeName == item.gradeName) {
-            sectionName = item.sectionName
+            sectionName = item.sectionName;
           }
-        })
-        console.log(this.gradeClassList)
-        console.log(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]
+        });
+        console.log(this.gradeClassList);
+        console.log(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
+      return jsons;
     },
   },
   created() {
@@ -404,12 +589,20 @@ export default {
     // v1.5
     //上传截图
     openStem(obj, type, index, indexs) {
+      this.iframeLoading = true;
+      this.stem.type = type;
       this.stem.index = index;
       this.stem.indexs = indexs;
       if (type == 1) {
+        if (obj.screenshot == "") {
+          this.iframeLoading = false;
+        }
         this.stem.screenshot = obj.screenshot || "";
         this.stem.answerScreenshot = "";
       } else {
+        if (obj.answerScreenshot == "") {
+          this.iframeLoading = false;
+        }
         this.stem.answerScreenshot = obj.answerScreenshot || "";
         this.stem.screenshot = "";
       }
@@ -422,18 +615,22 @@ export default {
         this.stem.screenshot = res.data.url;
         if (this.stem.type == 1) {
           if (this.questionList[0]?.subQuestions) {
-            this.questionList[this.stem.index].subQuestions[this.stem.indexs].screenshot = this.stem.screenshot;
+            this.questionList[this.stem.index].subQuestions[
+              this.stem.indexs
+            ].screenshot = this.stem.screenshot;
           } else {
-            this.questionList[this.stem.index].screenshot = this.stem.screenshot;
+            this.questionList[this.stem.index].screenshot =
+              this.stem.screenshot;
           }
-
         } else {
           if (this.questionList[0]?.subQuestions) {
-            this.questionList[this.stem.index].subQuestions[this.stem.indexs].answerScreenshot = this.stem.answerScreenshot;
+            this.questionList[this.stem.index].subQuestions[
+              this.stem.indexs
+            ].answerScreenshot = this.stem.answerScreenshot;
           } else {
-            this.questionList[this.stem.index].answerScreenshot = this.stem.answerScreenshot;
+            this.questionList[this.stem.index].answerScreenshot =
+              this.stem.answerScreenshot;
           }
-
         }
 
         this.$message.success("上传成功");
@@ -449,7 +646,7 @@ export default {
 
       const { data, status, info } = await fetchClassList();
       if (status == 0) {
-        this.gradeClassList = data.list
+        this.gradeClassList = data.list;
       } else {
         this.$message.error(info);
       }
@@ -471,13 +668,13 @@ export default {
           this.stem.indexs
         ].knowledge = this.stem.knowledge.join("#");
       } else {
-        this.questionList[this.stem.index].knowledge = this.stem.knowledge.join("#");
+        this.questionList[this.stem.index].knowledge =
+          this.stem.knowledge.join("#");
       }
       this.dialogKnowledge = false;
     },
     //end
 
-
     linkBack() {
       this.$router.go(-1);
     },
@@ -665,7 +862,7 @@ export default {
             if (this.formAns.endIndex == item.questionIndex) {
               EndIndex = index;
             }
-            return this.formAns.endIndex == item.questionIndex
+            return this.formAns.endIndex == item.questionIndex;
           }
         );
       } else {
@@ -673,7 +870,7 @@ export default {
           if (this.formAns.endIndex == item.questionIndex) {
             EndIndex = index;
           }
-          return this.formAns.endIndex == item.questionIndex
+          return this.formAns.endIndex == item.questionIndex;
         });
       }
 
@@ -688,8 +885,8 @@ export default {
             this.formAns.answerList[subNum - i] == "✓"
               ? 1
               : this.formAns.answerList[subNum - i] == "✗"
-                ? 2
-                : "";
+              ? 2
+              : "";
         }
         if (this.questionList[0]?.subQuestions) {
           this.questionList[this.formAns.listIndex].subQuestions[
@@ -770,22 +967,22 @@ export default {
           this.type == 1
             ? this.$request.pPaperDetail
             : this.type == 2
-              ? this.$request.pExamQuestionList
-              : this.$request.pPeriodQuestionList;
+            ? this.$request.pExamQuestionList
+            : this.$request.pPeriodQuestionList;
       } else {
         detail =
           this.type == 1
             ? this.$request.fetchPaperDetail
             : this.type == 2
-              ? this.$request.examQuestionList
-              : this.$request.periodQuestionList;
+            ? this.$request.examQuestionList
+            : this.$request.periodQuestionList;
       }
       let params =
         this.type == 1
           ? { paperId: this.$route.query.paperId }
           : this.type == 2
-            ? { examId: this.$route.query.paperId }
-            : {
+          ? { examId: this.$route.query.paperId }
+          : {
               periodId: this.$route.query.paperId,
             };
       const { data, status, info } = await detail(params);
@@ -803,7 +1000,7 @@ export default {
             return a.questionIndex - b.questionIndex;
           });
         }
-        this.formateQuestion()
+        this.formateQuestion();
       } else {
         this.$message.error(info);
       }
@@ -822,8 +1019,7 @@ export default {
                 //同类型批量答案+1
                 types[addndex].subNum += 1;
                 if (
-                  types[addndex].answerOptions.length <
-                  sub.answerOptions.length
+                  types[addndex].answerOptions.length < sub.answerOptions.length
                 ) {
                   types[addndex].answerOptions = sub.answerOptions;
                 }
@@ -935,7 +1131,26 @@ export default {
   },
 };
 </script>
+<style>
+.screenshot-box {
+  width: 600px;
+}
+
+.screenshot {
+  width: 100%;
+  box-shadow: none;
+  border: none;
+  height: 400px;
+}
 
+.screenshot-img {
+  display: block;
+  width: auto;
+  max-width: 100%;
+  margin: 0 auto;
+  margin-bottom: 10px;
+}
+</style>
 <style lang="scss" scoped>
 .content {
   width: 100%;
@@ -1032,6 +1247,19 @@ export default {
     font-weight: 700;
   }
 }
+.question-box {
+  margin-bottom: 20px;
+
+  .screenshot-box {
+    width: 100%;
+    border: 1px solid #e2e2e2;
+    margin-bottom: 20px;
+
+    .screenshot-img {
+      margin: 0;
+    }
+  }
+}
 
 .set-ans-btn {
   width: 100%;
@@ -1069,7 +1297,7 @@ export default {
   display: flex;
   border-bottom: 1px solid #e2e2e2;
 
-  &>div {
+  & > div {
     min-height: 40px;
     padding: 5px;
     flex-shrink: 0;
--
libgit2 0.21.4