diff --git a/package-lock.json b/package-lock.json
index 575dea3..041e926 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15519,11 +15519,18 @@
       "integrity": "sha512-EJkYLyyzgOJTxGreiZ9wrmXthIMVVRSeFTzV6n0OR9w4aeqW79Prvog4jZ4G0kkmW3TTTBbZtHM9VNHEl6LJDA=="
     },
     "vuedraggable": {
-      "version": "2.23.2",
-      "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.23.2.tgz",
-      "integrity": "sha512-PgHCjUpxEAEZJq36ys49HfQmXglattf/7ofOzUrW2/rRdG7tu6fK84ir14t1jYv4kdXewTEa2ieKEAhhEMdwkQ==",
+      "version": "2.24.3",
+      "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.24.3.tgz",
+      "integrity": "sha512-6/HDXi92GzB+Hcs9fC6PAAozK1RLt1ewPTLjK0anTYguXLAeySDmcnqE8IC0xa7shvSzRjQXq3/+dsZ7ETGF3g==",
       "requires": {
-        "sortablejs": "^1.10.1"
+        "sortablejs": "1.10.2"
+      },
+      "dependencies": {
+        "sortablejs": {
+          "version": "1.10.2",
+          "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.10.2.tgz",
+          "integrity": "sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A=="
+        }
       }
     },
     "vuex": {
diff --git a/package.json b/package.json
index 9c38cce..9f8261f 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     "vue-schart": "^2.0.0",
     "vue-seamless-scroll": "^1.1.23",
     "vue-ueditor-wrap": "^2.5.6",
-    "vuedraggable": "^2.17.0",
+    "vuedraggable": "^2.24.3",
     "vuex": "^3.4.0"
   },
   "devDependencies": {
diff --git a/public/static/ueditorPlus/plugins/gapfilling/gapfilling.css b/public/static/ueditorPlus/plugins/gapfilling/gapfilling.css
index 52af2a1..e0f1bf6 100644
--- a/public/static/ueditorPlus/plugins/gapfilling/gapfilling.css
+++ b/public/static/ueditorPlus/plugins/gapfilling/gapfilling.css
@@ -6,7 +6,7 @@ body .edui-default .edui-toolbar .edui-button.edui-for-gapfilling .edui-icon {
   outline: none !important;
 }
 .edui-for-gapfilling .edui-icon::after {
-  content: "点击插入填空题";
+  content: "点击插入填空项";
   position: absolute;
   left: 6px;
   color: #333;
diff --git a/src/api/index.js b/src/api/index.js
index 04b4365..5cb6a65 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -70,4 +70,5 @@ export default {
   disableOrEnableQuestion: `/exam/exam/questions/disableOrEnableQuestion`,
   findAllByQuestionBank: `/exam/exam/questions/findAllByQuestionBank`,
   selectQuestionsByTypeAndDifficulty: `/exam/exam/questions/selectQuestionsByTypeAndDifficulty`,
+  removeQuestionKnowledge: `/exam/exam/questions/removeQuestionKnowledge`,
 }
\ No newline at end of file
diff --git a/src/components/ueditor/index.vue b/src/components/ueditorPlus/index.vue
similarity index 100%
rename from src/components/ueditor/index.vue
rename to src/components/ueditorPlus/index.vue
diff --git a/src/pages/ques/detail/index.vue b/src/pages/ques/detail/index.vue
index 781f670..be86930 100644
--- a/src/pages/ques/detail/index.vue
+++ b/src/pages/ques/detail/index.vue
@@ -34,7 +34,7 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item class="is-required" prop="stem" label="题干">
-          <Ueditor ref="stem" @ready="stemReady" v-model="form.stem" />
+          <UeditorPlus ref="stem" @ready="stemReady" v-model="form.stem" />
 
           <Upload v-if="form.questionType === 'essay'" class="m-t-10"
             accept=".csv,.xlsx,.xls,.docx,.doc,.pdf,.jpg,.png,.zip,.rar,.7z" :max-size="50" :file-list="uploadList"
@@ -120,7 +120,7 @@
             </el-radio-group>
           </el-form-item>
           <el-form-item v-if="form.allowAttachment" prop="uploadInstructions" label="上传要求说明">
-            <Ueditor ref="uploadInstructions" @ready="uploadInstructionsReady" v-model="form.uploadInstructions" />
+            <UeditorPlus ref="uploadInstructions" @ready="uploadInstructionsReady" v-model="form.uploadInstructions" />
           </el-form-item>
           <el-form-item label="判分标准" class="is-required">
             <el-select :value="form.questionAnswerVersions[0].gradingStandard" placeholder="请选择判分标准" disabled>
@@ -128,13 +128,13 @@
             </el-select>
           </el-form-item>
           <el-form-item prop="referenceAnswer" label="参考答案">
-            <Ueditor ref="referenceAnswer" @ready="referenceAnswerReady"
+            <UeditorPlus ref="referenceAnswer" @ready="referenceAnswerReady"
               v-model="form.questionAnswerVersions[0].referenceAnswer" />
           </el-form-item>
         </template>
 
         <el-form-item prop="answerAnalysis" label="解析">
-          <Ueditor ref="answerAnalysis" @ready="answerAnalysisReady" v-model="answerAnalysis" />
+          <UeditorPlus ref="answerAnalysis" @ready="answerAnalysisReady" v-model="answerAnalysis" />
         </el-form-item>
       </el-form>
       <span v-if="detailType !== 2" slot="footer" class="dialog-footer">
@@ -178,7 +178,7 @@
 
     <el-dialog :visible.sync="richEditor.dialogVisible" width="1000px" :show-close="false" center
       :close-on-click-modal="false">
-      <!-- <Ueditor ref="title2" @ready="editorReady" /> -->
+      <!-- <UeditorPlus ref="title2" @ready="editorReady" /> -->
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="editorSubmit">确定</el-button>
         <el-button @click="richEditor.dialogVisible = false">取消</el-button>
@@ -189,7 +189,7 @@
 <script>
 import Setting from '@/setting'
 import Util from '@/libs/util'
-import Ueditor from '@/components/ueditor'
+import UeditorPlus from '@/components/ueditorPlus'
 import Upload from '@/components/upload'
 import Oss from '@/components/upload/upload.js'
 import dayjs from 'dayjs'
@@ -197,7 +197,7 @@ import _ from 'lodash'
 import Const from '@/const/ques'
 export default {
   props: ['visible', 'row', 'detailType'],
-  components: { Ueditor, Upload },
+  components: { UeditorPlus, Upload },
   data () {
     return {
       typeId: this.$route.query.id, // 题库id
@@ -339,9 +339,9 @@ export default {
             givenYear: r.givenYear,
             difficulty: r.difficulty,
             stem: r.stem,
-            knowledgePointIds: r.knowledgePointList.map(e => {
+            knowledgePointIds: r.knowledgePointList ? r.knowledgePointList.map(e => {
               return e.path.split('/').map(n => +n)
-            }),
+            }) : [],
             specialtyIds: r.professionalList.map(e => e.specialtyId),
             allowAttachment: r.allowAttachment,
             stemAttachment: r.stemAttachment,
diff --git a/src/pages/ques/list/index.vue b/src/pages/ques/list/index.vue
index ff172bc..033efb4 100644
--- a/src/pages/ques/list/index.vue
+++ b/src/pages/ques/list/index.vue
@@ -89,9 +89,9 @@
             <div style="margin-bottom: 15px;">
               <el-button type="primary" @click="add">新增试题</el-button>
               <el-button type="primary" @click="batchImport">批量导入</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>
+              <!-- <el-button type="primary" @click="batchRemove">批量转移</el-button> -->
+              <el-button type="primary" :disabled="!isKnowLedge" @click="batchRemove">批量移除 </el-button>
+              <el-button type="primary" @click="batchDel">批量删除</el-button>
             </div>
           </ul>
         </div>
@@ -124,7 +124,7 @@
               <el-button type="text" @click="toDetail(scope.row, 1)">复制</el-button>
               <el-button type="text" @click="toDetail(scope.row, 2)">查看</el-button>
               <el-button type="text" @click="toDetail(scope.row, 3)">编辑</el-button>
-              <el-button type="text" @click="del(scope.row)">移除</el-button>
+              <el-button type="text" :disabled="!isKnowLedge" @click="remove(scope.row)">移除</el-button>
               <el-button type="text" @click="del([scope.row])">删除</el-button>
               <el-switch v-model="scope.row.status" :active-value="1" :inactive-value="0" style="margin: 0 10px 0 5px"
                 :active-text="scope.row.status ? '开' : '关'"
@@ -204,12 +204,11 @@
 <script>
 import Util from '@/libs/util'
 import Setting from '@/setting'
-import Ueditor from '@/components/ueditor'
 import Breadcrumb from '@/components/breadcrumb'
 import Detail from '../detail'
 import Const from '@/const/ques'
 export default {
-  components: { Ueditor, Breadcrumb, Detail },
+  components: { Breadcrumb, Detail },
   data () {
     return {
       crumbs: [
@@ -285,18 +284,28 @@ export default {
       uploading: false,
     };
   },
+  computed: {
+    // 当前选择的是否是知识点
+    isKnowLedge () {
+      if (this.isNotJoin === '') {
+        let node = this.$refs.typeTree
+        return node ? node.getCurrentNode().type === 1 : false
+      }
+      return false
+    },
+  },
   watch: {
-    keyword: function (val) {
-      clearTimeout(this.searchTimer);
-      this.searchTimer = setTimeout(this.getType, 500);
+    keyword: function () {
+      clearTimeout(this.searchTimer)
+      this.searchTimer = setTimeout(this.getType, 500)
     },
-    'filter.keyword': function (val) {
-      clearTimeout(this.searchTimer);
-      this.searchTimer = setTimeout(this.initData, 500);
+    'filter.keyword': function () {
+      clearTimeout(this.searchTimer)
+      this.searchTimer = setTimeout(this.initData, 500)
     },
     quesVisible () {
       this.quesVisible || this.getList()
-    }
+    },
   },
   mounted () {
     this.getType()
@@ -425,6 +434,23 @@ export default {
       this.curRow = row
       this.detailType = type
     },
+    // 移除
+    async remove (row) {
+      try {
+        await this.$confirm(`确认要移除吗？`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+          closeOnClickModal: false,
+        })
+        await this.$post(this.api.removeQuestionKnowledge, {
+          knowledgePointId: this.$refs.typeTree.getCurrentKey() || '',
+          questionVersionIds: [row.questionVersionId]
+        })
+        Util.successMsg('移除成功')
+        this.getList()
+      } catch (e) { }
+    },
     // 删除
     async del (rows) {
       const ids = rows.map(e => e.questionId)
@@ -449,7 +475,7 @@ export default {
       }
     },
     // 批量删除
-    async delAllSelection () {
+    async batchDel () {
       const list = this.multipleSelection
       list.length ? this.del(list) : Util.warningMsg('请选择数据')
     },
@@ -462,6 +488,30 @@ export default {
       this.delVisible = false
       this.getList()
     },
+    // 批量移除
+    async batchRemove () {
+      const list = this.multipleSelection
+      if (list.length) {
+        try {
+          await this.$confirm(`确认要移除吗？`, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+            closeOnClickModal: false,
+          })
+          await this.$post(this.api.removeQuestionKnowledge, {
+            knowledgePointId: this.$refs.typeTree.getCurrentKey() || '',
+            questionVersionIds: list.map(e => e.questionVersionId)
+          })
+          Util.successMsg('移除成功')
+          this.getList()
+          this.multipleSelection = []
+          this.$refs.table.clearSelection()
+        } catch (e) { }
+      } else {
+        Util.warningMsg('请选择数据')
+      }
+    },
     // 禁启用
     async switchOff (val, row) {
       try {
diff --git a/src/pages/testPaper/detail/index.vue b/src/pages/testPaper/detail/index.vue
index a18fce6..9e49b97 100644
--- a/src/pages/testPaper/detail/index.vue
+++ b/src/pages/testPaper/detail/index.vue
@@ -62,7 +62,7 @@
         </el-form-item>
       </div>
       <el-form-item prop="remarks" label="试卷说明">
-        <Ueditor ref="remarks" @ready="remarksReady" />
+        <UeditorPlus ref="remarks" @ready="remarksReady" />
       </el-form-item>
 
       <div class="line"></div>
@@ -129,44 +129,46 @@
           <p class="sum">本大题共{{ item.questionNum }}小题，共{{ item.targetScore }}分</p>
 
           <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', { disabled: !ques.status, del: ques.isDel, repeat: ques.isRepeat }]">
-                <div class="top-line">
-                  <span class="label">{{ j + 1 }} / {{ item.examQuestions.length }}</span>
-                  <span class="label">{{ questionTypes.find(e => e.id === item.questionType).name }}</span>
-                  <div :id="'stem' + ques.questionVersionId" v-html="getQuesStem(ques)"></div>
-                  <p v-if="item.questionType !== 'fill_blank'">（<el-input class="score" placeholder="请输入"
-                      v-model="ques.score" />分）</p>
-                </div>
-
-                <!-- 单选、多选、判断的选项 -->
-                <template
-                  v-if="item.questionType !== 'fill_blank' && item.questionType !== 'essay' && ques.questionAnswerVersionsList">
-                  <div v-for="(opt, j) in ques.questionAnswerVersionsList" :key="j" class="opt">
-                    <span>{{ numToLetter(j) }}.&nbsp;</span>
-                    <div v-html="opt.optionText"></div>
+            <draggable v-model="item.examQuestions" :group="dragGroup" @update="e => updateSort(e, item)">
+              <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', { disabled: !ques.status, del: ques.isDel, repeat: ques.isRepeat }]">
+                  <div class="top-line">
+                    <span class="label">{{ j + 1 }} / {{ item.examQuestions.length }}</span>
+                    <span class="label">{{ questionTypes.find(e => e.id === item.questionType).name }}</span>
+                    <div :id="'stem' + ques.questionVersionId" v-html="getQuesStem(ques)"></div>
+                    <p v-if="item.questionType !== 'fill_blank'">（<el-input class="score" placeholder="请输入"
+                        v-model="ques.score" />分）</p>
                   </div>
-                </template>
 
-                <div class="bottom-line">
-                  <div class="correct">
-                    【{{ item.questionType === 'essay' ? '参考答案' : '正确答案' }}】：
-                    <div v-html="getCorrectAnswer(ques)"></div>
-                  </div>
-                  <div class="actions">
-                    <div class="sort">
-                      <span>排序</span>
-                      <el-input class="score" v-model="ques.serialNumber" />
+                  <!-- 单选、多选、判断的选项 -->
+                  <template
+                    v-if="item.questionType !== 'fill_blank' && item.questionType !== 'essay' && ques.questionAnswerVersionsList">
+                    <div v-for="(opt, j) in ques.questionAnswerVersionsList" :key="j" class="opt">
+                      <span>{{ numToLetter(j) }}.&nbsp;</span>
+                      <div class="text" v-html="opt.optionText"></div>
+                    </div>
+                  </template>
+
+                  <div class="bottom-line">
+                    <div class="correct">
+                      【{{ item.questionType === 'essay' ? '参考答案' : '正确答案' }}】：
+                      <div v-html="getCorrectAnswer(ques)"></div>
+                    </div>
+                    <div class="actions">
+                      <div class="sort">
+                        <span>排序</span>
+                        <el-input class="score" v-model="ques.serialNumber" />
+                      </div>
+                      <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>
-                    <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>
                 </div>
               </div>
-            </div>
+            </draggable>
           </div>
         </li>
       </ul>
@@ -189,7 +191,9 @@
 import Setting from '@/setting'
 import Util from '@/libs/util'
 import dayjs from 'dayjs'
-import Ueditor from '@/components/ueditor'
+import Decimal from 'decimal.js'
+import Draggable from 'vuedraggable'
+import UeditorPlus from '@/components/ueditorPlus'
 import Breadcrumb from '@/components/breadcrumb'
 import QuesConst from '@/const/ques'
 import TestPaperConst from '@/const/testPaper'
@@ -197,10 +201,9 @@ import Template from './template'
 import Manual from './manual'
 import Auto from './auto'
 import Detail from '@/pages/ques/detail'
-import Decimal from 'decimal.js'
 
 export default {
-  components: { Ueditor, Breadcrumb, Template, Manual, Auto, Detail },
+  components: { UeditorPlus, Breadcrumb, Template, Manual, Auto, Detail, Draggable },
   data () {
     return {
       crumbs: [],
@@ -223,6 +226,9 @@ export default {
       },
       professionals: [],
 
+      dragGroup: {
+        pull: false,
+      },
       form: {
         classificationId: +this.$route.query.classificationId || '',
         difficult: '',
@@ -671,6 +677,13 @@ export default {
         }
       } catch (e) { }
     },
+    // 拖拽后回调
+    updateSort (e, item) {
+      e.preventDefault()
+      item.examQuestions.map((e, i) => {
+        this.$set(e, 'serialNumber', i + 1)
+      })
+    },
     // 移除试题
     delQues (item, i) {
       item.examQuestions.splice(i, 1)
@@ -848,7 +861,9 @@ export default {
         })
       })
       if (typeof form.classificationId === 'object') form.classificationId = form.classificationId[form.classificationId.length - 1]
-      form.questionType = [...new Set(paper.map(e => e.questionType))].join('、') // 试题类型
+
+      const { questionTypes } = QuesConst
+      form.questionType = [...new Set(paper.map(e => questionTypes.find(n => n.id === e.questionType).name))].join('、') // 试题类型
       form.createSource = 1
       if (isCopy) form.paperId = ''
       this.tempForm = form
@@ -1003,6 +1018,10 @@ export default {
     font-size: 14px;
     color: #707070;
     line-height: 1.6;
+
+    .text {
+      max-width: calc(100% - 20px);
+    }
   }
 
   .bottom-line {
diff --git a/src/pages/testPaper/list/index.vue b/src/pages/testPaper/list/index.vue
index 9a1d713..bc1ce7e 100644
--- a/src/pages/testPaper/list/index.vue
+++ b/src/pages/testPaper/list/index.vue
@@ -120,8 +120,7 @@
           <el-table-column prop="questionCount" label="试题总数" align="center" width="70"></el-table-column>
           <el-table-column prop="score" label="总分" align="center" width="60"></el-table-column>
           <el-table-column prop="medianScore" label="中分位数" align="center" width="70"></el-table-column>
-          <el-table-column prop="name" label="题型" align="center" min-width="90">
-          </el-table-column>
+          <el-table-column prop="questionType" label="题型" align="center" min-width="90"></el-table-column>
           <el-table-column prop="difficult" label="试卷难度" align="center" width="100" sortable="custom">
             <template slot-scope="scope">{{ difficults.find(e => e.id === scope.row.difficult) ? difficults.find(e =>
               e.id === scope.row.difficult).name : '' }}</template>
@@ -417,6 +416,7 @@ export default {
           type: this.isNotJoin,
           pageNum: this.page,
           pageSize: this.pageSize,
+          libraryId: this.typeId,
           classificationId: this.$refs.typeTree.getCurrentKey() || '',
         })
         this.list = res.pageList.records