diff --git a/public/static/ueditorPlus/ueditor.config.js b/public/static/ueditorPlus/ueditor.config.js
index a30885f..d67ea6a 100644
--- a/public/static/ueditorPlus/ueditor.config.js
+++ b/public/static/ueditorPlus/ueditor.config.js
@@ -60,6 +60,7 @@
       ".gif",
       ".bmp"
     ],
+    autoFloatEnabled: false,
 
     // fontfamily: [],
     //工具栏上的所有的功能按钮和下拉框，可以在new编辑器的实例时选择自己需要的重新定义
diff --git a/src/pages/knowledge/index.vue b/src/pages/knowledge/index.vue
index e553c9c..e232331 100644
--- a/src/pages/knowledge/index.vue
+++ b/src/pages/knowledge/index.vue
@@ -1,7 +1,7 @@
 <template>
-  <div :class="['page', { inQues }]">
-    <Breadcrumb v-if="!inQues" style="margin-bottom: 0;" :data="crumbs" />
-    <div class="wrap">
+  <el-drawer title="知识点设置" :visible.sync="kpVisible" size="1200px" :close-on-click-modal="false" append-to-body
+    custom-class="kp-dia" @closed="closeDia">
+    <div class="page">
       <div class="side">
         <div class="m-b-20">
           <el-radio-group v-model="isNotJoin" @change="changeType">
@@ -22,7 +22,7 @@
 
           <el-input class="m-b-10" placeholder="请输入知识点分类" prefix-icon="el-icon-search" size="small" clearable
             v-model="keyword"></el-input>
-          <div style="overflow: auto">
+          <div class="type-wrap">
             <el-tree v-loading="loading" :data="types" default-expand-all ref="typeTree" node-key="id" highlight-current
               :expand-on-click-node="false" @node-click="handleNodeClick" :props="{ label: 'name', isLeaf: 'leaf' }">
               <span class="custom-tree-node" slot-scope="{ node, data }">
@@ -117,7 +117,6 @@
       </div>
     </div>
 
-
     <el-dialog title="提示" :visible.sync="delVisible" width="400px" :close-on-click-modal="false" append-to-body
       custom-class="del-dia">
       <div class="del-wrap">
@@ -132,7 +131,7 @@
         <el-button type="primary" @click="delTypeSubmit">确定</el-button>
       </span>
     </el-dialog>
-  </div>
+  </el-drawer>
 </template>
 
 <script>
@@ -140,12 +139,12 @@ import Util from '@/libs/util'
 import _ from 'lodash'
 import Breadcrumb from '@/components/breadcrumb'
 export default {
+  props: ['visible'],
   components: { Breadcrumb },
   data () {
     return {
-      crumbs: [],
+      kpVisible: false,
       questionBankId: this.$route.query.questionBankId,
-      inQues: false,
       createSource: 1,
       loading: false,
       keyword: '',
@@ -209,26 +208,12 @@ export default {
       clearTimeout(this.searchTimer)
       this.searchTimer = setTimeout(this.getList, 500)
     },
+    visible () {
+      this.kpVisible = this.visible
+      this.visible && this.getType()
+    }
   },
-  mounted () {
-    const { query } = this.$route
-    const { referrer1, referrer2 } = this.$store.state.user
-    this.crumbs = [
-      {
-        name: query.questionBankName || '题库管理',
-        route: referrer1 || '/quesBank'
-      },
-      {
-        name: '试题列表',
-        route: referrer2 || '/ques',
-      },
-      {
-        name: '知识点列表'
-      },
-    ]
-    this.inQues = this.$route.path === '/ques/detail' // 当前页面是否在试题详情
-    this.getType()
-  },
+  mounted () { },
   methods: {
     // 获取分类
     async getType () {
@@ -259,7 +244,7 @@ export default {
         name: '',
       }
       this.typeVisible = true
-      this.cascaderValue = data.path.split('/').map(e => +e)
+      this.cascaderValue = data ? data.path.split('/').map(e => +e) : []
     },
     // 编辑分类
     editType (node, data) {
@@ -403,7 +388,6 @@ export default {
         name: row.name,
         parentId: path.slice(0, path.length - 1),
       }
-      console.log(11, this.form)
     },
     // 知识点提交
     async knowledgeSubmit () {
@@ -446,40 +430,48 @@ export default {
         Util.warningMsg('请选择数据')
       }
     },
+    // 弹框关闭回调
+    closeDia () {
+      this.$emit('closed')
+      this.$emit('update:visible', false)
+    }
   }
 };
 </script>
 
 <style lang="scss" scoped>
-.m-b-20 {
-  margin-bottom: 20px;
-}
-
 .org-name {
   margin-right: 20px;
 }
 
-.w-100 {
-  width: 100%;
-}
 
-.inQues {
-  padding: 0 25px;
-}
+/deep/.kp-dia {
+  .el-drawer__header {
+    margin-bottom: 0;
+  }
 
-.wrap {
-  display: flex;
+  .page {
+    display: flex;
+    padding: 0 24px;
 
-  .side {
-    width: 300px;
-    padding: 24px 10px 24px 0;
-    margin-right: 24px;
-    border-right: 1px solid rgba(0, 0, 0, 0.06);
-  }
+    .side {
+      width: 300px;
+      padding: 24px 10px 24px 0;
+      margin-right: 24px;
+      border-right: 1px solid rgba(0, 0, 0, 0.06);
+    }
+
+    .type-wrap {
+      max-height: calc(100vh - 265px);
+      overflow: auto;
+    }
 
-  .right {
-    width: calc(100% - 324px);
-    padding: 24px 0;
+    .right {
+      width: calc(100% - 324px);
+      max-height: calc(100vh - 53px);
+      padding: 24px 0;
+      overflow: auto;
+    }
   }
 }
 </style>
\ No newline at end of file
diff --git a/src/pages/ques/detail/index.vue b/src/pages/ques/detail/index.vue
index dc2e99e..464f3d7 100644
--- a/src/pages/ques/detail/index.vue
+++ b/src/pages/ques/detail/index.vue
@@ -222,11 +222,7 @@
       </span>
     </el-dialog>
 
-
-    <el-drawer title="知识点设置" :visible.sync="kpVisible" size="1200px" :close-on-click-modal="false" append-to-body
-      custom-class="kp-dia" @closed="getKnowledge">
-      <Knowledge />
-    </el-drawer>
+    <Knowledge :visible.sync="kpVisible" @closed="getKnowledge" />
   </div>
 </template>
 <script>
@@ -598,15 +594,18 @@ export default {
     },
     // 解析富文本加载完毕回调
     answerAnalysisReady (editor) {
-      this.isDisabled ? editor.setDisabled() : editor.setContent(this.answerAnalysis)
+      this.isDisabled && editor.setDisabled()
+      editor.setContent(this.answerAnalysis)
     },
     // 上传说明富文本加载完毕回调
     uploadInstructionsReady (editor) {
-      this.isDisabled ? editor.setDisabled() : editor.setContent(this.form.uploadInstructions)
+      this.isDisabled && editor.setDisabled()
+      editor.setContent(this.form.uploadInstructions)
     },
     // 参考答案富文本加载完毕回调
     referenceAnswerReady (editor) {
-      this.isDisabled ? editor.setDisabled() : editor.setContent(this.form.questionAnswerVersions[0].referenceAnswer)
+      this.isDisabled && editor.setDisabled()
+      editor.setContent(this.form.questionAnswerVersions[0].referenceAnswer)
     },
     // 正确答案选择回调
     correctChange (i) {
@@ -946,10 +945,4 @@ export default {
 .correct-check {
   margin-right: 15px;
 }
-
-/deep/.kp-dia {
-  .el-drawer__header {
-    margin-bottom: 0;
-  }
-}
 </style>
\ No newline at end of file
diff --git a/src/pages/ques/list/batchImport.vue b/src/pages/ques/list/batchImport.vue
index 14c7d0b..b49eb09 100644
--- a/src/pages/ques/list/batchImport.vue
+++ b/src/pages/ques/list/batchImport.vue
@@ -30,7 +30,7 @@
           :on-remove="handleRemove" :on-error="uploadError" :on-success="uploadSuccess" :before-remove="beforeRemove"
           :limit="1" :data="{
             questionBankId: params.questionBankId
-          }" :disabled="uploading" :loading="uploading" :on-exceed="handleExceed"
+          }" :disabled="uploading" v-loading="uploading" :on-exceed="handleExceed"
           :action="this.api.batchImportQuestions" :file-list="uploadList" :headers="headers">
           <i class="el-icon-upload"></i>
           <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
@@ -145,7 +145,7 @@ export default {
   .el-progress__text,
   .el-progress,
   .el-upload-list__item-status-label {
-    // display: none !important;
+    display: none !important;
   }
 }
 </style>
\ No newline at end of file
diff --git a/src/pages/ques/list/index.vue b/src/pages/ques/list/index.vue
index 37bb893..198c9be 100644
--- a/src/pages/ques/list/index.vue
+++ b/src/pages/ques/list/index.vue
@@ -164,18 +164,21 @@
     </el-dialog>
 
     <BatchImport :visible.sync="importVisible" :params.sync="$route.query" />
+
+    <Knowledge :visible.sync="kpVisible" @closed="getType" />
   </div>
 </template>
 
 <script>
 import Breadcrumb from '@/components/breadcrumb'
 import BatchImport from './batchImport'
+import Knowledge from '@/pages/knowledge'
 import Util from '@/libs/util'
 import Setting from '@/setting'
 import Const from '@/const/ques'
 import Qs from 'qs'
 export default {
-  components: { Breadcrumb, BatchImport },
+  components: { Breadcrumb, BatchImport, Knowledge },
   data () {
     return {
       crumbs: [],
@@ -230,6 +233,8 @@ export default {
       curRow: {},
 
       importVisible: false,
+
+      kpVisible: false,
     };
   },
   computed: {
@@ -318,11 +323,7 @@ export default {
     },
     // 前往知识点
     toSet () {
-      this.setReferrer()
-      this.$router.push({
-        path: '/knowledge',
-        query: this.$route.query
-      })
+      this.kpVisible = true
     },
     // 缓存当前页面和参数，详情页返回到列表的时候直接取该url
     setReferrer () {
@@ -489,6 +490,8 @@ export default {
           await this.$post(this.api.delQuestion, ids)
           Util.successMsg('删除成功')
           this.getList()
+          this.multipleSelection = []
+          this.$refs.table.clearSelection()
         } catch (e) { }
       }
     },
diff --git a/src/pages/testPaper/detail/auto.vue b/src/pages/testPaper/detail/auto.vue
index 44701e1..6ea0264 100644
--- a/src/pages/testPaper/detail/auto.vue
+++ b/src/pages/testPaper/detail/auto.vue
@@ -1,188 +1,186 @@
 <template>
-  <div>
-    <el-drawer title="自动选题" :visible.sync="quesVisible" size="1200px" :close-on-click-modal="false"
-      custom-class="ques-dia" @closed="closeDia">
-      <div class="overflow">
-        <h6 class="page-name">难度设置</h6>
-        <div class="tool">
+  <el-drawer title="自动选题" :visible.sync="quesVisible" size="1200px" :close-on-click-modal="false"
+    custom-class="ques-dia" @closed="closeDia">
+    <div class="overflow">
+      <h6 class="page-name">难度设置</h6>
+      <div class="tool">
+        <ul class="filter">
+          <li style="margin-right: 10px">
+            <label>试卷难度</label>
+            <el-select v-model="difficult" placeholder="请选择试卷难度" clearable @change="difficultChange">
+              <el-option v-for="(item, i) in difficults" :key="i" :label="item.name" :value="item.id"></el-option>
+            </el-select>
+          </li>
+          <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" style="font-size: 16px;color: #8f8f8f;cursor: pointer;"></i>
+          </el-tooltip>
+        </ul>
+      </div>
+
+      <el-table :data="list" stripe header-align="center" row-key="libraryId">
+        <el-table-column type="index" width="60" label="序号" align="center"></el-table-column>
+        <el-table-column label="大题" align="center" min-width="100">
+          <template slot-scope="scope">第{{ arabicToChinese(scope.$index + 1) }}大题</template>
+        </el-table-column>
+        <el-table-column prop="name" label="题型" align="center" min-width="90">
+          <template slot-scope="scope">
+            <p v-if="scope.row.questionType">{{ questionTypes.find(e => e.id === scope.row.questionType).name }}</p>
+          </template>
+        </el-table-column>
+        <el-table-column prop="questionNum" label="目标题数" align="center" min-width="80"></el-table-column>
+        <el-table-column label="基础(道题)" align="center" width="90">
+          <template slot-scope="scope">
+            <el-input v-model.number="scope.row.basicDifficulty" type="number" />
+          </template>
+        </el-table-column>
+        <el-table-column label="普通(道题)" align="center" width="90">
+          <template slot-scope="scope">
+            <el-input v-model.number="scope.row.normalDifficulty" type="number" />
+          </template>
+        </el-table-column>
+        <el-table-column label="较难(道题)" align="center" width="90">
+          <template slot-scope="scope">
+            <el-input v-model.number="scope.row.hardDifficulty" type="number" />
+          </template>
+        </el-table-column>
+        <el-table-column label="难(道题)" align="center" width="90">
+          <template slot-scope="scope">
+            <el-input v-model.number="scope.row.veryHardDifficulty" type="number" />
+          </template>
+        </el-table-column>
+        <el-table-column label="难度随机(道题)" align="center" width="100">
+          <template slot-scope="scope">
+            <el-input v-model.number="scope.row.randomDifficulty" type="number" />
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <h6 class="page-name m-t-20">知识点设置</h6>
+      <div class="wrap">
+        <!-- 题库 -->
+        <div class="item">
+          <p class="total m-b-10">题库</p>
           <ul class="filter">
-            <li style="margin-right: 10px">
-              <label>试卷难度</label>
-              <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 class="m-b-10">
+              <label>题库分类</label>
+              <el-cascader style="width: 240px;" placeholder="请选择题库分类" v-model="quesBankTypeVal"
+                :options="quesBankTypes" :props="{ value: 'id', label: 'name', checkStrictly: true }" clearable
+                @change="initQuesBank"></el-cascader>
+            </li>
+            <li>
+              <el-input placeholder="请输入题库名称" prefix-icon="el-icon-search" v-model="quesBankKeyword" clearable />
             </li>
-            <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" style="font-size: 16px;color: #8f8f8f;cursor: pointer;"></i>
-            </el-tooltip>
           </ul>
-        </div>
-
-        <el-table :data="list" stripe header-align="center" row-key="libraryId">
-          <el-table-column type="index" width="60" label="序号" align="center"></el-table-column>
-          <el-table-column label="大题" align="center" min-width="100">
-            <template slot-scope="scope">第{{ arabicToChinese(scope.$index + 1) }}大题</template>
-          </el-table-column>
-          <el-table-column prop="name" label="题型" align="center" min-width="90">
-            <template slot-scope="scope">
-              <p v-if="scope.row.questionType">{{ questionTypes.find(e => e.id === scope.row.questionType).name }}</p>
-            </template>
-          </el-table-column>
-          <el-table-column prop="questionNum" label="目标题数" align="center" min-width="80"></el-table-column>
-          <el-table-column label="基础(道题)" align="center" width="90">
-            <template slot-scope="scope">
-              <el-input v-model.number="scope.row.basicDifficulty" type="number" />
-            </template>
-          </el-table-column>
-          <el-table-column label="普通(道题)" align="center" width="90">
-            <template slot-scope="scope">
-              <el-input v-model.number="scope.row.normalDifficulty" type="number" />
-            </template>
-          </el-table-column>
-          <el-table-column label="较难(道题)" align="center" width="90">
-            <template slot-scope="scope">
-              <el-input v-model.number="scope.row.hardDifficulty" type="number" />
-            </template>
-          </el-table-column>
-          <el-table-column label="难(道题)" align="center" width="90">
-            <template slot-scope="scope">
-              <el-input v-model.number="scope.row.veryHardDifficulty" type="number" />
-            </template>
-          </el-table-column>
-          <el-table-column label="难度随机(道题)" align="center" width="100">
-            <template slot-scope="scope">
-              <el-input v-model.number="scope.row.randomDifficulty" type="number" />
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <h6 class="page-name m-t-20">知识点设置</h6>
-        <div class="wrap">
-          <!-- 题库 -->
-          <div class="item">
-            <p class="total m-b-10">题库</p>
-            <ul class="filter">
-              <li class="m-b-10">
-                <label>题库分类</label>
-                <el-cascader style="width: 240px;" placeholder="请选择题库分类" v-model="quesBankTypeVal"
-                  :options="quesBankTypes" :props="{ value: 'id', label: 'name', checkStrictly: true }" clearable
-                  @change="initQuesBank"></el-cascader>
-              </li>
-              <li>
-                <el-input placeholder="请输入题库名称" prefix-icon="el-icon-search" v-model="quesBankKeyword" clearable />
-              </li>
-            </ul>
-
-            <template v-if="quesBanks.length">
-              <div class="line">
-                <span class="serial first">序号</span>
-                <span>题库名称</span>
-              </div>
 
-              <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>
-            </template>
-            <div v-else class="empty">
-              <img class="icon" src="@/assets/images/empty.svg" alt="">
-              <p>暂无数据</p>
+          <template v-if="quesBanks.length">
+            <div class="line">
+              <span class="serial first">序号</span>
+              <span>题库名称</span>
             </div>
-          </div>
-          <!-- 知识点 -->
-          <div class="item">
-            <p class="total m-b-10">知识点</p>
-            <ul class="filter">
-              <li class="m-b-10">
-                <label>知识点框架</label>
-                <el-cascader style="width: 240px;" placeholder="请选择知识点分类" v-model="knowledgeTypeVal"
-                  :options="knowledgeTypes" :props="{ value: 'id', label: 'name', checkStrictly: true }" clearable
-                  @change="getKnowledge"></el-cascader>
-              </li>
-              <li>
-                <el-input placeholder="请输入知识点名称" prefix-icon="el-icon-search" v-model="knowledgeKeyword" clearable />
-              </li>
-            </ul>
-
-            <template v-if="knowledges.length">
-              <div class="line">
-                <el-checkbox v-model="knowledgeCheck" @change="knowledgeAllCheckChange"></el-checkbox>
-                <span class="serial">序号</span>
-                <span>知识点名称</span>
-              </div>
 
-              <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 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>
-            </template>
-            <div v-else class="empty">
-              <img class="icon" src="@/assets/images/empty.svg" alt="">
-              <p>暂无数据</p>
             </div>
+          </template>
+          <div v-else class="empty">
+            <img class="icon" src="@/assets/images/empty.svg" alt="">
+            <p>暂无数据</p>
           </div>
-          <!-- 已选知识点 -->
-          <div class="item">
-            <div class="flex j-between a-center m-b-20">
-              <p class="total m-b-10">已选知识点（{{ allKnowledges.length }}个）</p>
-              <p class="clear" @click="clearChecked">
-                <i class="el-icon-delete m-r-5"></i>
-                清空
-              </p>
+        </div>
+        <!-- 知识点 -->
+        <div class="item">
+          <p class="total m-b-10">知识点</p>
+          <ul class="filter">
+            <li class="m-b-10">
+              <label>知识点框架</label>
+              <el-cascader style="width: 240px;" placeholder="请选择知识点分类" v-model="knowledgeTypeVal"
+                :options="knowledgeTypes" :props="{ value: 'id', label: 'name', checkStrictly: true }" clearable
+                @change="getKnowledge"></el-cascader>
+            </li>
+            <li>
+              <el-input placeholder="请输入知识点名称" prefix-icon="el-icon-search" v-model="knowledgeKeyword" clearable />
+            </li>
+          </ul>
+
+          <template v-if="knowledges.length">
+            <div class="line">
+              <el-checkbox v-model="knowledgeCheck" @change="knowledgeAllCheckChange"></el-checkbox>
+              <span class="serial">序号</span>
+              <span>知识点名称</span>
             </div>
 
-            <template v-for="(item, i) in checked">
-              <div :key="i" class="j-between m-b-10">
-                <div class="flex a-center">
-                  题库：{{ item.quesBank.questionBankName }}
-                  <i class="el-icon-delete action-icon m-l-10" @click="delQuesBank(i)"></i>
-                </div>
-                <div class="knowledges">
-                  <el-tag v-for="(tag, j) in item.knowledges" :key="tag.name" class="m-r-8 m-b-8" closable
-                    @close="delKnowledge(i, j, item, tag)">{{ tag.name }}</el-tag>
-                </div>
+            <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>
-            </template>
+            </div>
+          </template>
+          <div v-else class="empty">
+            <img class="icon" src="@/assets/images/empty.svg" alt="">
+            <p>暂无数据</p>
           </div>
         </div>
+        <!-- 已选知识点 -->
+        <div class="item">
+          <div class="flex j-between a-center m-b-20">
+            <p class="total m-b-10">已选知识点（{{ allKnowledges.length }}个）</p>
+            <p class="clear" @click="clearChecked">
+              <i class="el-icon-delete m-r-5"></i>
+              清空
+            </p>
+          </div>
 
-        <h6 class="page-name m-t-20">年份设置</h6>
-        <div class="years flex">
-          <el-checkbox style="margin-right: 20px" v-model="yearAll" @change="yearAllChange">全选</el-checkbox>
-          <el-checkbox-group v-model="yearCheck" @change="yearChange">
-            <el-checkbox v-for="(item, i) in years" :key="i" :label="item"></el-checkbox>
-          </el-checkbox-group>
+          <template v-for="(item, i) in checked">
+            <div :key="i" class="j-between m-b-10">
+              <div class="flex a-center">
+                题库：{{ item.quesBank.questionBankName }}
+                <i class="el-icon-delete action-icon m-l-10" @click="delQuesBank(i)"></i>
+              </div>
+              <div class="knowledges">
+                <el-tag v-for="(tag, j) in item.knowledges" :key="tag.name" class="m-r-8 m-b-8" closable
+                  @close="delKnowledge(i, j, item, tag)">{{ tag.name }}</el-tag>
+              </div>
+            </div>
+          </template>
         </div>
       </div>
 
-      <div class="btns">
-        <el-button @click="quesVisible = false">取消</el-button>
-        <el-button type="primary" :loading="submiting" @click="submit">自动选题</el-button>
+      <h6 class="page-name m-t-20">年份设置</h6>
+      <div class="years flex">
+        <el-checkbox style="margin-right: 20px" v-model="yearAll" @change="yearAllChange">全选</el-checkbox>
+        <el-checkbox-group v-model="yearCheck" @change="yearChange">
+          <el-checkbox v-for="(item, i) in years" :key="i" :label="item"></el-checkbox>
+        </el-checkbox-group>
       </div>
-    </el-drawer>
-  </div>
+    </div>
+
+    <div class="btns">
+      <el-button @click="quesVisible = false">取消</el-button>
+      <el-button type="primary" :loading="submiting" @click="submit">自动选题</el-button>
+    </div>
+  </el-drawer>
 </template>
 <script>
 import Setting from '@/setting'
@@ -438,44 +436,46 @@ export default {
 
     // 试卷难度选择回调
     difficultChange (val) {
-      const difficultyWeights = [0.2, 0.4, 0.6, 0.8]
-      const names = ['basicDifficulty', 'normalDifficulty', 'hardDifficulty', 'veryHardDifficulty']
-      // 遍历题型数组
-      this.list.forEach(e => {
-        const total = e.questionNum
-
-        let already = 0 // 已经分配的数量
-        if (val === 1) {
-          this.$set(e, 'basicDifficulty', Math.floor(total * 0.7))
-          this.$set(e, 'normalDifficulty', Math.floor(total * 0.3))
-          this.$set(e, 'hardDifficulty', 0)
-          this.$set(e, 'veryHardDifficulty', 0)
-        } else if (val === 2) {
-          this.$set(e, 'basicDifficulty', Math.floor(total * 0.45))
-          this.$set(e, 'normalDifficulty', Math.floor(total * 0.55))
-          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.3))
-          this.$set(e, 'hardDifficulty', Math.floor(total * 0.4))
-          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.1))
-          this.$set(e, 'hardDifficulty', Math.floor(total * 0.3))
-          this.$set(e, 'veryHardDifficulty', Math.floor(total * 0.5))
-        }
+      if (val) {
+        const difficultyWeights = [0.2, 0.4, 0.6, 0.8]
+        const names = ['basicDifficulty', 'normalDifficulty', 'hardDifficulty', 'veryHardDifficulty']
+        // 遍历题型数组
+        this.list.forEach(e => {
+          const total = e.questionNum
+
+          let already = 0 // 已经分配的数量
+          if (val === 1) {
+            this.$set(e, 'basicDifficulty', Math.floor(total * 0.7))
+            this.$set(e, 'normalDifficulty', Math.floor(total * 0.3))
+            this.$set(e, 'hardDifficulty', 0)
+            this.$set(e, 'veryHardDifficulty', 0)
+          } else if (val === 2) {
+            this.$set(e, 'basicDifficulty', Math.floor(total * 0.45))
+            this.$set(e, 'normalDifficulty', Math.floor(total * 0.55))
+            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.3))
+            this.$set(e, 'hardDifficulty', Math.floor(total * 0.4))
+            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.1))
+            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[names[val - 1]]++
-          already++
-        }
-        this.$set(e, 'randomDifficulty', 0)
-      })
+          already = Decimal(already).add(e.basicDifficulty).add(e.normalDifficulty).add(e.hardDifficulty).add(e.veryHardDifficulty).toNumber()
+          // 如果按比例分配还没分配完
+          while (total > already) {
+            e[names[val - 1]]++
+            already++
+          }
+          this.$set(e, 'randomDifficulty', 0)
+        })
+      }
     },
     // 年份全选回调
     yearAllChange (val) {
@@ -488,7 +488,7 @@ export default {
     // 提交
     async submit () {
       if (this.submiting) return false
-      const { list } = this
+      const { list, checked } = this
       let invalid = 0
       let totalCount = 0
       for (const i in list) {
@@ -540,6 +540,7 @@ export default {
       list.map(e => {
         e.givenYears = years
         e.knowledgePointsIds = k
+        e.questionBankIds = checked.map(n => n.quesBank.id)
       })
       try {
         const res = await this.$post(this.api.selectQuestionsByTypeAndDifficulty, list)
diff --git a/src/pages/testPaper/detail/index.vue b/src/pages/testPaper/detail/index.vue
index db742e0..ef0c6d0 100644
--- a/src/pages/testPaper/detail/index.vue
+++ b/src/pages/testPaper/detail/index.vue
@@ -921,12 +921,12 @@ export default {
             invalid = 1
             break
           }
-          if (!e.questionNum) {
+          if (e.questionNum === '') {
             Util.warningMsg('请输入目标题数')
             invalid = 1
             break
           }
-          if (!e.targetScore) {
+          if (e.targetScore === '') {
             Util.warningMsg('请输入目标分值')
             invalid = 1
             break
diff --git a/src/styles/common.scss b/src/styles/common.scss
index 05c7ec2..1bae069 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -495,4 +495,9 @@
       list-style-type: disc;
     }
   }
+}
+.el-drawer__header > :first-child {
+  font-size: 16px;
+  font-weight: 600;
+  color: #333;
 }
\ No newline at end of file