From 0165016dd7f14d7981eab4206fd92f20547fce2b Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Mon, 26 Aug 2024 17:33:00 +0800
Subject: [PATCH] fix

---
 src/pages/knowledge/index.vue            |   3 +-
 src/pages/ques/detail/index.vue          |  73 +++++---
 src/pages/ques/list/index.vue            |   5 +-
 src/pages/quesBank/index.vue             |   1 -
 src/pages/testPaper/detail/auto.vue      |  96 ++++++----
 src/pages/testPaper/detail/index.vue     | 222 +++++++++++------------
 src/pages/testPaper/detail/manual.vue    |  40 ++--
 src/pages/testPaper/detail/template.vue  |   1 +
 src/pages/testPaper/list/index.vue       |  10 +-
 src/pages/testPaperLibraryType/index.vue |   2 +-
 src/plugins/requests/index.js            |   2 +
 11 files changed, 254 insertions(+), 201 deletions(-)

diff --git a/src/pages/knowledge/index.vue b/src/pages/knowledge/index.vue
index 62f56d9..7842fa2 100644
--- a/src/pages/knowledge/index.vue
+++ b/src/pages/knowledge/index.vue
@@ -324,9 +324,8 @@ export default {
     },
     // 点击树节点查询列表数据
     handleNodeClick (data) {
-      this.$refs.table.clearSelection()
       this.isNotJoin = ''
-      this.getList()
+      this.initData()
     },
     // 关闭组织新增编辑弹框
     closeType () {
diff --git a/src/pages/ques/detail/index.vue b/src/pages/ques/detail/index.vue
index 8ee496d..8eb75b9 100644
--- a/src/pages/ques/detail/index.vue
+++ b/src/pages/ques/detail/index.vue
@@ -86,10 +86,12 @@
             <div v-for="(item, i) in fillBlanks" :key="i" class="opt j-between">
               <div class="fills">
                 <span>填空{{ i + 1 }}：</span>
-                <div v-for="(fill, j) in item.fills" :key="j" class="fill-item">
-                  <el-input placeholder="请输入" v-model="fill.val" />
-                  <i v-if="j" class="action-icon el-icon-remove-outline" @click="item.fills.splice(j, 1)"></i>
-                  <span v-if="j !== item.fills.length - 1">或</span>
+                <div v-if="item.fills" class="fill-items">
+                  <div v-for="(fill, j) in item.fills" :key="j" class="fill-item">
+                    <el-input type="textarea" autosize resize="none" placeholder="请输入" v-model="fill.val" />
+                    <i v-if="j" class="action-icon el-icon-remove-outline" @click="item.fills.splice(j, 1)"></i>
+                    <span v-if="j !== item.fills.length - 1">或</span>
+                  </div>
                 </div>
 
                 <el-button class="add-fill" type="primary" size="small" @click="addFill(item)">新增答案</el-button>
@@ -256,7 +258,7 @@ export default {
         questionAnswerVersions: [],
         questionBankId: '',
         questionType: 'single_choice',
-        specialtyIds: [],
+        specialtyIds: [1],
         stem: '',
         allowAttachment: 0,
         stemAttachment: '',
@@ -333,19 +335,22 @@ export default {
       } else if (type === 4) {
         // this.questionBankId = this.row.questionBankId
       }
-      const { stem, answerAnalysis } = this.$refs
+      const { stem, answerAnalysis, referenceAnswer, uploadInstructions } = this.$refs
       stem && stem.instance && stem.setText('')
       answerAnalysis && answerAnalysis.instance && answerAnalysis.setText('')
+      referenceAnswer && referenceAnswer.instance && referenceAnswer.setText('')
+      uploadInstructions && uploadInstructions.instance && uploadInstructions.setText('')
       this.answerAnalysis = ''
+      this.uploadList = []
 
       // 点击了保存并继续新增则恢复题干以上的字段（不包括题干）
       if (v) {
-        const { form } = this
+        const { form, beforeSubmitForm: before } = this
         form.difficulty = v.difficulty
         form.givenYear = v.givenYear
         form.knowledgePointIds = this.beforeSubmitForm.knowledgePointIds
         form.questionType = v.questionType
-        form.specialtyIds = v.specialtyIds
+        form.specialtyIds = before.specialtyIds
         this.questionTypeChange(v.questionType)
       } else {
         this.handleSingleMultiple()
@@ -423,7 +428,7 @@ export default {
           pageSize: 1000,
         })
         this.professionals = res.pageList.records
-        if (!this.questionId) this.form.specialtyIds = [1]
+        // if (!this.questionId) this.form.specialtyIds = [1]
       } catch (e) { }
     },
     // 处理树形
@@ -605,6 +610,7 @@ export default {
           const opt = form.questionAnswerVersions
           if (!stem) return Util.warningMsg('请输入题干')
 
+          const blanks = this.fillBlanks
           if (form.questionType !== 'fill_blank' && form.questionType !== 'essay') {
             let invalid = 0
             for (const e of opt) {
@@ -614,9 +620,17 @@ export default {
                 break
               }
             }
-            // debugger
+
             if (invalid) return false
             if (!opt.find(e => e.answerIsCorrect)) return Util.warningMsg('请设置正确答案')
+          } else if (form.questionType === 'fill_blank') {
+            for (const e of blanks) {
+              if (e.fills.every(n => !n.val)) {
+                Util.warningMsg('请输入填空项正确答案')
+                invalid = 1
+                break
+              }
+            }
           }
 
           this.submiting = true
@@ -634,7 +648,6 @@ export default {
 
             // 填空题的答案数据，直接把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)
             } else if (form.questionType === 'essay' && this.$refs.referenceAnswer) {
@@ -652,11 +665,11 @@ export default {
               // 判断是否有重复试题，如果有，则弹出重复的试题
               await this.$post(this.api.checkQuestion, form)
               // 没有重复的试题，直接保存
-              this.saveQues()
-            } else {
-              // 仅更新此题
+              form.questionId || this.saveQues()
+            }
+            if (form.questionId) {
               try {
-                await this.$confirm(`<p style="margin-bottom: 10px;">您确定要保存对本题所做的更改吗？</p>${this.detailType === 4 ? '' : '<p>保存后，所有关联的试卷将会自动更新</p>'}`, '提示', {
+                await this.$confirm(`<p style="margin-bottom: 10px;">您确定要保存对本题所做的更改吗？</p>${this.detailType === 4 ? '' : '<p style="margin-bottom: 10px;">保存后，所有关联的试卷将会自动更新</p>'}${keep ? '<p>系统未识别到与本题相似的题目</p>' : ''}`, '提示', {
                   confirmButtonText: '确定',
                   cancelButtonText: '取消',
                   type: 'warning',
@@ -725,6 +738,10 @@ export default {
     font-size: 13px;
   }
 
+  /deep/img {
+    max-width: 100%;
+  }
+
   .sum {
     margin: 15px 0;
     font-size: 13px;
@@ -735,18 +752,32 @@ export default {
 .fill-blanks {
   .fills {
     display: inline-flex;
-    align-items: center;
+    align-items: flex-start;
+    flex-wrap: wrap;
+    flex: 1;
+  }
+
+  .fill-items {
+    width: calc(100% - 215px);
+    margin-right: 40px;
   }
 
   .fill-item {
-    display: inline-flex;
+    display: flex;
     align-items: center;
-    margin-right: 10px;
+    margin-bottom: 10px;
 
-    .el-input {
-      width: 100px;
+    .el-textarea {
+      width: 100%;
       margin-right: 10px;
     }
+
+    &:first-child,
+    &:last-child {
+      .el-textarea {
+        width: calc(100% - 52px);
+      }
+    }
   }
 
   .add-fill {
@@ -767,7 +798,7 @@ export default {
 .opts {
   .opt {
     display: flex;
-    align-items: center;
+    align-items: flex-start;
     margin-bottom: 15px;
   }
 
diff --git a/src/pages/ques/list/index.vue b/src/pages/ques/list/index.vue
index 1e1ace0..f26e56c 100644
--- a/src/pages/ques/list/index.vue
+++ b/src/pages/ques/list/index.vue
@@ -45,7 +45,8 @@
             </li>
             <li>
               <label>专业</label>
-              <el-select v-model="filter.specialtyIds" clearable placeholder="请选择专业" multiple @change="initData">
+              <el-select v-model="filter.specialtyIds" filterable clearable placeholder="请选择专业" multiple
+                @change="initData">
                 <el-option v-for="(item, i) in professionals" :key="i" :label="item.professionalName"
                   :value="item.professionalId"></el-option>
               </el-select>
@@ -64,7 +65,7 @@
             </li>
             <li>
               <label>知识点</label>
-              <el-cascader :disabled="isNotJoin !== 0" placeholder="请选择知识点" v-model="knowledgePointIds"
+              <el-cascader :disabled="isNotJoin !== 0" filterable placeholder="请选择知识点" v-model="knowledgePointIds"
                 :options="knowledges" :props="{ value: 'id', label: 'name', multiple: true }" clearable collapse-tags
                 @change="initData"></el-cascader>
             </li>
diff --git a/src/pages/quesBank/index.vue b/src/pages/quesBank/index.vue
index e5e99fd..9d379ac 100644
--- a/src/pages/quesBank/index.vue
+++ b/src/pages/quesBank/index.vue
@@ -197,7 +197,6 @@ export default {
     handleNodeClick () {
       this.isNotJoin = ''
       this.initData()
-      this.$refs.table.clearSelection()
     },
     // 题库列表
     async getList () {
diff --git a/src/pages/testPaper/detail/auto.vue b/src/pages/testPaper/detail/auto.vue
index d418175..d258e49 100644
--- a/src/pages/testPaper/detail/auto.vue
+++ b/src/pages/testPaper/detail/auto.vue
@@ -94,18 +94,13 @@
                 <span>题库名称</span>
               </div>
 
-              <div class="able-check">
+              <div class="able-check lines">
                 <div v-for="(item, i) in quesBanks" :key="i" :class="['line', { active: curQuesBank.id === item.id }]"
                   @click="questionBankClick(item)">
                   <span class="serial first">{{ i + 1 }}</span>
                   <p class="stem" :title="item.questionBankName">{{ item.questionBankName }}</p>
                 </div>
               </div>
-
-              <div class="pagination">
-                <el-pagination background @current-change="currentChangeQuesBank" :current-page="pageQuesBank"
-                  layout="total, prev, pager, next" :total="totalQuesBank"></el-pagination>
-              </div>
             </template>
             <div v-else class="empty">
               <img class="icon" src="@/assets/images/empty.svg" alt="">
@@ -114,6 +109,7 @@
           </div>
           <!-- 知识点 -->
           <div class="item">
+            <p class="total m-b-10">知识点</p>
             <ul class="filter">
               <li class="m-b-10">
                 <label>知识点框架</label>
@@ -133,16 +129,13 @@
                 <span>知识点名称</span>
               </div>
 
-              <div v-for="(item, i) in knowledges" :key="i" class="line">
-                <el-checkbox v-model="item.check" :disabled="item.disabled"
-                  @change="val => knowledgeChange(val, item)"></el-checkbox>
-                <span class="serial">{{ i + 1 }}</span>
-                <p class="stem" :title="item.name">{{ item.name }}</p>
-              </div>
-
-              <div class="pagination">
-                <el-pagination background @current-change="currentChangeKn" :current-page="pageKn"
-                  layout="total, prev, pager, next" :total="totalKn"></el-pagination>
+              <div class="lines">
+                <div v-for="(item, i) in knowledges" :key="i" class="line">
+                  <el-checkbox v-model="item.check" :disabled="item.disabled"
+                    @change="val => knowledgeChange(val, item)"></el-checkbox>
+                  <span class="serial">{{ i + 1 }}</span>
+                  <p class="stem" :title="item.name">{{ item.name }}</p>
+                </div>
               </div>
             </template>
             <div v-else class="empty">
@@ -235,6 +228,7 @@ export default {
       yearAll: true,
       yearCheck: [],
       submiting: false,
+      loaded: 0,
     };
   },
   computed: {
@@ -266,12 +260,15 @@ export default {
   methods: {
     // 初始化
     init () {
-      this.yearCheck = this.years
-      this.handleQuesList()
-      this.getQuesBankType()
-      this.initQuesBank()
-      this.difficult = this.$parent.form.difficult
-      this.difficult && this.difficultChange(this.difficult)
+      if (!this.loaded) {
+        this.loaded = 1
+        this.yearCheck = this.years
+        this.handleQuesList()
+        this.getQuesBankType()
+        this.initQuesBank()
+        this.difficult = this.$parent.form.difficult
+        this.difficult && this.difficultChange(this.difficult)
+      }
     },
     // 获取题库分类
     async getQuesBankType () {
@@ -290,8 +287,8 @@ export default {
         const type = this.quesBankTypeVal
         const res = await this.$post(this.api.questionBankList, {
           status: 1,
-          pageNum: this.pageQuesBank,
-          pageSize: this.pageSizeQuesBank,
+          pageNum: 1,
+          pageSize: 1000,
           questionCategoryId: type.length ? type[type.length - 1] : '',
           name: this.quesBankKeyword
         })
@@ -345,8 +342,8 @@ export default {
         if (id) {
           const type = this.knowledgeTypeVal
           const res = await this.$post(this.api.knowledgeHierarchyList, {
-            pageNum: this.pageKn,
-            pageSize: this.pageSizeKn,
+            pageNum: 1,
+            pageSize: 1000,
             questionBankId: id,
             knowledgePointCategoryId: type.length ? type[type.length - 1] : '',
             name: this.knowledgeKeyword,
@@ -501,15 +498,34 @@ export default {
     async submit () {
       if (this.submiting) return false
       const { list } = this
-      // let invalid = 0
-      // for (const e of list) {
-      //   if (!e.questionType) {
-      //     Util.warningMsg('请选择题型')
-      //     invalid = 1
-      //     break
-      //   }
-      // }
-      // if (invalid) return false
+      let invalid = 0
+      for (const i in list) {
+        const e = list[i]
+        const name = `第${Util.arabicToChinese(+i + 1)}大题`
+        if (!e.questionType) {
+          Util.warningMsg(`${name}请先选择题型`)
+          invalid = 1
+          break
+        }
+        if (!e.questionNum || isNaN(e.questionNum) || e.questionNum <= 0) {
+          Util.warningMsg(`${name}的目标题数请输入正整数`)
+          invalid = 1
+          break
+        }
+        let total = Decimal(e.basicDifficulty || 0).add(e.normalDifficulty || 0).add(e.hardDifficulty || 0).add(e.veryHardDifficulty || 0).toNumber() // 先算前4个难度的题数
+        if (total) { // 前面4个空有填1个，则清空随机
+          this.$set(e, 'randomDifficulty', 0)
+        } else {
+          total = e.basicDifficulty || 0
+        }
+        console.log("🚀 ~ submit ~ total:", total)
+        if (total > e.questionNum) {
+          Util.warningMsg(`${name}的小题总数大于目标题数，请重新输入`)
+          invalid = 1
+          break
+        }
+      }
+      if (invalid) return false
       this.submiting = true
       const k = this.allKnowledges.map(e => e.id)
 
@@ -527,7 +543,7 @@ export default {
         }
       })
       list.map(e => {
-        e.randomDifficulty = 0
+        // e.randomDifficulty = 0
         e.givenYears = years
         e.knowledgePointsIds = k
       })
@@ -562,6 +578,7 @@ export default {
           res.list[i].questions.map((e, i) => {
             // e.questionVersionId = e.id
             e.serialNumber = i + 1
+            this.$parent.handleFillScore(e)
           })
           this.$parent.form.paperOutline[i].examQuestions = res.list[i].questions
         })
@@ -616,10 +633,8 @@ export default {
 
     .item {
       width: 30%;
-      height: calc(100vh - 190px);
       padding: 15px;
       border-right: 1px solid #eee;
-      overflow: auto;
 
       &:last-child {
         width: 40%;
@@ -645,6 +660,11 @@ export default {
       margin-top: 10px;
     }
 
+    .lines {
+      height: calc(100vh - 392px);
+      overflow: auto;
+    }
+
     .line {
       display: flex;
       padding: 5px 0;
diff --git a/src/pages/testPaper/detail/index.vue b/src/pages/testPaper/detail/index.vue
index 33f248a..9e16a89 100644
--- a/src/pages/testPaper/detail/index.vue
+++ b/src/pages/testPaper/detail/index.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="page">
     <Breadcrumb :data="crumbs" />
-    <p class="page-name mb">试卷</p>
     <el-form :model="form" :rules="rules" class="input-form model" ref="form" label-width="140px">
+      <p class="page-name mb">试卷基础信息</p>
       <el-form-item prop="name" label="试卷名称">
         <el-input style="width: 940px" placeholder="请输入试卷名称" v-model="form.name" clearable maxlength="100" />
       </el-form-item>
@@ -14,7 +14,7 @@
         </el-form-item>
         <el-form-item prop="classificationId" label="所属试卷分类">
           <el-cascader filterable placeholder="请选择所属试卷分类" :options="types" v-model="form.classificationId"
-            :props="cascaderProps" clearable style="width: 100%">
+            :props="cascaderProps" style="width: 100%">
           </el-cascader>
         </el-form-item>
       </div>
@@ -38,7 +38,8 @@
           </el-select>
         </el-form-item>
         <el-form-item prop="difficult" label="试卷难度">
-          <el-select v-model="form.difficult" placeholder="系统自动评估，也可手动选择" @change="difficultSelected = true">
+          <el-select v-model="form.difficult" clearable placeholder="系统自动评估，也可手动选择"
+            @change="val => difficultSelected = !!val">
             <el-option v-for="(item, i) in difficults" :key="i" :label="item.name" :value="item.id"></el-option>
           </el-select>
           <el-tooltip placement="top">
@@ -67,9 +68,10 @@
 
       <div class="line"></div>
 
-      <div class="flex j-between m-b-20">
-        <p>默认模板</p>
-        <el-button type="primary" size="small" @click="showTemplate">选择大纲模板</el-button>
+      <p class="page-name mb">试卷大纲</p>
+      <div class="relative text-center m-b-40">
+        <p class="fs-16">{{ templateName }}</p>
+        <el-button class="tem-btn" type="primary" size="small" @click="showTemplate">选择大纲模板</el-button>
       </div>
       <el-table :data="form.paperOutline" stripe header-align="center" row-key="id">
         <el-table-column type="index" width="60" label="序号" align="center"></el-table-column>
@@ -105,7 +107,7 @@
       <div class="line"></div>
 
       <div class="flex j-between a-center">
-        <h6 class="page-name" style="margin-bottom: 0">选择试题</h6>
+        <h6 class="page-name" style="margin-bottom: 0">试卷试题</h6>
         <div>
           <el-button type="primary" @click="allocationAll">一键分配分值</el-button>
           <el-button type="primary" @click="showAuto">自动选题</el-button>
@@ -144,7 +146,7 @@
                         <span class="label">{{ j + 1 }} / {{ item.examQuestions.length }}</span>
                         <span class="label">{{ questionTypes.find(e => e.id === item.questionType).name }}</span>
                       </div>
-                      <div class="stem" :id="'stem' + ques.questionVersionId" v-html="getQuesStem(ques)"></div>
+                      <div class="stem" :id="'stem' + ques.questionVersionId" v-html="ques.stem"></div>
                     </div>
                   </div>
 
@@ -162,32 +164,32 @@
                       【{{ item.questionType === 'essay' ? '参考答案' : '正确答案' }}】：
                       <div v-html="getCorrectAnswer(ques)"></div>
                     </div>
-                    <div class="actions">
-                      <p v-if="item.questionType !== 'fill_blank'" class="m-r-10 input-wrap">
-                        （<el-input class="l-input" placeholder="请输入分值" v-model="ques.score" />分）</p>
-
-                      <el-popover v-else placement="bottom" width="400" trigger="click">
-                        <div v-if="ques.fillScores" class="fill-scores">
-                          <p class="fill-title">每空分值</p>
-                          <div v-for="(score, k) in ques.fillScores" :key="k" class="input-wrap">
-                            <el-input class="l-input" placeholder="请输入分值" v-model="score.val"
-                              @change="fillScoreChange(ques)" />分&emsp;填空项{{ k + 1 }}
-                          </div>
-                        </div>
-                        <div slot="reference" class="input-wrap">
-                          查看每空分值<el-input class="l-input" placeholder="请输入分值" v-model="ques.score" />
+                  </div>
+                  <div class="actions">
+                    <p v-if="item.questionType !== 'fill_blank'" class="m-r-10 input-wrap">
+                      （<el-input class="l-input" placeholder="请输入分值" v-model="ques.score" />分）</p>
+
+                    <el-popover v-else placement="bottom" width="400" trigger="click">
+                      <div v-if="ques.fillScores" class="fill-scores">
+                        <p class="fill-title">每空分值</p>
+                        <div v-for="(score, k) in ques.fillScores" :key="k" class="input-wrap">
+                          <el-input class="l-input" placeholder="请输入分值" v-model="score.val"
+                            @change="fillScoreChange(ques)" />分&emsp;填空项{{ k + 1 }}
                         </div>
-                      </el-popover>
-
-                      <!-- <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>
-                      <div class="input-wrap">
-                        <span>排序</span>
-                        <el-input class="l-input sort-input" v-model="ques.serialNumber"
-                          @change="sortChange(item, ques)" />
                       </div>
+                      <div slot="reference" class="input-wrap">
+                        查看每空分值<el-input class="l-input" placeholder="请输入分值" v-model="ques.score" readonly />
+                      </div>
+                    </el-popover>
+
+                    <!-- <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>
+                    <div class="input-wrap">
+                      <span>排序</span>
+                      <el-input class="l-input sort-input" v-model="ques.serialNumber"
+                        @change="sortChange(item, ques)" />
                     </div>
                   </div>
                 </div>
@@ -198,8 +200,8 @@
       </ul>
     </el-form>
     <div class="btns">
-      <el-button @click="submit(1)">保存草稿</el-button>
-      <el-button type="primary" @click="submit(0)">发布</el-button>
+      <el-button @click="submit(0)">保存草稿</el-button>
+      <el-button type="primary" @click="submit(1)">发布</el-button>
       <el-button v-if="paperId" @click="preview">预览</el-button>
       <el-button @click="back">取消</el-button>
     </div>
@@ -224,6 +226,7 @@ import dayjs from 'dayjs'
 import QuesConst from '@/const/ques'
 import TestPaperConst from '@/const/testPaper'
 import Decimal from 'decimal.js'
+import { template } from 'lodash'
 
 export default {
   components: { UeditorPlus, Breadcrumb, Template, Manual, Auto, RepeatQues, Draggable },
@@ -333,6 +336,7 @@ export default {
           { required: true, message: '请输入试卷名称', trigger: 'blur' }
         ],
       },
+      templateName: '默认模板',
       templateVisible: false,
       manualVisible: false,
       curType: {},
@@ -399,11 +403,12 @@ export default {
             e.examQuestions.map((n, j) => {
               n.originSort = j + 1
               Object.assign(n, n.question)
+              this.handleFillScore(n)
             })
 
           })
           if (r.particularYear) r.particularYear = r.particularYear + ''
-          if (r.professionalId) r.professionalId = r.professionalId.split(',').map(e => +e)
+          r.professionalId = r.professionalId ? r.professionalId.split(',').map(e => +e) : []
           this.form = r
         }
       } catch (e) { }
@@ -530,14 +535,11 @@ export default {
         data.avgValueList.map((e, i) => {
           // scores里有-1则不用循环
           if (!e.scores.includes(-1)) {
-            const stem = document.querySelector(`#stem` + e.questionVersionId)
-            if (stem) {
-              const inputs = stem.querySelectorAll('.fill-input')
-              if (inputs) {
-                for (const j in e.scores) {
-                  const item = inputs[j]
-                  inputs[j].value = e.scores[j]
-                }
+            const { fillScores } = list[i]
+            debugger
+            if (fillScores) {
+              for (const j in fillScores) {
+                fillScores[j].val = e.scores[j]
               }
             }
           }
@@ -588,35 +590,45 @@ export default {
       } else if (e.questionType === 'essay') { // 问答题取参考答案
         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('')) : '' // 单选多选显示ABC选项，判断题显示选项内容
+        if (e.questionAnswerVersionsList) {
+          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('')) : '' // 单选多选显示ABC选项，判断题显示选项内容
+        }
       }
     },
-    // 处理题干显示
-    getQuesStem (ques) {
-      let { stem } = ques
+
+    // 填空题的小空分数处理
+    handleFillScore (ques) {
       try {
-        if (ques.questionType === 'fill_blank') { // 填空题
-          let { jsonText } = ques
-          if (jsonText) {
-            jsonText = JSON.parse(jsonText)
-            const scores = jsonText.scores.map(e => {
+        const opts = ques.questionAnswerVersionsList
+        if (ques.questionType === 'fill_blank' && opts && opts.length) {
+          // 填空题小空json
+          let { answerData } = opts[0]
+          if (answerData) {
+            answerData = JSON.parse(answerData)
+
+            // 正确答案
+            let { jsonText } = ques
+            let scores
+            if (jsonText) {
+              jsonText = JSON.parse(jsonText)
+              scores = jsonText.scores
+            }
+
+            const fillScores = answerData.map((e, i) => {
               return {
-                val: e
+                val: scores ? scores[i] : ''
               }
             })
-            console.log("🚀 ~ getQuesStem ~ ques.scores:", scores)
-            // this.$set(ques, 'fillScores', scores)
+            ques.fillScores = fillScores
           }
         }
       } catch (e) { }
-      return stem
     },
-
     // 填空题分数输入回调
     fillScoreChange (ques) {
       let total = 0
-      ques.scores.map(e => {
+      ques.fillScores.map(e => {
         if (e.val && !isNaN(e.val)) total = Decimal(total).add(e.val).toNumber()
       })
       ques.score = total
@@ -707,18 +719,20 @@ export default {
             if (e.questionType !== 'fill_blank' && e.questionType !== 'essay') {
               // 判断每个选项的内容是否相同
               const opts = e.questionAnswerVersionsList
-              let diff = 0
-              for (const j in opts) {
-                // debugger
-                if (!n.questionAnswerVersionsList[j] || n.questionAnswerVersionsList[j].optionText !== opts[j].optionText) {
-                  diff = 1
-                  break
+              if (opts) {
+                let diff = 0
+                for (const j in opts) {
+                  // debugger
+                  if (!n.questionAnswerVersionsList || !n.questionAnswerVersionsList[j] || n.questionAnswerVersionsList[j].optionText !== opts[j].optionText) {
+                    diff = 1
+                    break
+                  }
                 }
-              }
 
-              if (e.questionType === n.questionType && e.stem === n.stem && !diff) {
-                e.repeat = true
-                n.repeat = true
+                if (e.questionType === n.questionType && e.stem === n.stem && !diff) {
+                  e.repeat = true
+                  n.repeat = true
+                }
               }
             } else {
               // 填空/问答：题干+题型一样即重复
@@ -741,7 +755,7 @@ export default {
     },
     // 提交
     submit (status) {
-      if (status) {
+      if (!status) {
         // 草稿只需判断名字有没有填
         if (!this.form.name) return Util.warningMsg('请输入试卷名称')
         this.validForm(status)
@@ -750,7 +764,7 @@ export default {
           const { form } = this
           if (form.name === '') return Util.warningMsg('请输入试卷名称')
           if (!form.particularYear) return Util.warningMsg('请选择年份')
-          if (!form.classificationId.length) return Util.warningMsg('请选择所属试卷分类')
+          if (!form.classificationId) return Util.warningMsg('请选择所属试卷分类')
           if (form.paperType === '') return Util.warningMsg('请选择建议用途')
           if (form.suggestTime === '') return Util.warningMsg('请输入估计用时')
           if (valid) {
@@ -778,7 +792,7 @@ export default {
       const allQues = []
 
       // 发布才需要校验
-      if (!status) {
+      if (status) {
         if (isNaN(form.suggestTime) || form.suggestTime < 1 || form.suggestTime % 1) return Util.warningMsg('估计用时请输入正整数')
         let invalid = 0
         for (const i in paper) {
@@ -816,13 +830,10 @@ export default {
           if (e.questionType === 'fill_blank') {
             let totalScore = 0
             e.examQuestions.map(n => {
-              const stem = document.querySelector(`#stem` + n.questionVersionId)
-              if (stem) {
-                const inputs = stem.querySelectorAll('.fill-input')
-                if (inputs) {
-                  for (const e of inputs) {
-                    totalScore = Decimal(totalScore).add(e.value || 0).toNumber()
-                  }
+              const { fillScores } = n
+              if (fillScores) {
+                for (const e of fillScores) {
+                  totalScore = Decimal(totalScore).add(e.val || 0).toNumber()
                 }
               }
             })
@@ -876,21 +887,13 @@ export default {
         e.examQuestions = e.examQuestions.map((n, j) => {
           // 填空题的各个填空分数处理
           if (n.questionType === 'fill_blank') {
-            const stem = document.querySelector(`#stem` + n.questionVersionId)
-            const scores = []
-            if (stem) {
-              const inputs = stem.querySelectorAll('.fill-input')
-              if (inputs) {
-                for (const e of inputs) {
-                  scores.push(e.value)
-                }
-              }
-            }
+            const { fillScores } = n
             n.jsonText = JSON.stringify({
               questionVersionId: n.questionVersionId,
-              scores
+              scores: fillScores ? fillScores.map(m => m.val) : []
             })
           }
+
           return {
             questionVersionId: n.questionVersionId,
             serialNumber: n.serialNumber,
@@ -925,8 +928,19 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.input-form.model {
+  height: calc(100vh - 130px);
+}
+
+.tem-btn {
+  position: absolute;
+  top: 0;
+  right: 0;
+}
+
 .ques {
   li {
+    padding-bottom: 10px;
     margin: 20px 0 10px;
     border: 1px solid #dbdbdb;
   }
@@ -980,6 +994,10 @@ export default {
     padding: 15px;
   }
 
+  /deep/img {
+    max-width: 100%;
+  }
+
   .ques-info {
     position: relative;
     width: calc(100% - 40px);
@@ -1070,26 +1088,6 @@ export default {
     }
   }
 
-  /deep/.fill-input {
-    width: 100px;
-    height: 28px;
-    padding: 0 15px;
-    margin: 0 10px;
-    font-size: 13px;
-    line-height: 28px;
-    color: #606266;
-    border: 1px solid #DCDEE0;
-    border-radius: 2px;
-
-    &::placeholder {
-      color: #cfd1db;
-    }
-
-    &:focus {
-      outline: none;
-    }
-  }
-
   .opt {
     display: flex;
     flex-wrap: wrap;
@@ -1117,8 +1115,10 @@ export default {
   }
 
   .actions {
-    display: inline-flex;
+    display: flex;
+    justify-content: flex-end;
     align-items: center;
+    margin-top: 10px;
 
     .el-button {
       margin: 0 20px 0 0;
diff --git a/src/pages/testPaper/detail/manual.vue b/src/pages/testPaper/detail/manual.vue
index 9c0a45d..1b50b62 100644
--- a/src/pages/testPaper/detail/manual.vue
+++ b/src/pages/testPaper/detail/manual.vue
@@ -24,18 +24,13 @@
               <span>题库名称</span>
             </div>
 
-            <div class="able-check">
+            <div class="able-check lines">
               <div v-for="(item, i) in quesBanks" :key="i" :class="['line', { active: curQuesBank.id === item.id }]"
                 @click="questionBankClick(item)">
                 <span class="serial">{{ i + 1 }}</span>
                 <p class="quesBank" :title="item.questionBankName">{{ item.questionBankName }}</p>
               </div>
             </div>
-
-            <div class="pagination">
-              <el-pagination background @current-change="currentChangeQuesBank" small :current-page="pageQuesBank"
-                layout="total, prev, pager, next" :total="totalQuesBank"></el-pagination>
-            </div>
           </template>
           <div v-else class="empty">
             <img class="icon" src="@/assets/images/empty.svg" alt="">
@@ -65,16 +60,18 @@
               <span class="kl">知识点</span>
             </div>
 
-            <div v-for="(item, i) in ques" :key="i" class="line">
-              <el-checkbox v-model="item.check" :disabled="item.disabled"
-                @change="val => quesChange(val, item)"></el-checkbox>
-              <span class="serial">{{ i + 1 }}</span>
-              <el-tooltip effect="dark" :content="item.stemText" placement="top-start">
-                <p class="stem">{{ item.stemText }}</p>
-              </el-tooltip>
-              <el-tooltip effect="dark" :content="item.knowledgePointName" placement="top-start">
-                <p class="kl">{{ item.knowledgePointName }}</p>
-              </el-tooltip>
+            <div class="lines">
+              <div v-for="(item, i) in ques" :key="i" class="line">
+                <el-checkbox v-model="item.check" :disabled="item.disabled"
+                  @change="val => quesChange(val, item)"></el-checkbox>
+                <span class="serial">{{ i + 1 }}</span>
+                <el-tooltip effect="dark" :content="item.stemText" placement="top-start">
+                  <p class="stem">{{ item.stemText }}</p>
+                </el-tooltip>
+                <el-tooltip effect="dark" :content="item.knowledgePointName" placement="top-start">
+                  <p class="kl">{{ item.knowledgePointName }}</p>
+                </el-tooltip>
+              </div>
             </div>
           </template>
           <div v-else class="empty">
@@ -256,8 +253,8 @@ export default {
         const type = this.quesBankTypeVal
         const res = await this.$post(this.api.questionBankList, {
           status: 1,
-          pageNum: this.pageQuesBank,
-          pageSize: this.pageSizeQuesBank,
+          pageNum: 1,
+          pageSize: 1000,
           questionCategoryId: type.length ? type[type.length - 1] : '',
           name: this.quesBankKeyword
         })
@@ -441,6 +438,7 @@ export default {
           this.$set(e, 'check', false)
           this.$set(e, 'sort', i + 1)
           this.$set(e, 'score', '')
+          this.$parent.handleFillScore(e)
           // this.$set(e, 'questionVersionId', e.questionVersionId)
         })
 
@@ -502,10 +500,8 @@ export default {
 
     .item {
       width: 38%;
-      height: calc(100vh - 173px);
       padding: 15px;
       border-right: 1px solid #eee;
-      overflow: auto;
     }
 
     .total {
@@ -513,6 +509,10 @@ export default {
       color: #333;
     }
 
+    .lines {
+      height: calc(100vh - 358px);
+      overflow: auto;
+    }
 
     .line {
       display: flex;
diff --git a/src/pages/testPaper/detail/template.vue b/src/pages/testPaper/detail/template.vue
index b23d77a..f253770 100644
--- a/src/pages/testPaper/detail/template.vue
+++ b/src/pages/testPaper/detail/template.vue
@@ -245,6 +245,7 @@ export default {
         e.examQuestions = []
       })
       this.$parent.form.paperOutline = data.paperOutline
+      this.$parent.templateName = data.templateName
       this.listVisible = false
     },
     // 获取详情
diff --git a/src/pages/testPaper/list/index.vue b/src/pages/testPaper/list/index.vue
index 400f881..117664d 100644
--- a/src/pages/testPaper/list/index.vue
+++ b/src/pages/testPaper/list/index.vue
@@ -76,7 +76,8 @@
             </li>
             <li>
               <label>所属专业</label>
-              <el-select v-model="filter.professionalId" clearable placeholder="请选择所属专业" multiple @change="initData">
+              <el-select v-model="filter.professionalId" filterable clearable placeholder="请选择所属专业" multiple
+                @change="initData">
                 <el-option v-for="(item, i) in professionals" :key="i" :label="item.professionalName"
                   :value="item.professionalId"></el-option>
               </el-select>
@@ -249,8 +250,8 @@ export default {
         difficult: [],
         professionalId: [],
         paperType: '',
-        updateTimeOrder: 2,
-        crateTimeOrder: '',
+        updateTimeOrder: '',
+        crateTimeOrder: 2,
         yearOrder: '',
         keyWord: '',
         difficultOrder: '',
@@ -384,9 +385,8 @@ export default {
     },
     // 点击树节点查询列表数据
     handleNodeClick (data) {
-      this.$refs.table.clearSelection()
       this.isNotJoin = ''
-      this.getList()
+      this.initData()
     },
     // 关闭组织新增编辑弹框
     closeType () {
diff --git a/src/pages/testPaperLibraryType/index.vue b/src/pages/testPaperLibraryType/index.vue
index 52a9f81..712bf8b 100644
--- a/src/pages/testPaperLibraryType/index.vue
+++ b/src/pages/testPaperLibraryType/index.vue
@@ -243,7 +243,7 @@ export default {
     async switchOff (val, row) {
       try {
         row.isDisable = !val
-        if (val) {
+        if (val && row.children && row.children.length) {
           await this.$confirm(`<p>确认要禁用【${row.libraryClassificationName}】吗？</p><p style="color: #f56c6c;">禁用后，此试卷库分类及其子分类将被禁用</p>`, '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
diff --git a/src/plugins/requests/index.js b/src/plugins/requests/index.js
index 521c0f1..7f72bf1 100644
--- a/src/plugins/requests/index.js
+++ b/src/plugins/requests/index.js
@@ -38,7 +38,9 @@ service.interceptors.response.use(
       if (!logouted) {
         Util.local.remove(Setting.storeKey)
         Util.local.remove(Setting.tokenKey)
+        window.top.exitSystem && window.top.exitSystem()
         Util.errorMsg(res.msg.includes('顶') ? '您的账号已在其他设备登录，您已被迫下线！' : '登录过期，请重新登录！')
+        localStorage.removeItem('examPath')
         setTimeout(() => {
           // store.dispatch('user/logout')
           logouted = 0