Merge remote-tracking branch 'origin/master'

src/modules/paper/components/AddPaper.vue

@@ -5,9 +5,11 @@
       <div v-show="step === 1">
         <question-select @selection-change="handleSelectionChange"></question-select>
         <div class="buttons">
+          <div class="buttons-inner">
             <el-button type="primary" @click="nextStep">下一步</el-button>
           </div>
         </div>
+      </div>
       <!-- 选题组卷添加试卷第二步 -->
       <div v-show="step === 2">
         <el-form label-width="170px">
@@ -45,10 +47,12 @@
           </template>
         </el-form>
         <div class="buttons">
+          <div class="buttons-inner">
             <el-button type="primary" @click="prevStep">上一步</el-button>
             <el-button type="primary" style="margin-left: 20px" :disabled="loading" @click="handleSave">保存</el-button>
           </div>
         </div>
+      </div>
       <BatchSetting
         :visible.sync="visible"
         :data="questionTypeGroups[batchSettingQuestionType]"
@@ -65,7 +69,8 @@ import BatchSetting from './BatchSetting.vue'
 import { batchGetQuestionList, updatePaperRules } from '../api.js'
 export default {
   props: {
-    data: { type: Object, default: () => ({}) }
+    data: { type: Object, default: () => ({}) },
+    list: { type: Array, default: () => [] }
   },
   components: { QuestionSelect, BatchSetting },
   data() {
@@ -83,7 +88,7 @@ export default {
   computed: {
     // 已添加的试题
     addedQuestions() {
-      return this.data.questions || []
+      return this.list || []
     },
     // 已添加的试题总分
     addedQuestionsScore() {
@@ -196,11 +201,17 @@ export default {
 </script>
 <style lang="scss" scoped>
 .buttons {
+  height: 92px;
+}
+.buttons-inner {
   position: absolute;
-  left: 50%;
-  bottom: 30px;
-  transform: translateX(-50%);
+  left: 0;
+  right: 0;
+  bottom: 0;
+  padding: 30px;
   text-align: center;
+  background-color: #fff;
+  z-index: 1;
 }
 ul {
   display: flex;

src/modules/paper/components/PaperQuestions.vue

@@ -55,7 +55,7 @@
     </el-row>
     <!-- 选题组卷 -->
     <template v-if="data.paper_type === 1">
-      <addPaper :visible.sync="visible" :data="data" @update="handleUpdate" v-if="visible" />
+      <addPaper :visible.sync="visible" :data="data" :list="questions" @update="handleUpdate" v-if="visible" />
     </template>
     <!-- 自动组卷 -->
     <template v-if="data.paper_type === 2">

src/modules/paper/components/QuestionSelect.vue

 <template>
   <div>
     <div style="margin-bottom: 25px">
-      <span style="font-size: 14px; color: #606266; padding-right: 12px">题库范围:</span>
+      <span style="font-size: 14px; color: #606266; padding-right: 12px">题库范围</span>
       <el-radio @change="refetchList" v-model="permission" :label="1">我的题库</el-radio>
       <el-radio @change="refetchList" v-model="permission" :label="2">公共题库</el-radio>
     </div>
@@ -29,7 +29,6 @@ export default {
     tableOptions() {
       return {
         limit: 10,
-
         remote: {
           httpRequest: getQuestionList,
           params: {