试卷试题相关

public/static/ueditorPlus/ueditor.config.js

@@ -101,7 +101,7 @@
       // 禁止本地上传
       disableUpload: false,
     }
-    , zIndex: 3000
+    , zIndex: 2000
     , fullscreen: false
 
     , rgb2Hex: true,

src/pages/ques/detail/index.vue

@@ -1,8 +1,7 @@
 <template>
   <div>
-    <el-dialog :title="(detailType ? detailTypes[detailType] : '新增') + '试题'" :visible.sync="quesVisible"
+    <el-dialog :title="diaTitle" :visible.sync="quesVisible" :modal-append-to-body="false" width="1000px"
-      :modal-append-to-body="false" width="1000px" :close-on-click-modal="false" custom-class="ques-dia"
+      :close-on-click-modal="false" custom-class="ques-dia" @closed="closeDia">
-      @closed="closeDia">
       <el-form :model="form" :rules="rules" ref="form" label-width="110px" :disabled="detailType === 2">
         <el-form-item label="题库分类">
           <el-input v-model="questionBankCategory" disabled />
@@ -164,11 +163,11 @@
             questionTypes.find(e => e.id === scope.row.questionType).name : '' }}</template>
         </el-table-column>
         <el-table-column prop="stem" label="题干" align="center" min-width="120" show-overflow-tooltip></el-table-column>
-        <el-table-column label="操作" align="center" width="240">
+        <!-- <el-table-column label="操作" align="center" width="240">
           <template slot-scope="scope">
             <el-button type="text">详情</el-button>
           </template>
-        </el-table-column>
+        </el-table-column> -->
       </el-table>
 
       <span slot="footer" class="dialog-footer">
@@ -201,11 +200,11 @@ export default {
   components: { Ueditor, Upload },
   data () {
     return {
-      typeId: this.$route.query.id,
+      typeId: this.$route.query.id, // 题库id
       questionBankName: this.$route.query.questionBankName,
       questionBankCategory: this.$route.query.questionBankCategory,
       numToLetter: Util.numToLetter,
-      detailTypes: ['', '复制', '查看', '编辑'],
+      detailTypes: ['', '复制', '查看', '编辑', '编辑'],
       types: [],
       cascaderValue: [],
       cascaderProps: {
@@ -276,6 +275,21 @@ export default {
       repeats: []
     };
   },
+  computed: {
+    // 弹框标题
+    diaTitle () {
+      const type = this.detailType
+      return (!type || type === 5 ?
+        '新增' :
+        type === 1 ?
+          '复制' :
+          type === 2 ?
+            '查看' :
+            type === 3 ?
+              '编辑' :
+              '') + '试题'
+    },
+  },
   watch: {
     visible () {
       this.quesVisible = this.visible
@@ -292,9 +306,14 @@ export default {
       this.form = _.cloneDeep(this.originForm)
       this.handleSingleMultiple()
 
+      const type = this.detailType
       // 外面知识点树形选中的知识点默认选中到表单里（选的是知识点才需要默认选中，知识点分类不用）
+      if (type < 4) {
         const knowledgeCheck = this.$parent.$refs.typeTree.getCurrentNode()
         if (knowledgeCheck && knowledgeCheck.type) this.form.knowledgePointIds = [knowledgeCheck.path.split('/').map(e => +e)]
+      } else if (type === 4) {
+        this.typeId = this.row.questionBankId
+      }
 
       // 富文本重置
       this.$refs.stem && this.$refs.stem.setText('')
@@ -314,6 +333,12 @@ export default {
           const res = await this.$post(`${this.api.findQuestion}?questionId=${this.row.questionId}&version=${this.row.version}`)
           const r = res.message
           const opts = r.questionAnswerVersionsList
+
+          if (this.detailType === 4) {
+            this.questionBankName = r.questionBankName
+            // this.questionBankCategory = r.questionBankCategory
+          }
+
           this.form = {
             questionId: r.questionId,
             questionType: r.questionType,
@@ -347,15 +372,17 @@ export default {
     },
     // 获取知识点
     async getKnowledge () {
+      if (this.typeId) {
         try {
           const { data } = await this.$post(this.api.TreeStructure, {
             createSource: 1,
             questionBankId: this.typeId,
-          keyword: ''
+            keyword: '',
           })
           this.handleType(data)
           this.knowledges = data
         } catch (e) { }
+      }
     },
     // 获取所属专业
     async getProfessional () {
@@ -486,7 +513,6 @@ export default {
     },
     questionItemReset (content) {
       let spanRegex = new RegExp('<span class="gapfilling-span" (.*?)>(.*?)______(.*?)<\\/span>', 'g')
-      let _this = this
       let newFormItem = []
       let gapfillingItems = content.match(spanRegex)
       if (gapfillingItems !== null) {
@@ -501,8 +527,6 @@ export default {
             this.fillBlanks.push(e)
           }
         })
-        console.log("🚀 ~ questionItemReset ~ spanRegex:", gapfillingItems, newFormItem, this.fillBlanks)
-        // _this.fillBlanks = newFormItem
       }
     },
     // 填空题新增填空项
@@ -552,9 +576,15 @@ export default {
             form.questionAnswerVersions[0].answerAnalysis = answerAnalysis // 解析保存在选项里第一个对象里
             if (this.$refs.uploadInstructions) form.uploadInstructions = this.$refs.uploadInstructions.getUEContent()
 
-            if (form.questionType === 'fill_blank') form.questionAnswerVersions[0].answerData = JSON.stringify(this.fillBlanks) // 填空题的答案数据，直接把fillBlanks转化成字符串存
+
+            // 填空题的答案数据，直接把fillBlanks转化成字符串存
+            if (form.questionType === 'fill_blank') {
+              const blanks = this.fillBlanks
+              blanks.map((e, i) => e.serial = i + 1) // 全部加个序号
+              form.questionAnswerVersions[0].answerData = JSON.stringify(blanks)
+            }
             if (form.questionType === 'essay' && this.$refs.referenceAnswer) form.questionAnswerVersions[0].referenceAnswer = this.$refs.referenceAnswer.getUEContent() // 参考答案保存在选项里第一个对象里(问答题才有)
-            debugger
+            // debugger
             this.tempForm = form
             this.keep = keep
             // 编辑试题的仅更新此题不用查询相似题，其他3种按钮都需要
@@ -566,7 +596,7 @@ export default {
             } else {
               // 仅更新此题
               try {
-                await this.$confirm(`<p style="margin-bottom: 10px;">确认仅更新此题吗？</p><p>更新后，相关试卷自动同步</p>`, '提示', {
+                await this.$confirm(`<p style="margin-bottom: 10px;">确认仅更新此题吗？</p>${this.detailType === 4 ? '' : '<p>更新后，相关试卷自动同步</p>'}`, '提示', {
                   confirmButtonText: '确定',
                   cancelButtonText: '取消',
                   type: 'warning',
@@ -592,7 +622,11 @@ export default {
     // 保存题目
     async saveQues () {
       const form = this.tempForm
-      await this.$post(this.api[this.detailType === 1 || !form.questionId ? 'addQuestion' : 'updateQuestion'], form)
+      const type = this.detailType
+      // type: 1复制(调新增接口)，2查看，3编辑，4是试卷里点编辑试题进来的（调createNewVersion创建新的版本）
+      const res = await this.$post(this.api[type === 4 ? 'createNewVersion' : type === 1 || !form.questionId ? 'addQuestion' : 'updateQuestion'], form)
+      type === 4 && this.$emit('updateQues', this.tempForm, res.questionVersionId)
+
       Util.successMsg('保存成功')
       this.submiting = false
       !form.questionId && this.keep ? this.init() : (this.quesVisible = false)
@@ -636,11 +670,64 @@ export default {
   }
 }
 
-/deep/.correct-check {
+
-  margin-right: 15px;
+
-}
 
 /deep/.ques-dia {
   z-index: 500;
+
+  .fill-blanks {
+    .fills {
+      display: inline-flex;
+      align-items: center;
+    }
+
+    .fill-item {
+      display: inline-flex;
+      align-items: center;
+      margin-right: 10px;
+
+      .el-input {
+        width: 100px;
+        margin-right: 10px;
+      }
+    }
+
+    .add-fill {
+      margin-left: 10px;
+    }
+
+    .score-wrap {
+      display: inline-flex;
+      align-items: center;
+
+      .el-input {
+        width: 80px;
+        margin: 0 10px;
+      }
+    }
+  }
+
+  .opts {
+    .line {
+      display: flex;
+      align-items: center;
+      margin-bottom: 15px;
+    }
+
+    .el-radio {
+      margin-right: 15px;
+    }
+
+    .icon {
+      margin-left: 10px;
+      font-size: 18px;
+      cursor: pointer;
+    }
+  }
+
+  /deep/.correct-check {
+    margin-right: 15px;
+  }
 }
 </style>

src/pages/ques/list/index.vue

@@ -152,16 +152,6 @@
               <i class="el-icon-edit m-l-10"></i>
             </li>
           </ul>
-          <!-- <ul class="papers">
-            <li>题干</li>
-            <li>试卷</li>
-          </ul>
-          <ul class="papers">
-            <li v-for="(item, i) in curUsePapers" :key="i">
-              <p></p>
-              <p></p>
-            </li>
-          </ul> -->
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -470,7 +460,7 @@ export default {
       this.multipleSelection = []
       this.$refs.table.clearSelection()
       this.delVisible = false
-      this.getData()
+      this.getList()
     },
     // 禁启用
     async switchOff (val, row) {
@@ -605,55 +595,7 @@ export default {
   }
 }
 
-/deep/.opts {
-  .line {
-    display: flex;
-    align-items: center;
-    margin-bottom: 15px;
-  }
-
-  .el-radio {
-    margin-right: 15px;
-  }
-
-  .icon {
-    margin-left: 10px;
-    font-size: 18px;
-    cursor: pointer;
-  }
-}
-
-/deep/.fill-blanks {
-  .fills {
-    display: inline-flex;
-    align-items: center;
-  }
-
-  .fill-item {
-    display: inline-flex;
-    align-items: center;
-    margin-right: 10px;
-
-    .el-input {
-      width: 100px;
-      margin-right: 10px;
-    }
-  }
 
-  .add-fill {
-    margin-left: 10px;
-  }
-
-  .score-wrap {
-    display: inline-flex;
-    align-items: center;
-
-    .el-input {
-      width: 80px;
-      margin: 0 10px;
-    }
-  }
-}
 
 .papers {
   margin-top: 10px;

src/pages/testPaper/detail/auto.vue

@@ -6,7 +6,7 @@
         <ul class="filter">
           <li>
             <label>试卷难度</label>
-            <el-select v-model="difficult" placeholder="请选择试卷难度" @change="difficultData">
+            <el-select v-model="difficult" placeholder="请选择试卷难度" @change="difficultChange">
               <el-option v-for="(item, i) in difficults" :key="i" :label="item.name" :value="item.id"></el-option>
             </el-select>
           </li>
@@ -179,6 +179,8 @@ export default {
       this.yearCheck = this.years
       this.handleQuesList()
       this.getQuesBank()
+      this.difficult = this.$parent.form.difficult
+      this.difficult && this.difficultChange(this.difficult)
     },
     // 获取题库
     async getQuesBank () {
@@ -284,50 +286,47 @@ export default {
     },
 
 
-    calculateQuestionNumbers (list, target) {
+    // 试卷难度选择回调
+    difficultChange (val) {
       // Decimal(e.score).add(Decimal(score))
       const difficultyWeights = [0.2, 0.4, 0.6, 0.8]
       const names = ['basicDifficulty', 'normalDifficulty', 'hardDifficulty', 'veryHardDifficulty']
       // 遍历题型数组
-      list.forEach(e => {
+      this.list.forEach(e => {
         const total = e.questionNum
 
-        if (target === 1) {
+        let already = 0 // 已经分配的数量
-          let already = 0
+        if (val === 1) {
-          this.$set(e, 'basicDifficulty', Math.floor(total * 0.6))
+          this.$set(e, 'basicDifficulty', Math.floor(total * 0.7))
           this.$set(e, 'normalDifficulty', Math.floor(total * 0.3))
-          this.$set(e, 'hardDifficulty', Math.floor(total * 0.1))
+          this.$set(e, 'hardDifficulty', 0)
           this.$set(e, 'veryHardDifficulty', 0)
-          already = Decimal(already).add(e.basicDifficulty).add(e.normalDifficulty).add(e.hardDifficulty).add(e.veryHardDifficulty).toNumber()
+        } else if (val === 2) {
+          this.$set(e, 'basicDifficulty', Math.floor(total * 0.5))
+          this.$set(e, 'normalDifficulty', Math.floor(total * 0.5))
+          this.$set(e, 'hardDifficulty', 0)
+          this.$set(e, 'veryHardDifficulty', 0)
+        } else if (val === 3) {
+          this.$set(e, 'basicDifficulty', Math.floor(total * 0.3))
+          this.$set(e, 'normalDifficulty', Math.floor(total * 0.4))
+          this.$set(e, 'hardDifficulty', Math.floor(total * 0.3))
+          this.$set(e, 'veryHardDifficulty', 0)
+        } else if (val === 4) {
+          this.$set(e, 'basicDifficulty', Math.floor(total * 0.1))
+          this.$set(e, 'normalDifficulty', Math.floor(total * 0.2))
+          this.$set(e, 'hardDifficulty', Math.floor(total * 0.3))
+          this.$set(e, 'veryHardDifficulty', Math.floor(total * 0.5))
+        }
+
 
+        already = Decimal(already).add(e.basicDifficulty).add(e.normalDifficulty).add(e.hardDifficulty).add(e.veryHardDifficulty).toNumber()
+        // 如果按比例分配还没分配完
         while (total > already) {
-            e.basicDifficulty++
+          e[names[val - 1]]++
           already++
         }
-          console.log(33, already)
+        this.$set(e, 'randomDifficulty', 0)
-        }
-
-        // 初始分配题目数量
-        // let totalWeight = Decimal(total).mul(Decimal(target)).toNumber()
-        // const maxCount = Math.ceil(total / 4)
-        // for (let i = 0; i < 4; i++) {
-        //   if (totalWeight > 0) {
-        //     const random = Math.floor(Math.random() * maxCount) + 1
-        //     const weight = difficultyWeights[i]
-        //     totalWeight = Decimal(totalWeight).sub(Decimal(weight * random)).toNumber()
-        //     this.$set(e, names[i], totalWeight > 0 ? random : 0)
-        //     // e[names[i]] = totalWeight > 0 ? random : 0
-        //   }
-        // }
-
       })
-
-      return list
-    },
-    // 试卷难度选择回调
-    difficultData (val) {
-      // debugger
-      console.log(111, this.calculateQuestionNumbers(this.list, val))
     },
     // 年份全选回调
     yearAllChange (val) {
@@ -377,7 +376,7 @@ export default {
         let invalid = 0
         let hasQues = 0
         list.map((e, i) => {
-          if (e.questionNum !== res.list[i].questions.length) invalid = 1
+          if (+e.questionNum !== res.list[i].questions.length) invalid = 1
           if (e.examQuestions.length) hasQues = 1
           e.score = 0
         })
@@ -400,6 +399,7 @@ export default {
         }
         list.map((e, i) => {
           res.list[i].questions.map((e, i) => {
+            // e.questionVersionId = e.id
             e.serialNumber = i + 1
           })
           this.$parent.form.paperOutline[i].examQuestions = res.list[i].questions

src/pages/testPaper/detail/index.vue

@@ -38,9 +38,27 @@
           </el-select>
         </el-form-item>
         <el-form-item prop="difficult" label="试卷难度">
-          <el-select v-model="form.difficult" clearable placeholder="请选择试卷难度">
+          <el-select v-model="form.difficult" clearable placeholder="系统自动评估，也可手动选择">
             <el-option v-for="(item, i) in difficults" :key="i" :label="item.name" :value="item.id"></el-option>
           </el-select>
+          <el-tooltip placement="top">
+            <div class="diff-text" slot="content">
+              <p>基础题：难度系数0.2</p>
+              <p>普通题：难度系数0.4</p>
+              <p>较难题：难度系数0.6</p>
+              <p>困难题：难度系数0.8</p>
+              <p>（1）<span class="em">题型难度系数</span>=对应题型所有试题的难度系数之和/总试题数</p>
+              <p>（2）<span class="em">试卷总难度系数</span>=所有试题的难度系数之和/总试题数</p>
+              <p>（3）<span class="em">难度系数评价</span>：</p>
+              <div class="coe">
+                <p>简单：系数 &lt;=0.3</p>
+                <p>普通：0.3&lt;系数&lt;=0.4</p>
+                <p>较难：0.4&lt;系数&lt;0.5</p>
+                <p>困难:系数&gt;=0.5</p>
+              </div>
+            </div>
+            <i class="el-icon-question m-l-10" style="font-size: 16px;color: #8f8f8f;cursor: pointer;"></i>
+          </el-tooltip>
         </el-form-item>
       </div>
       <el-form-item prop="remarks" label="试卷说明">
@@ -113,12 +131,13 @@
           <div :class="['ques-wrap', { hide: item.shrink }]">
             <div v-for="(ques, j) in item.examQuestions" :key="j" class="ques-item">
               <el-checkbox v-model="ques.check"></el-checkbox>
-              <div class="ques-info">
+              <div :class="['ques-info', { disabled: !ques.status, del: ques.isDel, repeat: ques.isRepeat }]">
                 <div class="top-line">
                   <span class="label">{{ j + 1 }} / 10</span>
                   <span class="label">{{ questionTypes.find(e => e.id === item.questionType).name }}</span>
                   <div v-html="ques.stem"></div>
-                  <p>（<el-input class="score" placeholder="请输入" v-model="ques.score" />分）</p>
+                  <p v-if="ques.questionType !== 'fill_blank'">（<el-input class="score" placeholder="请输入"
+                      v-model="ques.score" />分）</p>
                 </div>
 
                 <!-- 单选、多选、判断的选项 -->
@@ -140,7 +159,7 @@
                       <span>排序</span>
                       <el-input class="score" v-model="ques.serialNumber" />
                     </div>
-                    <el-button type="text">编辑试题</el-button>
+                    <el-button type="text" @click="toQues(item, j, ques)">编辑试题</el-button>
                     <el-button type="text" @click="showManualDia(item, j, ques)">更换试题</el-button>
                     <el-button type="text" @click="showManualDia(item, j)">添加试题</el-button>
                     <el-button type="text" @click="delQues(item, j)">移除试题</el-button>
@@ -163,6 +182,7 @@
     <Template :visible.sync="templateVisible" />
     <Manual :visible.sync="manualVisible" :questionType.sync="curType.questionType" />
     <Auto :visible.sync="autoVisible" />
+    <Detail :visible.sync="quesVisible" :row.sync="curRow" :detailType.sync="detailType" @updateQues="updateQues" />
   </div>
 </template>
 <script>
@@ -171,24 +191,18 @@ import Util from '@/libs/util'
 import dayjs from 'dayjs'
 import Ueditor from '@/components/ueditor'
 import Breadcrumb from '@/components/breadcrumb'
+import QuesConst from '@/const/ques'
+import TestPaperConst from '@/const/testPaper'
 import Template from './template'
 import Manual from './manual'
 import Auto from './auto'
-import QuesConst from '@/const/ques'
+import Detail from '@/pages/ques/detail'
-import TestPaperConst from '@/const/testPaper'
+
 export default {
-  components: { Ueditor, Breadcrumb, Template, Manual, Auto },
+  components: { Ueditor, Breadcrumb, Template, Manual, Auto, Detail },
   data () {
     return {
-      crumbs: [
+      crumbs: [],
-        {
-          name: '试卷管理',
-          route: 'list'
-        },
-        {
-          name: '创建试卷'
-        },
-      ],
       questionTypes: QuesConst.questionTypes,
       difficults: TestPaperConst.difficults,
       paperTypes: TestPaperConst.paperTypes,
@@ -196,6 +210,7 @@ export default {
       numToLetter: Util.numToLetter,
       paperId: this.$route.query.paperId,
       libraryId: this.$route.query.libraryId,
+      isCopy: this.$route.query.isCopy,
       headers: {
         token: Util.local.get(Setting.tokenKey)
       },
@@ -287,6 +302,11 @@ export default {
       curQues: null,
 
       autoVisible: false,
+
+
+      quesVisible: false,
+      curRow: {},
+      detailType: '',
     };
   },
   computed: {
@@ -300,6 +320,18 @@ export default {
     }
   },
   mounted () {
+    this.crumbs = [
+      {
+        name: '试卷管理',
+        route: 'list',
+        query: {
+          id: this.libraryId
+        }
+      },
+      {
+        name: '创建试卷'
+      },
+    ]
     this.getDetail()
     this.getType()
     this.getProfessional()
@@ -316,6 +348,7 @@ export default {
           const r = res.examPaper
           const paper = r.paperOutline
           paper.map(e => {
+            e.shrink = false
             e.examQuestions.map(n => {
               Object.assign(n, n.question)
             })
@@ -417,14 +450,39 @@ export default {
     // 处理正确答案的显示
     getCorrectAnswer (e) {
       if (e.questionType === 'fill_blank') { // 填空题
-        // return e.questionAnswerVersionsList.filter(e => e.answerIsCorrect)
+        // answerData里存了该填空题所有填空项的正确答案及分值占比，对象转化为字符串存起来了
+        let data = e.questionAnswerVersionsList[0].answerData
+        if (data) {
+          data = JSON.parse(data)
+          let result = ''
+          data.map((e, i) => {
+            result += `填空项${i + 1}：${e.fills.map(n => n.val).join('|')}；`
+          })
+          return result
+        }
+        return ''
       } else if (e.questionType === 'essay') { // 问答题取参考答案
-        return e.questionAnswerVersionsList[0].referenceAnswer
+        return e.questionAnswerVersionsList[0].referenceAnswer || '暂无'
       } else {
         const correct = e.questionAnswerVersionsList.filter(e => e.answerIsCorrect)
-        return correct ? (e.questionType === 'judgement' ? correct[0].optionText : correct.map(e => Util.numToLetter(e.optionNumber - 1)).join('')) : ''
+        return correct ? (e.questionType === 'judgement' ? correct[0].optionText : correct.map(e => Util.numToLetter(e.optionNumber - 1)).join('')) : '' // 单选多选显示ABC选项，判断题显示选项内容
       }
     },
+    // 编辑试题
+    toQues (item, i, ques) {
+      this.curType = item
+      this.curQuesIndex = i
+      this.curRow = ques
+      this.quesVisible = true
+      this.detailType = 4
+    },
+    // 编辑试题完成后把新的试题信息带过来
+    updateQues (ques, id) {
+      ques.questionAnswerVersionsList = ques.questionAnswerVersions
+      delete ques.questionAnswerVersions
+      ques.questionVersionId = id
+      this.curType.examQuestions[this.curQuesIndex] = Object.assign(this.curRow, ques)
+    },
     // 添加题目
     showManualDia (item, i, ques) {
       this.curType = item
@@ -477,11 +535,10 @@ export default {
     },
     // 提交
     async submit (status) {
-      // this.form.paperOutline[0].examQuestions.reduce((e, j) => (e += +j.score), 0)
-      // return console.log(44,)
       if (this.submiting) return false
       this.$refs.form.validate(async (valid) => {
         if (valid) {
+          const { isCopy } = this // 复制
           const form = _.cloneDeep(this.form)
           if (isNaN(form.suggestTime) || form.suggestTime < 1 || form.suggestTime % 1) return Util.warningMsg('估计用时请输入正整数')
           const paper = form.paperOutline
@@ -516,6 +573,13 @@ export default {
               invalid = 1
               break
             }
+
+            // 试题里存在被禁用或者被删除的，不予提交
+            if (e.examQuestions.some(e => !e.status || e.isDel)) {
+              Util.warningMsg(`当前试卷存在已被删除或已被禁用的试题，请进行相应调整 `)
+              invalid = 1
+              break
+            }
           }
           // debugger
           if (invalid) return false
@@ -529,20 +593,26 @@ export default {
           form.status = status
 
           paper.map(e => {
+            // 复制不需要传id
+            if (isCopy) {
+              e.paperId = ''
+              e.outlineId = ''
+            }
             e.targetScore = +e.targetScore
             e.examQuestions = e.examQuestions.map(n => {
               return {
                 questionVersionId: n.questionVersionId,
                 serialNumber: n.serialNumber,
                 score: +n.score,
-                paperId: n.paperId || '',
+                paperId: !isCopy && this.paperId || '',
-                outlineId: e.outlineId || '',
+                outlineId: !isCopy && e.outlineId || '',
               }
             })
           })
           if (typeof form.classificationId === 'object') form.classificationId = form.classificationId[form.classificationId.length - 1]
-          form.questionType = [...new Set(paper.map(e => e.questionType))].join('、')
+          form.questionType = [...new Set(paper.map(e => e.questionType))].join('、') // 试题类型
           form.createSource = 1
+          if (isCopy) form.paperId = ''
           try {
             await this.$post(this.api.saveExamPaper, form)
             Util.successMsg('保存成功')
@@ -612,10 +682,42 @@ export default {
   }
 
   .ques-info {
+    position: relative;
     width: calc(100% - 40px);
     padding: 10px;
     margin-left: 20px;
     border: 1px solid #e9e9e9;
+    overflow: hidden;
+
+    &.disabled,
+    &.del,
+    &.repeat {
+      border-color: #f00;
+
+      &:after {
+        content: '已 禁 用';
+        position: absolute;
+        top: 17px;
+        right: -33px;
+        padding: 5px 36px;
+        font-size: 14px;
+        color: #fff;
+        background-color: #f00;
+        transform: rotate(45deg);
+      }
+    }
+
+    &.del {
+      &:after {
+        content: '已 删 除';
+      }
+    }
+
+    &.repeat {
+      &:after {
+        content: '存在重复题';
+      }
+    }
   }
 
   .top-line {
@@ -681,4 +783,16 @@ export default {
     font-size: 12px;
   }
 }
+
+.diff-text {
+  line-height: 1.6;
+
+  .em {
+    font-weight: 600;
+  }
+
+  .coe {
+    padding-left: 32px;
+  }
+}
 </style>

src/pages/testPaper/detail/manual.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog title="批量添加单选题" :visible.sync="quesVisible" width="1200px" :close-on-click-modal="false"
+    <el-dialog :title="diaTitle" :visible.sync="selectQuesVisible" width="1200px" :close-on-click-modal="false"
       @closed="closeDia">
       <div class="wrap">
         <!-- 题库 -->
@@ -75,16 +75,19 @@
       </div>
       <div class="flex j-between">
         <p>未找到试题，<a class="link" @click="toAddQues">去新增</a></p>
-        <p>已选题数/目标题数：{{ checkedLen }}/{{ $parent.curType.questionNum }}&emsp;&emsp;<a class="link"
+        <p>已选题数/目标题数：{{ checkedLen }}/{{ $parent.curType.questionNum }}&emsp;&emsp;
-            @click="toEditQues">修改目标</a></p>
+          <!-- <a class="link" @click="toEditQues">修改目标</a> -->
+        </p>
       </div>
 
 
       <span slot="footer" class="dialog-footer">
-        <el-button @click="quesVisible = false">取消</el-button>
+        <el-button @click="selectQuesVisible = false">取消</el-button>
         <el-button type="primary" :loading="submiting" @click="submit">确定</el-button>
       </span>
     </el-dialog>
+
+    <Detail :visible.sync="quesVisible" :row.sync="curRow" :detailType.sync="detailType" @updateQues="updateQues" />
   </div>
 </template>
 <script>
@@ -92,11 +95,13 @@ import Setting from '@/setting'
 import Util from '@/libs/util'
 import _ from 'lodash'
 import QuesConst from '@/const/ques'
+import Detail from '@/pages/ques/detail'
 export default {
+  components: { Detail },
   props: ['visible', 'questionType'],
   data () {
     return {
-      quesVisible: false,
+      selectQuesVisible: false,
       quesBankKeyword: '',
       knowledgeKeyword: '',
       searchTimer: null,
@@ -110,13 +115,25 @@ export default {
       curCheckQues: [],
       submiting: false,
 
+      quesVisible: false,
+      curRow: {},
+      detailType: '',
     };
   },
   computed: {
     // 外面已经添加的试题+当前弹框已经勾选的试题
     checkedLen () {
       return this.curCheckQues.length + this.checked.length
-    }
+    },
+    // 弹框标题
+    diaTitle () {
+      const { curQuesIndex, curQues } = this.$parent
+      return curQues ?
+        '更换试题' :
+        typeof curQuesIndex === 'number' ?
+          '添加试题' :
+          this.questionType ? `批量添加${QuesConst.questionTypes.find(e => e.id === this.questionType).name}` : ''
+    },
   },
   watch: {
     'quesBankKeyword': function (val) {
@@ -128,7 +145,7 @@ export default {
       this.searchTimer = setTimeout(this.getKnowledge, 500)
     },
     visible () {
-      this.quesVisible = this.visible
+      this.selectQuesVisible = this.visible
       this.visible && this.init()
     }
   },
@@ -189,8 +206,6 @@ export default {
           questionBankId: this.$refs.quesBank.getCurrentKey(),
           knowledgePointIds: [k.id],
           questionTypes: this.questionType ? [this.questionType] : [],
-          // questionBankId: 26,
-          // knowledgePointIds: [18],
         })
         const data = list
         const checked = this.curCheckQues
@@ -288,11 +303,19 @@ export default {
     },
     // 新增试题
     toAddQues () {
-
+      this.quesVisible = true
+      this.detailType = 5
     },
     // 修改目标
     toEditQues () {
 
+    },
+    // 编辑试题完成后把新的试题信息带过来
+    updateQues (ques, id) {
+      // ques.questionAnswerVersionsList = ques.questionAnswerVersions
+      // delete ques.questionAnswerVersions
+      // ques.questionVersionId = id
+      // this.curType.examQuestions[this.curQuesIndex] = Object.assign(this.curRow, ques)
     },
     // 提交
     async submit () {
@@ -308,7 +331,7 @@ export default {
           this.$set(e, 'check', false)
           this.$set(e, 'sort', i + 1)
           this.$set(e, 'score', '')
-          this.$set(e, 'questionVersionId', e.questionId)
+          // this.$set(e, 'questionVersionId', e.questionId)
         })
 
         if (curQues) {
@@ -320,8 +343,12 @@ export default {
             this.curCheckQues.splice(curQuesIndex + 1, 0, ...checked) :
             this.curCheckQues.push(...checked)
         }
+        // 给题目重新排序
+        this.curCheckQues.map((e, i) => {
+          this.$set(e, 'serialNumber', i + 1)
+        })
 
-        this.quesVisible = false
+        this.selectQuesVisible = false
         this.submiting = false
       } catch (e) {
         this.submiting = false

src/pages/testPaper/list/index.vue

@@ -95,8 +95,8 @@
             </li>
             <li>
               <label>状态</label>
-              <el-select v-model="filter.status" clearable placeholder="请选择状态" @change="initData">
+              <el-select v-model="status" clearable placeholder="请选择状态" @change="initData">
-                <el-option v-for="(item, i) in status" :key="i" :label="item.name" :value="item.id"></el-option>
+                <el-option v-for="(item, i) in statusList" :key="i" :label="item.name" :value="item.id"></el-option>
               </el-select>
             </li>
             <li>
@@ -106,7 +106,7 @@
             </li>
             <div style="margin-bottom: 15px;">
               <el-button type="primary" @click="add">创建试卷</el-button>
-              <el-button type="primary" @click="add">批量移除 </el-button>
+              <!-- <el-button type="primary" @click="add">批量移除 </el-button> -->
               <el-button type="primary" @click="delAllSelection">批量删除</el-button>
             </div>
           </ul>
@@ -140,7 +140,7 @@
               e.id === scope.row.paperType).name : '' }}</template>
           </el-table-column>
           <el-table-column label="状态" align="center" width="60">
-            <template slot-scope="scope">{{ scope.row.status ? '发布' : '草稿' }}</template>
+            <template slot-scope="scope">{{ scope.row.status ? '草稿' : (scope.row.isDisable ? '禁用' : '启用') }}</template>
           </el-table-column>
           <el-table-column prop="createTime" label="创建时间" align="center" width="160"
             sortable="custom"></el-table-column>
@@ -149,9 +149,9 @@
           <el-table-column prop="createUser" label="最近编辑人" align="center" width="90"></el-table-column>
           <el-table-column label="操作" align="center" width="240">
             <template slot-scope="scope">
-              <el-button type="text" @click="edit(scope.row)">复制</el-button>
+              <el-button type="text" @click="toDetail(scope.row, 1)">复制</el-button>
-              <el-button type="text" @click="edit(scope.row)">预览</el-button>
+              <!-- <el-button type="text" @click="edit(scope.row)">预览</el-button> -->
-              <el-button type="text" @click="edit(scope.row)">编辑</el-button>
+              <el-button type="text" @click="toDetail(scope.row)">编辑</el-button>
               <el-button type="text" @click="del(scope.row)">删除</el-button>
               <el-switch v-if="!scope.row.status" v-model="scope.row.isDisable" :active-value="false"
                 :inactive-value="true" style="margin: 0 10px 0 5px" :active-text="scope.row.isDisable ? '关' : '开'"
@@ -228,7 +228,7 @@ export default {
         ]
       },
       professionals: [],
-      status: [
+      statusList: [
         {
           id: 0,
           name: '启用'
@@ -244,11 +244,11 @@ export default {
       ],
       particularYear: '',
       questionType: [],
+      status: '',
       filter: {
         difficult: [],
         professionalId: [],
         paperType: '',
-        status: '',
         updateTimeOrder: '',
         crateTimeOrder: '',
         yearOrder: '',
@@ -410,6 +410,8 @@ export default {
         this.listLoading = true
         const res = await this.$post(this.api.examPaperList, {
           ...this.filter,
+          isDisable: this.status === 2 ? '' : this.status, // 禁用启用
+          status: this.status === 2 ? 1 : '', // 草稿及发布
           particularYear: this.particularYear ? [this.particularYear] : [],
           questionType: this.questionType.length ? this.questionType.join() : '',
           type: this.isNotJoin,
@@ -473,8 +475,8 @@ export default {
       this.$router.push(`detail?libraryId=${this.typeId}&classificationId=${this.$refs.typeTree.getCurrentKey() || ''}`)
     },
     // 编辑试卷
-    async edit (row) {
+    async toDetail (row, isCopy = '') {
-      this.$router.push(`detail?paperId=${row.paperId}&libraryId=${this.typeId}&classificationId=${this.$refs.typeTree.getCurrentKey() || ''}`)
+      this.$router.push(`detail?paperId=${row.paperId}&libraryId=${this.typeId}&classificationId=${this.$refs.typeTree.getCurrentKey() || ''}&isCopy=${isCopy}`)
     },
     async delAllSelection () {
       const list = this.multipleSelection

src/styles/common.scss

@@ -380,15 +380,6 @@
 .el-switch__label span {
   font-size: 12px;
 }
-.el-tooltip__popper.is-dark {
-  padding: 18px 20px;
-  color: #606266;
-  line-height: 1.8;
-  background-color: #fff;
-  border: .0625rem solid #ebeef5;
-  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
-  border-radius: 4px;
-}
 .el-tooltip__popper[x-placement^="top"] {
   .popper__arrow {
     border-top-color: #fff;