diff --git a/src/views/examinationPaper/add.vue b/src/views/examinationPaper/add.vue
index 9205513..c5d4f68 100644
--- a/src/views/examinationPaper/add.vue
+++ b/src/views/examinationPaper/add.vue
@@ -10,6 +10,7 @@
         <el-step title="基础信息" icon="el-icon-edit"></el-step>
         <el-step v-if="!isUpload" title="题目编辑" icon="el-icon-tickets"></el-step>
         <el-step title="设置答案" icon="el-icon-edit-outline"></el-step>
+        <el-step v-if="isUpload" 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">
@@ -324,6 +325,8 @@
               <div class="qs-score">分数</div>
               <div class="qs-partScore">漏选得分</div>
               <div class="qs-options qs-options2">选项设置</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">
               <p class="set-ans-btn" v-if="subQuestions.qusType &&
@@ -337,7 +340,18 @@
                   {{ setNum(index, indexs, subQuestions) }}
                 </div>
                 <div class="qs-type">
-                  {{ setSubPro(subQuestions.questionType) }}
+                  <template v-if="isUpload">
+                    <el-select v-model="subQuestions.questionType" placeholder="选择题目类型"
+                      @change="changeSubQuestions($event, subQuestions)">
+                      <el-option label="单选题" :value="2"></el-option>
+                      <el-option label="多选题" :value="3"></el-option>
+                      <el-option label="判断题" :value="4"></el-option>
+                      <el-option label="主观题" :value="5"></el-option>
+                    </el-select>
+                  </template>
+                  <template v-else>
+                    {{ setSubPro(subQuestions.questionType) }}
+                  </template>
                 </div>
                 <div class="qs-score">
                   <el-input-number class="number-ipt" size="medium" :min="1" :max="200" :precision="2"
@@ -367,6 +381,29 @@
                       " :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>
+                <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>
+                </div>
               </div>
             </li>
           </ul>
@@ -420,22 +457,50 @@
         </el-dialog>
         <div class="btn-box">
           <el-button type="danger" plain round @click="linkBack">取消</el-button>
-          <el-button round @click="backStep1">上一步</el-button>
+          <template v-if="!isUpload">
+            <el-button round @click="toStep(1)">上一步</el-button>
+            <el-button type="primary" round @click="save">保存</el-button>
+          </template>
+          <template v-else>
+            <el-button round @click="step = 0">上一步</el-button>
+            <el-button type="primary" round @click="toStep(3)">下一步</el-button>
+          </template>
+        </div>
+      </div>
+      <div v-show="step == 3">
+        <div class="answer-title">
+          <p class="name">{{ form.title }}</p>
+        </div>
+        <div class="question-box">
+          <template v-for="(question, index) in form.questionList">
+            <div class="screenshot-box" v-for="(subQuestions, indexs) in question.subQuestions"
+              :key="index + '-' + indexs">
+              <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="">
+            </div>
+          </template>
+        </div>
+        <div class="btn-box">
+          <el-button type="danger" plain round @click="linkBack">取消</el-button>
+          <el-button round @click="toStep(2)">上一步</el-button>
           <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">
         <div class="upload-box">
-          <img v-if="stem.screenshot" :src="stem.screenshot" class="stem-pic" />
+          <img v-if="stem.screenshot && !stem.screenshot.includes('html')" :src="stem.screenshot" class="stem-pic" />
           <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">{{
-              stem.screenshot ? "重新上传" : "选择照片"
+              stem.screenshot && !stem.screenshot.includes('html') ? "重新上传" : "选择照片"
             }}</el-button>
           </el-upload>
         </div>
         <div slot="footer">
-          <el-button @click="dialogStem = false">关闭弹窗</el-button>
+          <el-button @click="dialogStem = false">确定</el-button>
         </div>
       </el-dialog>
     </div>
@@ -443,7 +508,7 @@
 </template>
 
 <script>
-import { deepClone, checkAnswer } from "utils";
+import { deepClone, checkAnswer, cNum } from "utils";
 const questionForm = {
   questionTitle: "",
   questionType: 2,
@@ -577,6 +642,8 @@ export default {
       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.examsDuration = params?.examsDuration || 90
+      this.form.sharingType = params?.sharingType || 0
       this.formatData(params)
     }
     await this._QuerySubjectList(this.gradeList[0]);
@@ -586,26 +653,19 @@ export default {
     }
   },
   methods: {
-
     // v1.5
     //上传截图
     openStem(obj, index, indexs) {
       this.stem.index = index;
       this.stem.indexs = indexs;
-      if (type == 1) {
-        this.stem.screenshot = obj.screenshot || "";
-      } else {
-        this.stem.screenshot = "";
-      }
+      this.stem.screenshot = obj.screenshot || "";
       this.dialogStem = true;
     },
     //图片上传成功
     upSuccess(res, file) {
       if (res && res.status == 0) {
         this.stem.screenshot = res.data.url;
-        this.form.questionList[this.stem.index].subQuestions[this.stem.indexs][
-          keys
-        ] = this.stem.screenshot;
+        this.form.questionList[this.stem.index].subQuestions[this.stem.indexs].screenshot = this.stem.screenshot;
         this.$message.success("上传成功");
       } else {
         this.$message.error(res.info);
@@ -617,6 +677,7 @@ export default {
     },
     //end
 
+    //取消创建
     linkBack() {
       this.$confirm(
         (this.type == 2 ? "修改复制的" : "组建的") +
@@ -640,6 +701,7 @@ export default {
           });
         });
     },
+    //转换题型显示方式
     setSubPro(type) {
       let tit;
       switch (type) {
@@ -658,16 +720,16 @@ export default {
       }
       return tit;
     },
+    //计算题号
     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;
         });
         lengths += subArr.length;
       }
-
       for (let i = 0; i < indexs; i++) {
         if (!!this.form.questionList[index].subQuestions[i].questionType) {
           subIndex += 1;
@@ -675,6 +737,7 @@ export default {
       }
       return lengths + subIndex + 1;
     },
+    //统计小题数量
     setNums(ques) {
       let lengths = 0;
       let subArr = ques?.filter((item) => {
@@ -683,30 +746,10 @@ export default {
       lengths = subArr.length;
       return lengths;
     },
+    //转换中文大题题号
     setBigNum(num) {
       let txt = "";
-      let bigNum = [
-        "一",
-        "二",
-        "三",
-        "四",
-        "五",
-        "六",
-        "七",
-        "八",
-        "九",
-        "十",
-        "十一",
-        "十二",
-        "十三",
-        "十四",
-        "十五",
-        "十六",
-        "十七",
-        "十八",
-        "十九",
-        "二十",
-      ];
+      let bigNum = [...cNum]
       txt = bigNum[num];
 
       return txt;
@@ -736,24 +779,18 @@ export default {
     setFormAns(indexs, index) {
       this.formAns = { ...this.form.questionList[index].subQuestions[indexs] };
       this.formAns.listIndex = index;
-      let startIndex = this.formAns.index + 1 - this.formAns.subNum; //批量设置大难开始位置
-      this.formAns.answerList = [];
       let answerList = "";
+      let startIndex = indexs - this.formAns.subNum; //批量设置大难开始位置
       this.form.questionList[index].subQuestions.map((item, subIdx) => {
-        if (subIdx >= startIndex) {
+        if (subIdx >= startIndex && subIdx < indexs) {
           answerList += this.setAnswer(item.questionType, item.correctAnswer);
-          if (subIdx != indexs) {
-            if (!!item.qusType) {
-              answerList = "";
-            }
-          } else {
-            if (item.qusType == 3) {
-              answerList = answerList.slice(0, -1);
-            }
-            this.formAns.answerList = answerList;
+
+          if (item.qusType == 3) {
+            answerList = answerList.slice(0, -1);
           }
         }
       });
+      this.formAns.answerList = answerList;
 
       this.diaSetAns = true;
     },
@@ -808,11 +845,11 @@ export default {
         (item, index) => {
           if (this.formAns.endIndex == item.questionIndex) {
             EndIndex = index;
-            return;
           }
+          return this.formAns.endIndex == item.questionIndex
         }
       );
-
+        console.log(EndIndex)
       for (let i = 0; i <= subNum; i++) {
         let correctAnswer = "";
         if (this.formAns.qusType == 2) {
@@ -897,9 +934,13 @@ export default {
       }
       return txt;
     },
-    backStep1() {
-      this.formatQuestionList();
-      this.step = this.isUpload ? 0 : 1
+    toStep(step) {
+      if (step == 2) {
+        this.setStep2()
+      } else {
+        this.formatQuestionList();
+        this.step = step;
+      }
     },
     setStep1() {
       if (this.subjectList.length == 0) {
@@ -920,7 +961,7 @@ export default {
       if (!this.form.questionList.length) {
         this.$message.warning("请添加题目！");
         return;
-      }
+      } this.formatQuestionList()
       //添加题目ID、序号
       this.form.questionList.map((item, index) => {
         item.questionType = 0;
@@ -930,6 +971,12 @@ export default {
         });
       });
       //整理问题
+      this.formateQuestion()
+      this.step = 2;
+      return;
+    },
+    formateQuestion() {
+      this.formatQuestionList()
       this.form.questionList?.map((item) => {
         let types = [{}];
         let addndex = 0;
@@ -986,9 +1033,8 @@ export default {
           }
         }
       });
-      this.step = 2;
-      return;
     },
+
     //删除批量操作数据
     formatQuestionList() {
       for (let i = 0; i < this.form.questionList.length; i++) {
@@ -1068,6 +1114,7 @@ export default {
     //删除小题
     delTabData(subIndex, index) {
       this.form.questionList[index].subQuestions.splice(subIndex, 1);
+      this.formateQuestion()
     },
     setScore(question) {
       let score = question.subQuestions?.reduce((a, b) => {
@@ -1353,7 +1400,10 @@ export default {
       if (status == 0) {
         this.form.title = data.title + "_副本";
         this.form.tagId = data.tagId === 0 ? "" : data.tagId;
-
+        this.form.examsDuration = data.examsDuration;
+        if (this.role != "ROLE_PERSONAL") {
+          this.form.sharingType = data.sharingType;
+        }
         this.formatData(data)
       } else {
         this.$message.error(info);
@@ -1370,9 +1420,8 @@ export default {
       } else {
         this.form.subjectName = "";
       }
-      this.form.examsDuration = data.examsDuration;
+
       if (this.role != "ROLE_PERSONAL") {
-        this.form.sharingType = data.sharingType;
         if (this.gradeList.length) {
           this.gradeList.map((item) => {
             if (item == data.gradeName) {
@@ -1406,7 +1455,6 @@ export default {
   },
 };
 </script>
-
 <style lang="scss" scoped>
 .red {
   color: #f30;
@@ -1557,6 +1605,16 @@ export default {
 
 .question-box {
   margin-bottom: 20px;
+
+  .screenshot-box {
+    width: 100%;
+    border: 1px solid #e2e2e2;
+    margin-bottom: 20px;
+
+    .screenshot-img {
+      margin: 0;
+    }
+  }
 }
 
 .question-title {
@@ -1701,6 +1759,10 @@ export default {
     flex: 1;
   }
 
+  .qs-upload {
+    width: 60px;
+  }
+
   .qs-set {
     width: 60px;
   }
@@ -1730,4 +1792,17 @@ export default {
     }
   }
 }
+
+.upload-box {
+  .upload-demo {
+    text-align: center;
+  }
+
+  .stem-pic {
+    display: block;
+    margin: 0 auto 20px;
+    height: 200px;
+    object-fit: cover;
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/examinationPaper/addAsk.vue b/src/views/examinationPaper/addAsk.vue
index 37c805f..224ea76 100644
--- a/src/views/examinationPaper/addAsk.vue
+++ b/src/views/examinationPaper/addAsk.vue
@@ -2,30 +2,22 @@
   <div ref="content" class="content-box">
     <back-box>
       <template slot="title">
-        <span>{{ "创建答题卡" }}</span>
+        <span>导入课件</span>
       </template>
     </back-box>
     <div class="content">
       <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-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-item label="答题卡名称：" prop="title">
+          <el-form-item label="课件名称：" prop="title">
             <el-input class="sel2" type="text" placeholder="请输入答题卡名称" v-model.trim="form.title" maxlength="30" size="45"
               show-word-limit>
             </el-input>
           </el-form-item>
-          <el-form-item label="测验类型：">
-            <el-select v-model="form.tagId" placeholder="选择测验类型">
-              <el-option label="--" value=""> </el-option>
-              <el-option v-for="item in answerTypeList" :key="item.id" :label="item.typeName" :value="item.id">{{
-                item.typeName }}</el-option>
-            </el-select>
-            <el-button class="ml-20" type="primary" round circle icon="el-icon-edit" @click="openTagDia"></el-button>
-          </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">
@@ -39,10 +31,6 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="考试时长：">
-            <el-input-number size="medium" :min="1" :max="140" :step-strictly="true" :step="1"
-              v-model="form.examsDuration" label="考试时长"></el-input-number>
-          </el-form-item>
           <el-form-item v-if="role != 'ROLE_PERSONAL'" label="分享范围：" prop="sharingType">
             <el-radio-group v-model="form.sharingType">
               <el-radio :label="0">任课班级分享</el-radio>
@@ -54,278 +42,12 @@
           <el-button type="danger" plain round @click="linkBack">取消</el-button>
           <el-button type="primary" round @click="setStep1">下一步</el-button>
         </div>
-        <el-dialog :close-on-click-modal="false" title="设置测验类型" :visible.sync="dialogVisible" width="500px">
-          <div class="dia-content">
-            <p class="add-type" v-for="item in tagList" :key="item.id">
-              <el-row :gutter="10">
-                <el-col :span="18"><el-input v-model="item.typeName" :maxlength="10"
-                    placeholder="请输入答题卡类型名称"></el-input></el-col>
-                <el-col :span="6">
-                  <el-tooltip effect="dark" content="保存" placement="top">
-                    <el-button class="js-set" type="primary" size="small" round circle icon="el-icon-check"
-                      @click="editTypeName(item)"></el-button>
-                  </el-tooltip>
-                  <el-tooltip effect="dark" content="删除" placement="right">
-                    <el-popconfirm title="确定删除这道大题吗？" @confirm="removeTypeName(item)">
-                      <el-button class="js-set" type="danger" size="small" round circle icon="el-icon-delete"
-                        slot="reference"></el-button>
-                    </el-popconfirm>
-                  </el-tooltip>
-                </el-col>
-              </el-row>
-            </p>
-            <p class="add-type">
-              <el-row :gutter="10">
-                <el-col :span="18">
-                  <el-input type="text" placeholder="请输入答题卡类型名称" v-model.trim="answerTypeName" :maxlength="10">
-                  </el-input>
-                </el-col>
-                <el-col :span="6">
-                  <el-tooltip effect="dark" content="添加" placement="right">
-                    <el-button class="js-set" type="primary" size="small" round circle icon="el-icon-plus"
-                      @click="addPaperType"></el-button>
-                  </el-tooltip>
-                </el-col>
-              </el-row>
-            </p>
-          </div>
-          <div class="" slot="footer">
-            <el-button @click="dialogVisible = false">关 闭</el-button>
-          </div>
-        </el-dialog>
       </div>
       <div v-show="step == 1">
-        <div class="question-box" v-for="(question, index) in form.questionList" :key="index">
-          <p class="question-title">
-            <el-tooltip effect="dark" :content="question.show ? '收起' : '展开'" placement="left">
-              <i class="el-icon-caret-right" :class="question.show ? 'active' : ''"
-                @click="question.show = !question.show"></i>
-            </el-tooltip>
-            <span>{{ setBigNum(index) }}、</span>
-            <el-input class="ipt" v-model.trim="question.questionTitle" maxlength="30" placeholder="填写大题名称"></el-input>
-            <el-popconfirm title="确定删除这道大题吗？" @confirm="form.questionList.splice(index, 1)">
-              <el-button slot="reference" class="delete" type="danger" size="mini" circle
-                icon="el-icon-delete"></el-button>
-            </el-popconfirm>
-            <span class="m20">共：{{ question.subQuestions.length }}题</span>
-            <span>共：{{ setScore(question) }}分</span>
-          </p>
-          <transition name="el-zoom-in-top">
-            <ul v-show="question.show" class="questions-ul">
-              <li class="sub-questions">
-                <div class="qs-num">题号</div>
-                <div class="qs-type">题型</div>
-                <div class="qs-score">分数</div>
-                <div class="qs-partScore">漏选得分</div>
-                <div class="qs-options">选项设置</div>
-                <div class="qs-set">操作</div>
-              </li>
-              <li class="sub-questions" v-for="(subQuestions, indexs) in question.subQuestions" :key="indexs">
-                <div class="qs-num">{{ setNum(index, indexs) }}</div>
-                <div class="qs-type">
-                  <el-select v-model="subQuestions.questionType" placeholder="选择题目类型"
-                    @change="changeSubQuestions($event, subQuestions)">
-                    <el-option label="单选题" :value="2"></el-option>
-                    <el-option label="多选题" :value="3"></el-option>
-                    <el-option label="判断题" :value="4"></el-option>
-                    <el-option label="主观题" :value="5"></el-option>
-                  </el-select>
-                </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>
-                </div>
-                <div class="qs-partScore">
-                  <p v-if="subQuestions.questionType != 3">--</p>
-                  <el-input-number class="number-ipt" v-else size="medium" :min="0" :precision="2"
-                    :max="subQuestions.score" :step="0.5" v-model="subQuestions.partScore" label="漏选得分"></el-input-number>
-                </div>
-                <div class="qs-options">
-                  <p v-if="subQuestions.questionType == 5">--</p>
-                  <p v-if="subQuestions.questionType == 4" class="answer-box">
-                    <span class="answer-s" :class="subQuestions.correctAnswer == 1 ? 'active' : ''"
-                      @click="subQuestions.correctAnswer = 1">✓</span>
-                    <span class="answer-s" :class="subQuestions.correctAnswer == 2 ? 'active' : ''"
-                      @click="subQuestions.correctAnswer = 2">✗</span>
-                  </p>
-                  <p v-if="subQuestions.questionType == 3" class="answer-box">
-                    <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>
-                  </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>
-                </div>
-                <div class="qs-set">
-                  <el-tooltip effect="dark" content="上传提干" placement="top">
-                    <el-button type="primary" circle size="mini" icon="el-icon-tickets"
-                      @click="openStem(subQuestions, 1, index, indexs)"></el-button>
-                  </el-tooltip>
-                  <el-tooltip effect="dark" content="题目打标" placement="top">
-                    <el-button type="primary" circle size="mini" icon="el-icon-price-tag"
-                      @click="openTag(subQuestions, 3, index, indexs)"></el-button>
-                  </el-tooltip>
-                  <el-tooltip effect="dark" content="上传题目解析" placement="top">
-                    <el-button type="primary" circle size="mini" icon="el-icon-upload"
-                      @click="openStem(subQuestions, 2, index, indexs)"></el-button>
-                  </el-tooltip>
-                  <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>
-              </li>
-              <li class="sub-questions">
-                <div class="qs-num">添加</div>
-                <div class="qs-type">
-                  <el-select v-model="addSubQuestionsType" placeholder="选择题目类型"
-                    @change="changeAddSubQuestions($event, question)">
-                    <el-option label="单选题" :value="2"></el-option>
-                    <el-option label="多选题" :value="3"></el-option>
-                    <el-option label="判断题" :value="4"></el-option>
-                    <el-option label="主观题" :value="5"></el-option>
-                  </el-select>
-                </div>
-                <div class="qs-score"></div>
-                <div class="qs-partScore"></div>
-                <div class="qs-options"></div>
-                <div class="qs-set"></div>
-              </li>
-            </ul>
-          </transition>
-        </div>
-        <div class="add-box">
-          <p class="add-question" @click="openQuestion">
-            <el-button size="mini" type="primary" icon="el-icon-plus" circle></el-button>
-            <span class="s1">添加大题</span>
-          </p>
-        </div>
-        <div class="btn-box">
-          <el-button type="danger" plain round @click="linkBack">取消</el-button>
-          <el-button round @click="step = 0">上一步</el-button>
-          <el-button :type="form.questionList.length == 0 ? 'info' : 'primary'" round @click="setStep2">下一步</el-button>
-        </div>
-        <el-dialog :close-on-click-modal="false" title="添加大题" :visible.sync="addQuestionVisible" width="600px">
-          <div class="dia-content">
-            <el-form ref="form" :model="questionForm" :rules="questionFormRules" label-width="100px">
-              <el-form-item label="标题：">
-                <el-col :span="20">
-                  <el-input v-model.trim="questionForm.questionTitle" maxlength="30" placeholder="输入大题名称"></el-input>
-                </el-col>
-              </el-form-item>
-              <el-form-item label="选择题型：">
-                <el-select v-model="questionForm.questionType" placeholder="" @change="setQuestionForm">
-                  <el-option v-for="item in questionOptions" :key="item.value" :label="item.label" :value="item.value">
-                  </el-option>
-                  <el-option label="混合题" :value="6"> </el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="题数：">
-                <el-input-number v-model="questionForm.number" @change="changeQesNum" :min="1" :max="100"
-                  :step-strictly="true" :step="1" label="label"></el-input-number>
-              </el-form-item>
-              <el-form-item label="选项个数：" v-show="questionForm.questionType != 4 &&
-                questionForm.questionType != 5
-                ">
-                <el-input-number v-model="questionForm.selectNum" :min="3" :max="10" :step-strictly="true" :step="1"
-                  label="label"></el-input-number>
-              </el-form-item>
-              <el-form-item label="单题分数：">
-                <el-input-number v-model="questionForm.score" :min="1" :max="200" :precision="2" :step="1"
-                  label="label"></el-input-number>
-              </el-form-item>
-              <el-form-item label="漏选得分：" v-if="questionForm.questionType == 3">
-                <el-input-number v-model="questionForm.partScore" :min="0" :max="questionForm.score" :precision="2"
-                  :step="0.5" label="label"></el-input-number>
-              </el-form-item>
-              <el-form-item label="设置答案：" v-show="questionForm.questionType != 5 &&
-                questionForm.questionType != 6
-                ">
-                <div class="qs-options">
-                  <p class="ipt">
-                    <el-input v-if="questionForm.questionType == 2 ||
-                      questionForm.questionType == 3 ||
-                      questionForm.questionType == 6
-                      " ref="formAnsIpt2" v-model="questionForm.answerList" @keydown.native="
-    keydownAnswer($event, questionForm.questionType, 1)
-    " @input="
-    setAllAnswer($event, questionForm.questionType, 1)
-    "></el-input>
-                    <el-input v-if="questionForm.questionType == 4" v-model="questionForm.answerList"
-                      readonly=""></el-input>
-                  </p>
-                  <p class="answer-box">
-                    <template v-if="questionForm.questionType == 4">
-                      <span class="answer-s active" @click="
-                        questionForm.answerList.length < questionForm.number
-                          ? (questionForm.answerList += '✓')
-                          : ''
-                        ">✓</span>
-                      <span class="answer-s active" @click="
-                        questionForm.answerList.length < questionForm.number
-                          ? (questionForm.answerList += '✗')
-                          : ''
-                        ">✗</span>
-                    </template>
-                    <template v-if="questionForm.questionType == 3">
-                      <template v-for="(option, opIdx) in rightOptions">
-                        <span v-if="opIdx < questionForm.selectNum" class="answer-s active" :key="option"
-                          @click="setMultiple(questionForm, option, 1)">{{ option }}</span>
-                      </template>
-                      <span class="answer-s active" @click="setMultiple(questionForm, ',', 1)">,</span>
-                    </template>
-                    <template v-if="questionForm.questionType == 2 ||
-                      questionForm.questionType == 6
-                      ">
-                      <template v-for="(option, opIdx) in rightOptions">
-                        <span v-if="opIdx < questionForm.selectNum" class="answer-s active" :key="option" @click="
-                          questionForm.answerList.length < questionForm.number
-                            ? (questionForm.answerList += option)
-                            : ''
-                          ">{{ option }}</span>
-                      </template>
-                    </template>
-                    <span class="answer-s delButton" @click="
-                      questionForm.answerList = questionForm.answerList.slice(
-                        0,
-                        -1
-                      )
-                      ">x</span>
-                    <span class="answer-s ac" @click="questionForm.answerList = ''">ac</span>
-                  </p>
-                </div>
-              </el-form-item>
-            </el-form>
-          </div>
-          <div class="dialog-footer" slot="footer">
-            <el-button type="primary" @click="addQuestion">确 定</el-button>
-            <el-button @click="addQuestionVisible = false">取 消</el-button>
-          </div>
-        </el-dialog>
-      </div>
-      <div v-show="step == 2">
         <div class="answer-title">
           <p class="name">{{ form.title }}</p>
-          <p class="totals">卷面总分：{{ allScore }}分</p>
         </div>
-        <div class="question-box" v-for="(question, index) in form.questionList" :key="index">
-          <p class="question-title">
-            <span>{{ setBigNum(index) }}、</span>
-            <span class="title-txt">{{ question.questionTitle }}</span>
-            <span class="m20">共：{{ setNums(question.subQuestions) }}题</span>
-            <span>共：{{ setScore(question) }} 分</span>
-          </p>
+        <div class="question-box">
           <ul class="questions-ul">
             <li class="sub-questions">
               <div class="qs-num">题号</div>
@@ -333,20 +55,28 @@
               <div class="qs-score">分数</div>
               <div class="qs-partScore">漏选得分</div>
               <div class="qs-options qs-options2">选项设置</div>
+              <div class="qs-upload">提干</div>
+              <div class="qs-set"></div>
             </li>
-            <li v-for="(subQuestions, indexs) in question.subQuestions" :key="indexs">
+            <li v-for="(subQuestions, index) in form.questionList" :key="index">
               <p class="set-ans-btn" v-if="subQuestions.qusType &&
                 subQuestions.subNum &&
                 subQuestions.subNum > 4
                 ">
-                <el-button type="primary" @click="setFormAns(indexs, index)">批量设置答案</el-button>
+                <el-button type="primary" @click="setFormAns(index)">批量设置答案</el-button>
               </p>
               <div v-else class="sub-questions">
                 <div class="qs-num">
-                  {{ setNum(index, indexs, subQuestions) }}
+                  {{ index + 1 }}
                 </div>
                 <div class="qs-type">
-                  {{ setSubPro(subQuestions.questionType) }}
+                  <el-select v-model="subQuestions.questionType" placeholder="选择题目类型"
+                    @change="changeSubQuestions($event, subQuestions)">
+                    <el-option label="单选题" :value="2"></el-option>
+                    <el-option label="多选题" :value="3"></el-option>
+                    <el-option label="判断题" :value="4"></el-option>
+                    <el-option label="主观题" :value="5"></el-option>
+                  </el-select>
                 </div>
                 <div class="qs-score">
                   <el-input-number class="number-ipt" size="medium" :min="1" :max="200" :precision="2"
@@ -376,6 +106,28 @@
                       " :key="option" @click="subQuestions.correctAnswer = option">{{ option }}</span>
                   </p>
                 </div>
+                <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)">重新选择图片</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-set">
+                  <el-popconfirm title="确定删除这道题吗？" @confirm="delTabData(index)">
+                    <el-button slot="reference" class="delete" type="danger" size="mini" circle
+                      icon="el-icon-delete"></el-button>
+                  </el-popconfirm>
+                </div>
               </div>
             </li>
           </ul>
@@ -429,40 +181,49 @@
         </el-dialog>
         <div class="btn-box">
           <el-button type="danger" plain round @click="linkBack">取消</el-button>
-          <el-button round @click="backStep1">上一步</el-button>
-          <el-button type="primary" round @click="save">保存</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="上传题干" :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" />
+            <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">{{
+                stem.screenshot && !stem.screenshot.includes('html') ? "重新上传" : "选择照片"
+              }}</el-button>
+            </el-upload>
+          </div>
+          <div slot="footer">
+            <el-button @click="dialogStem = false">确定</el-button>
+          </div>
+        </el-dialog>
       </div>
-      <el-dialog :close-on-click-modal="false" title="上传题干" :visible.sync="dialogStem" v-if="dialogStem" width="500">
-        <div class="upload-box">
-          <img v-if="stem.screenshot" :src="stem.screenshotSrc" class="stem-pic" />
-          <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">{{
-              stem.screenshot ? "重新上传" : "选择照片"
-            }}</el-button>
-          </el-upload>
+      <div v-show="step == 2">
+        <div class="answer-title">
+          <p class="name">{{ form.title }}</p>
         </div>
-        <div slot="footer">
-          <el-button @click="dialogStem = false">关闭弹窗</el-button>
+        <div class="question-box">
+          <div class="screenshot-box" v-for="(subQuestions, index) in form.questionList" :key="index">
+            <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="">
+          </div>
         </div>
-      </el-dialog>
-
+        <div class="btn-box">
+          <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>
+      </div>
     </div>
   </div>
 </template>
 
 <script>
 import { deepClone, checkAnswer } from "utils";
-const questionForm = {
-  questionTitle: "",
-  questionType: 2,
-  number: 10,
-  selectNum: 4,
-  score: 1,
-  partScore: 0,
-  answerList: "",
-};
 const subQuesOptions = {
   questionType: 2,
   score: 1,
@@ -472,17 +233,6 @@ const subQuesOptions = {
   correctAnswer: "",
 };
 export default {
-  computed: {
-    allScore: function () {
-      let score = 0;
-      this.form.questionList.map((item) => {
-        score += item.subQuestions.reduce((a, b) => {
-          return a + Number(b.score ? b.score : 0);
-        }, 0);
-      }, 0);
-      return Number(score).toFixed(2);
-    },
-  },
   watch: {
     step: function () {
       this.$nextTick(function () {
@@ -496,17 +246,13 @@ export default {
       step: 0, //步骤
       gradeList: [], //年级
       subjectList: [], //科目
-      answerTypeList: [], //测验类型
-      answerTypeName: "", //测验类型名称
       form: {
         //答题卡详情
         title: "",
-        tagId: "",
-        subjectName: "",
-        examsDuration: 90,
-        questionList: [],
         gradeName: "",
+        subjectName: "",
         sharingType: 0,
+        questionList: [],
       },
       formRules: {
         //答题卡验证
@@ -519,19 +265,17 @@ export default {
             trigger: "blur",
           },
         ],
+        gradeName: [
+          { required: true, message: "请选择年级", trigger: "blur" },
+        ],
         subjectName: [
           { required: true, message: "请选择科目", trigger: "blur" },
         ],
-        examsDuration: [
-          { required: true, message: "请设置考试时长", trigger: "blur" },
-        ],
       },
       tagList: [],
       diaSetAns: false, //答案开关
       dialogStem: false, //截图开关
       formAns: {
-        listIndex: 0, //大题位置
-        endIndex: 0, //相同题目最后一位题目的questionIndex
         index: 0, //相同题目最后一位题目的位置
         qusType: "", //题目类型
         subNum: 0, //数量
@@ -540,25 +284,9 @@ export default {
       },
       stem: {
         index: 0, //大题位置
-        indexs: 0, //小题位置
-        screenshot: "", //题干图片id
-        screenshotSrc: "", //题干图片地址显示用保存时删除
+        screenshot: "", //题干图片地址
       },
       type: 1, //1-创建，2-复制答题卡
-      dialogVisible: false, //测验类型设置弹窗
-      addQuestionVisible: false, //添加大题弹窗
-      questionForm: { ...questionForm },
-      questionFormRules: {
-        questionTitle: [
-          { required: true, message: "请输入大题名称", trigger: "blur" },
-          {
-            min: 1,
-            max: 30,
-            message: "长度在 1 到 30 个字符",
-            trigger: "blur",
-          },
-        ],
-      },
       questionOptions: [
         { label: "单选题", value: 2 },
         { label: "多选题", value: 3 },
@@ -566,7 +294,6 @@ export default {
         { label: "主观题", value: 5 },
       ],
       rightOptions: ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J"],
-      addSubQuestionsType: "",
     };
   },
   async created() {
@@ -574,6 +301,12 @@ export default {
     this.role =
       this.$store.getters.info.showRole ||
       this.$store.getters.info.permissions[0].role;
+    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)
     if (this.role != "ROLE_PERSONAL") {
       this.formRules.gradeName = [
         { required: true, message: "请选择年级", trigger: "blur" },
@@ -581,36 +314,23 @@ export default {
       await this._GradeList();
     }
     await this._QuerySubjectList(this.gradeList[0]);
-    await this._TypeList();
     if (this.type == 2) {
       this._QueryDetail();
     }
   },
   methods: {
+    // v1.5
     //上传截图
-    openStem(obj, index, indexs) {
+    openStem(obj, index) {
       this.stem.index = index;
-      this.stem.indexs = indexs;
-      if (type == 1) {
-        this.stem.screenshot = obj.screenshot || "";
-        this.stem.screenshotSrc = obj.screenshotSrc || "";
-      } else {
-        this.stem.screenshot = "";
-        this.stem.screenshotSrc = "";
-      }
+      this.stem.screenshot = obj.screenshot || "";
       this.dialogStem = true;
     },
     //图片上传成功
     upSuccess(res, file) {
       if (res && res.status == 0) {
-        this.stem.screenshotSrc = res.data.url;
-        this.stem.screenshot = res.data.resId;
-        this.form.questionList[this.stem.index].subQuestions[this.stem.indexs][
-          keys
-        ] = this.stem.screenshot;
-        this.form.questionList[this.stem.index].subQuestions[this.stem.indexs][
-          keys + "Src"
-        ] = this.stem.screenshotSrc;
+        this.stem.screenshot = res.data.url;
+        this.form.questionList[this.stem.index].screenshot = this.stem.screenshot;
         this.$message.success("上传成功");
       } else {
         this.$message.error(res.info);
@@ -620,10 +340,11 @@ export default {
     upError(res) {
       this.$message.error("上传失败");
     },
+    //end
     linkBack() {
       this.$confirm(
-        (this.type == 2 ? "修改复制的" : "组建的") +
-        "答题卡未保存，确认退出吗？",
+        (this.type == 2 ? "修改复制的" : "导入的") +
+        "课件未保存，确认退出吗？",
         "提示",
         {
           confirmButtonText: "取消",
@@ -661,103 +382,70 @@ export default {
       }
       return tit;
     },
-    setNum(index, indexs, sub) {
-      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;
-        });
-        lengths += subArr.length;
-      }
-
-      for (let i = 0; i < indexs; i++) {
-        if (!!this.form.questionList[index].subQuestions[i].questionType) {
-          subIndex += 1;
+    //整理问题
+    formateQuestion() {
+      let types = [{}];
+      let addndex = 0;
+      this.formatQuestionList()
+      this.form.questionList.map((sub, index) => {
+        sub.questionIndex = index
+        if (!!sub.questionType) {
+          if (
+            sub.questionType == types[addndex].qusType &&
+            sub.questionType != 5
+          ) {
+            //同类型批量答案+1
+            types[addndex].subNum += 1;
+            if (
+              types[addndex].answerOptions.length < sub.answerOptions.length
+            ) {
+              types[addndex].answerOptions = sub.answerOptions;
+            }
+            types[addndex].answerList = "";
+            //循环最后类型数量大于等于5，保存批量答案
+            if (types[addndex].subNum >= 5) {
+              types[addndex].index = index;
+            }
+          } else {
+            if (types[addndex].subNum >= 5) {
+              //不同类型时如果原有类型数量大于等于5，保存批量答案
+              types[addndex].index = index - 1;
+              addndex += 1;
+              types[addndex] = {};
+            }
+            //不同类型初始化批量答案
+            types[addndex].qusType = sub.questionType;
+            types[addndex].subNum = 1;
+            types[addndex].answerOptions = sub.answerOptions;
+            types[addndex].answerList = "";
+          }
         }
-      }
-      return lengths + subIndex + 1;
-    },
-    setNums(ques) {
-      let lengths = 0;
-      let subArr = ques.filter((item) => {
-        return !!item.questionType;
       });
-      lengths = subArr.length;
-      return lengths;
-    },
-    setBigNum(num) {
-      let txt = "";
-      let bigNum = [
-        "一",
-        "二",
-        "三",
-        "四",
-        "五",
-        "六",
-        "七",
-        "八",
-        "九",
-        "十",
-        "十一",
-        "十二",
-        "十三",
-        "十四",
-        "十五",
-        "十六",
-        "十七",
-        "十八",
-        "十九",
-        "二十",
-      ];
-      txt = bigNum[num];
-
-      return txt;
-    },
-    //切换题型清空答案
-    setQuestionForm(val) {
-      this.questionForm.answerList = "";
-    },
-    //减少题数设置答案
-    changeQesNum(val) {
-      if (
-        this.questionForm.questionType == 2 ||
-        this.questionForm.questionType == 4
-      ) {
-        this.questionForm.answerList = this.questionForm.answerList.substring(
-          0,
-          val
-        );
-      } else {
-        this.questionForm.answerList = this.questionForm.answerList
-          .split(",")
-          .splice(0, val)
-          .join(",");
+      for (let i = 0; i < types.length; i++) {
+        if (types[i].subNum >= 5) {
+          this.form.questionList.splice(
+            types[i].index + i + 1,
+            0,
+            deepClone(types[i])
+          );
+        }
       }
     },
     //初始化要修改的答案
-    setFormAns(indexs, index) {
-      this.formAns = { ...this.form.questionList[index].subQuestions[indexs] };
-      this.formAns.listIndex = index;
-      let startIndex = this.formAns.index + 1 - this.formAns.subNum; //批量设置大难开始位置
+    setFormAns(index) {
+      this.formAns = { ...this.form.questionList[index] };
+      let startIndex = index - this.formAns.subNum; //批量设置开始位置
       this.formAns.answerList = [];
       let answerList = "";
-      this.form.questionList[index].subQuestions.map((item, subIdx) => {
-        if (subIdx >= startIndex) {
+      this.form.questionList.map((item, subIdx) => {
+        if (subIdx >= startIndex && subIdx < index) {
           answerList += this.setAnswer(item.questionType, item.correctAnswer);
-          if (subIdx != indexs) {
-            if (!!item.qusType) {
-              answerList = "";
-            }
-          } else {
-            if (item.qusType == 3) {
-              answerList = answerList.slice(0, -1);
-            }
-            this.formAns.answerList = answerList;
+          if (item.qusType == 3) {
+            answerList = answerList.slice(0, -1);
           }
+          this.formAns.answerList = answerList;
         }
       });
-
       this.diaSetAns = true;
     },
     insertTxtAndSetcursor(element, answerList, str) {
@@ -807,12 +495,12 @@ export default {
     saveFormAns() {
       let EndIndex;
       let subNum = this.formAns.subNum - 1;
-      this.form.questionList[this.formAns.listIndex].subQuestions.some(
+      this.form.questionList.some(
         (item, index) => {
-          if (this.formAns.endIndex == item.questionIndex) {
+          if (this.formAns.index == item.questionIndex) {
             EndIndex = index;
-            return;
           }
+          return this.formAns.index == item.questionIndex
         }
       );
 
@@ -830,22 +518,19 @@ export default {
                 ? 2
                 : "";
         }
-        this.form.questionList[this.formAns.listIndex].subQuestions[
+        this.form.questionList[
           EndIndex - i
         ].correctAnswer = correctAnswer;
       }
       this.diaSetAns = false;
     },
-    keydownAnswer(event, type, isAddBig) {
+    keydownAnswer(event, type) {
       let answerA = "ABCDEFGHIJ";
       let answer_a = "abcdefghij";
-      if (isAddBig) {
-        answerA = answerA.substring(0, this.questionForm.selectNum);
-        answer_a = answer_a.substring(0, this.questionForm.selectNum);
-      } else {
-        answerA = answerA.substring(0, this.formAns.subNum);
-        answer_a = answer_a.substring(0, this.formAns.subNum);
-      }
+
+      answerA = answerA.substring(0, this.formAns.subNum);
+      answer_a = answer_a.substring(0, this.formAns.subNum);
+
       answerA += answer_a;
       answerA = type == 2 ? answerA : answerA + ",";
       if (
@@ -868,26 +553,17 @@ export default {
         event.returnValue = "";
       }
     },
-    setAllAnswer(event, type, isAddBig) {
-      if (isAddBig) {
-        let str = this.questionForm.answerList;
-        let str2 = checkAnswer(
-          str,
-          type,
-          this.questionForm.selectNum,
-          this.questionForm.number
-        );
-        this.questionForm.answerList = str2;
-      } else {
-        let str = this.formAns.answerList;
-        let str2 = checkAnswer(
-          str,
-          type,
-          this.formAns.answerOptions.split(",").length,
-          this.formAns.subNum
-        );
-        this.formAns.answerList = str2;
-      }
+    setAllAnswer(event, type) {
+
+      let str = this.formAns.answerList;
+      let str2 = checkAnswer(
+        str,
+        type,
+        this.formAns.answerOptions.split(",").length,
+        this.formAns.subNum
+      );
+      this.formAns.answerList = str2;
+
     },
     setAnswer(type, ans) {
       let txt = "";
@@ -900,9 +576,12 @@ export default {
       }
       return txt;
     },
-    backStep1() {
+    toStep(step) {
       this.formatQuestionList();
-      this.step = 1;
+      this.step = step;
+      if(step==1){
+        this.formateQuestion()
+      }
     },
     setStep1() {
       if (this.subjectList.length == 0) {
@@ -912,6 +591,7 @@ export default {
       this.$refs["forms"].validate((valid) => {
         // 验证通过：保存
         if (valid) {
+          this.formateQuestion()
           this.step = 1;
         } else {
           this.$message.error("数据有误，请检查！");
@@ -919,194 +599,19 @@ export default {
         }
       });
     },
-    setStep2() {
-      if (!this.form.questionList.length) {
-        this.$message.warning("请添加题目！");
-        return;
-      }
-      //添加题目ID、序号
-      this.form.questionList.map((item, index) => {
-        item.questionType = 0;
-        item.subQuestions.map((items, indexs) => {
-          items.questionId = this.setNum(index, indexs);
-          items.questionIndex = this.setNum(index, indexs);
-        });
-      });
-      //整理问题
-      this.form.questionList?.map((item) => {
-        let types = [{}];
-        let addndex = 0;
-        item.subQuestions.map((sub, index) => {
-          if (!!sub.questionType) {
-            if (
-              sub.questionType == types[addndex].qusType &&
-              sub.questionType != 5
-            ) {
-              //同类型批量答案+1
-              types[addndex].subNum += 1;
-              if (
-                types[addndex].answerOptions.length < sub.answerOptions.length
-              ) {
-                types[addndex].answerOptions = sub.answerOptions;
-              }
-
-              // types[addndex].answerList += this.setAnswer(
-              //   sub.questionType,
-              //   sub.correctAnswer
-              // );
-              types[addndex].answerList = "";
-              if (index == item.subQuestions.length - 1) {
-                //循环最后类型数量大于等于5，保存批量答案
-                if (types[addndex].subNum && types[addndex].subNum >= 5) {
-                  types[addndex].endIndex = sub.questionIndex;
-                  types[addndex].index = index;
-                }
-              }
-            } else {
-              if (types[addndex].subNum && types[addndex].subNum >= 5) {
-                //不同类型时如果原有类型数量大于等于5，保存批量答案
-                types[addndex].endIndex =
-                  item.subQuestions[index - 1].questionIndex;
-                types[addndex].index = index - 1;
-                addndex += 1;
-                types[addndex] = {};
-              }
-              //不同类型初始化批量答案
-              types[addndex].qusType = sub.questionType;
-              types[addndex].subNum = 1;
-              types[addndex].answerOptions = sub.answerOptions;
-              types[addndex].answerList = "";
-            }
-          }
-        });
-        for (let i = 0; i < types.length; i++) {
-          if (types[i].subNum >= 5) {
-            item.subQuestions.splice(
-              types[i].index + i + 1,
-              0,
-              deepClone(types[i])
-            );
-          }
-        }
-      });
-      this.step = 2;
-      return;
-    },
+
     //删除批量操作数据
     formatQuestionList() {
       for (let i = 0; i < this.form.questionList.length; i++) {
-        for (
-          let j = 0;
-          j < this.form.questionList[i].subQuestions.length;
-          j++
-        ) {
-          if (this.form.questionList[i].subQuestions[j].qusType) {
-            this.form.questionList[i].subQuestions.splice(j, 1);
-          }
-        }
-      }
-    },
-    openQuestion() {
-      this.questionForm = { ...questionForm };
-      this.addQuestionVisible = true;
-    },
-    //添加大题
-    addQuestion() {
-      let subQuestions = [];
-      let questionsOptions = {
-        ...subQuesOptions,
-        selectNum: this.questionForm.selectNum,
-        score: this.questionForm.score,
-        partScore: this.questionForm.partScore,
-        questionType:
-          this.questionForm.questionType == 6
-            ? 2
-            : this.questionForm.questionType,
-      };
-      switch (questionsOptions.questionType) {
-        case 2:
-          questionsOptions.answerOptions = this.rightOptions
-            .slice(0, questionsOptions.selectNum)
-            .join(",");
-          break;
-        case 3:
-          questionsOptions.answerOptions = this.rightOptions
-            .slice(0, questionsOptions.selectNum)
-            .join(",");
-          break;
-        case 4:
-          questionsOptions.selectNum = 0;
-          questionsOptions.answerOptions = "1,2";
-          break;
-        case 5:
-          questionsOptions.selectNum = 0;
-          break;
-      }
-      for (let i = 0; i < this.questionForm.number; i++) {
-        let answer = "";
-        if (questionsOptions.questionType == 4) {
-          answer =
-            this.questionForm.answerList[i] == "✓"
-              ? 1
-              : this.questionForm.answerList[i] == "✗"
-                ? 2
-                : "";
-        } else if (questionsOptions.questionType == 3) {
-          answer = this.questionForm.answerList.split(",")[i] || "";
-        } else if (questionsOptions.questionType == 2) {
-          answer = this.questionForm.answerList[i] || "";
+        if (this.form.questionList[i].qusType) {
+          this.form.questionList.splice(i, 1);
         }
-        questionsOptions.correctAnswer = answer;
-        subQuestions.push({ ...questionsOptions });
       }
-      this.form.questionList.push({
-        questionTitle: this.questionForm.questionTitle,
-        number: this.questionForm.number,
-        source: 10,
-        subQuestions: [...subQuestions],
-        show: false,
-      });
-      this.addQuestionVisible = false;
     },
-    //删除小题
-    delTabData(subIndex, index) {
-      this.form.questionList[index].subQuestions.splice(subIndex, 1);
-    },
-    setScore(question) {
-      let score = question.subQuestions.reduce((a, b) => {
-        return a + (b.score ? b.score : 0);
-      }, 0);
-      return Number(score).toFixed(2);
-    },
-    changeAddSubQuestions(val, question) {
-      if (val) {
-        let questionsOptions = {
-          ...subQuesOptions,
-          questionType: val,
-        };
-        switch (questionsOptions.questionType) {
-          case 2:
-            questionsOptions.answerOptions = this.rightOptions
-              .slice(0, questionsOptions.selectNum)
-              .join(",");
-            break;
-          case 3:
-            questionsOptions.answerOptions = this.rightOptions
-              .slice(0, questionsOptions.selectNum)
-              .join(",");
-            questionsOptions.partScore = 0;
-            break;
-          case 4:
-            questionsOptions.selectNum = 0;
-            questionsOptions.answerOptions = "1,2";
-            break;
-          case 5:
-            questionsOptions.selectNum = 0;
-            break;
-        }
-        question.subQuestions.push(questionsOptions);
-        this.addSubQuestionsType = "";
-      }
+    //删除题
+    delTabData(index) {
+      this.form.questionList.splice(index, 1);
+      this.formateQuestion()
     },
     //切换多题型-小题题型
     changeSubQuestions(val, subQuestions) {
@@ -1168,107 +673,21 @@ export default {
         sub.correctAnswer = arrs.sort().join("");
       }
     },
-    openTagDia() {
-      this.tagList = deepClone(this.answerTypeList);
-      this.dialogVisible = true;
-    },
-    async editTypeName(obj) {
-      let isRepeat = false;
-      this.answerTypeList.map((item) => {
-        if (item.typeName == obj.typeName) {
-          isRepeat = true;
-        }
-      });
-      if (isRepeat) {
-        this.$message.error("类型已存在请重新填写！");
-        return;
-      }
-      //修改测验类型
-      let editPaperType =
-        this.role == "ROLE_PERSONAL"
-          ? this.$request.pModifyPaperType
-          : this.$request.editPaperType;
-      const { data, status, info } = await editPaperType({
-        tagId: obj.id,
-        tag: obj.typeName,
-      });
-      if (status == 0) {
-        await this._TypeList();
-        this.tagList = deepClone(this.answerTypeList);
-        this.$message.success("修改成功");
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async removeTypeName(obj) {
-      //删除测验类型
-      let delPaperType =
-        this.role == "ROLE_PERSONAL"
-          ? this.$request.pDelPaperType
-          : this.$request.delPaperType;
-      const { data, status, info } = await delPaperType({
-        tagId: obj.id,
-      });
-      if (status == 0) {
-        await this._TypeList();
-        this.tagList = deepClone(this.answerTypeList);
-        this.$message.success("删除成功");
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async addPaperType() {
-      //保存测验类型
-      if (!this.answerTypeName) {
-        this.$message.error("请填写测验名称！");
-        return;
-      }
-      let isRepeat = false;
-      this.answerTypeList.map((item) => {
-        if (item.typeName == this.answerTypeName) {
-          isRepeat = true;
-        }
-      });
-      if (isRepeat) {
-        this.$message.error("类型已存在请重新填写！");
-        return;
-      }
-      //添加测验类型
-      let addPaperType =
-        this.role == "ROLE_PERSONAL"
-          ? this.$request.pAddPaperType
-          : this.$request.addPaperType;
-      const { data, status, info } = await addPaperType({
-        tag: this.answerTypeName,
-      });
-      if (status == 0) {
-        await this._TypeList();
-        this.tagList = deepClone(this.answerTypeList);
-        this.form.tagId = data || "";
-        this.answerTypeName = "";
-        this.$message.success("添加成功");
-      } else {
-        this.$message.error(info);
-      }
-    },
+
+
+
+
     async save() {
       if (this.saveLoading) return;
       this.saveLoading = true;
       this.formatQuestionList();
       let formDatas = deepClone(this.form);
-      for (let i = 0; i < formDatas.questionList.length; i++) {
-        delete formDatas.questionList[i].show;
-        for (let j = 0; j < formDatas.questionList[i].subQuestions; j++) {
-          if (!!formDatas.questionList[i].subQuestions[j].screenshotSrc) {
-            delete formDatas.questionList[i].subQuestions[j].screenshotSrc;
-          }
-        }
-      }
       let addPaper =
         this.role == "ROLE_PERSONAL"
           ? this.$request.pAddPaper
           : this.$request.addPaper;
       const { data, status, info } = await addPaper({
+        type: 1,
         ...formDatas,
       });
       this.saveLoading = false;
@@ -1284,30 +703,7 @@ export default {
       //切换年级查询科目
       this._QuerySubjectList(this.form.gradeName);
     },
-    async _TypeList() {
-      //测验类型查询
-      let fetchTypeNames =
-        this.role == "ROLE_PERSONAL"
-          ? this.$request.pPaperTagList
-          : this.$request.fetchTypeNames;
-      const { data, status, info } = await fetchTypeNames({
-        type: 1,
-      });
-      if (status == 0) {
-        this.answerTypeList =
-          data.list?.map((item) => {
-            return {
-              typeName: item.tag,
-              id: item.tagId,
-            };
-          }) || [];
-        if (this.type != 2) {
-          this.form.tagId = this.answerTypeList[0]?.id || "";
-        }
-      } else {
-        this.$message.error(info);
-      }
-    },
+
     async _GradeList() {
       //查询年级列表
       const { data, status, info } = await this.$request.fetchGradeList();
@@ -1360,57 +756,72 @@ export default {
       });
       if (status == 0) {
         this.form.title = data.title + "_副本";
-        this.form.tagId = data.tagId === 0 ? "" : data.tagId;
-        if (this.subjectList.length) {
-          this.subjectList.map((item) => {
-            if (item.label == data.subjectName) {
-              this.form.subjectName = item.value;
-            }
-          });
-        } else {
-          this.form.subjectName = "";
-        }
-        this.form.examsDuration = data.examsDuration;
         if (this.role != "ROLE_PERSONAL") {
           this.form.sharingType = data.sharingType;
-          if (this.gradeList.length) {
-            this.gradeList.map((item) => {
-              if (item == data.gradeName) {
-                this.form.gradeName = data.gradeName;
-              }
-            });
-          } else {
-            this.form.gradeName = "";
-          }
         }
-        this.form.questionList = data.questionList?.map((item) => {
-          let subQuestions =
-            item.subQuestions?.map((items) => {
-              return {
-                questionType: items.questionType,
-                score: items.score,
-                partScore: items.partScore,
-                selectNum: items.answerOptions.split(",").length,
-                answerOptions: items.answerOptions || "A,B,C,D",
-                correctAnswer: items.correctAnswer,
-                screenshot: items.screenshot || "",
-                screenshotSrc: items.screenshot || "",
-              };
-            }) || [];
-          return {
-            questionTitle: item.questionTitle,
-            subQuestions: subQuestions,
-            show: false,
-          };
-        });
+        this.formatData(data)
       } else {
         this.$message.error(info);
       }
     },
+    formatData(data) {
+      if (this.subjectList.length) {
+        this.subjectList.map((item) => {
+          if (item.label == data.subjectName) {
+            this.form.subjectName = item.value;
+          }
+        });
+      } else {
+        this.form.subjectName = "";
+      }
+
+      if (this.role != "ROLE_PERSONAL") {
+        if (this.gradeList.length) {
+          this.gradeList.map((item) => {
+            if (item == data.gradeName) {
+              this.form.gradeName = data.gradeName;
+            }
+          });
+        } else {
+          this.form.gradeName = "";
+        }
+      }
+      this.form.questionList = data.questionList?.map((item) => {
+        return {
+          questionTitle: item.questionTitle,
+          questionType: item.questionType,
+          score: item.score,
+          partScore: item.partScore,
+          selectNum: item.answerOptions.split(",").length,
+          answerOptions: item.answerOptions || "A,B,C,D",
+          correctAnswer: item.correctAnswer,
+          screenshot: item.screenshot || "",
+        }
+      });
+    }
   },
 };
 </script>
+<style>
+.screenshot-box {
+  width: 400px;
+}
 
+.screenshot {
+  width: 100%;
+  box-shadow: none;
+  border: none;
+  height: 300px;
+}
+
+.screenshot-img {
+  display: block;
+  width: auto;
+  max-width: 100%;
+  margin: 0 auto;
+  margin-bottom: 10px;
+}
+</style>
 <style lang="scss" scoped>
 .red {
   color: #f30;
@@ -1561,6 +972,16 @@ export default {
 
 .question-box {
   margin-bottom: 20px;
+
+  .screenshot-box {
+    width: 100%;
+    border: 1px solid #e2e2e2;
+    margin-bottom: 20px;
+
+    .screenshot-img {
+      margin: 0;
+    }
+  }
 }
 
 .question-title {
@@ -1704,7 +1125,9 @@ export default {
   .qs-options {
     flex: 1;
   }
-
+  .qs-upload{
+    width: 60px;
+  }
   .qs-set {
     width: 60px;
   }