Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop

src/views/project/form/ProjectCourseList.vue

@@ -29,11 +29,11 @@
                 <!-- <a-menu-item v-if="form.id" >
                   <a href="javascript:;" @click="openVisible('topic',record)">必选题设置</a>
                 </a-menu-item> -->
-                <a-menu-item>
+                <!-- <a-menu-item>
                   <a-popconfirm title="是否删除?" @confirm="() => handleDelete(record)">
                     <a href="javascript:;" @click="$refs.table.refresh(true)">删除</a>
                   </a-popconfirm>
-                </a-menu-item>
+                </a-menu-item> -->
               </a-menu>
             </a-dropdown>
           </template>
@@ -51,9 +51,9 @@
     <a-drawer title="题库预览" :destroyOnClose="true" placement="right" width="1200" :closable="true" :visible="questionVisible" @close="drawerClose">
       <question-list :courseId="selectCourseId"></question-list>
     </a-drawer>
-    <a-drawer title="必选题设置" :destroyOnClose="true" placement="right" width="1200" :closable="true" :visible="requiredTopicVisible" @close="drawerClose">
+    <!-- <a-drawer title="必选题设置" :destroyOnClose="true" placement="right" width="1200" :closable="true" :visible="requiredTopicVisible" @close="drawerClose">
       <p>必选题设置</p>
-    </a-drawer>
+    </a-drawer> -->
   </a-card>
 </template>
 
@@ -151,6 +151,10 @@ export default {
       if(type === 'course') this.courseVisible = true;
       else if(type === 'topic') this.requiredTopicVisible = true;
       else if(type === 'question') this.questionVisible = true;
+    },
+    /** 删除table项 */
+    handleDelete(record){
+      
     },
     //计算总学时，总分数，总课时
     calc(data) {

src/views/project/form/ProjectTestPaperFormationStrategy.vue

@@ -171,6 +171,7 @@ export default {
     },
     //上一步
     toPrev() {
+      this.form.testPaperTactics = this.tableData;
       this.$emit('prevStep', this.form)
     },
     initTable() {