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

src/api/course/question/question.js

@@ -26,7 +26,7 @@ export function questionAdd(params) {
 // 题目数量
 export function getQuestionNumByCourseIds(params) {
     return request({
-        url: questionApi.add,
+        url: questionApi.getQuestionNumByCourseIds,
         method: 'post',
         data: params
     })

src/views/project/form/ProjectCourseList.vue

@@ -1,11 +1,11 @@
 <template>
-  <a-card :bordered="false" title="项目课程信息">
+  <a-card class="coures" :bordered="false" title="项目课程信息">
-    <template slot="extra">
+    <!-- <template slot="extra">
       <a-button type="primary" size="default" @click="toNext">下一步</a-button>
     </template>
     <template slot="extra">
       <a-button type="primary" size="default" @click="toPrep">上一步</a-button>
-    </template>
+    </template> -->
     <a-space direction="vertical" style="width: 100%">
       <a-space direction="horizontal">
         <span>总课时：{{ totalHours }}H , 总学时要求：{{ totalLearnHours }}H , 总题目数量：{{ totalTopicNum }} </span>
@@ -22,19 +22,18 @@
         <span slot="action" slot-scope="text, record">
           <template>
             <a-dropdown>
-              <a class="ant-dropdown-link"
+              <a class="ant-dropdown-link">操作
-                >操作
                 <a-icon type="down" />
               </a>
               <a-menu slot="overlay">
                 <a-menu-item>
-                  <a href="javascript:;" @click="$refs.table.refresh(false)">课程预览</a>
+                  <a href="javascript:;" @click="openVisible('course',record)">课程预览</a>
                 </a-menu-item>
                 <a-menu-item>
-                  <a href="javascript:;" @click="$refs.table.refresh(false)">题库预览</a>
+                  <a href="javascript:;" @click="openVisible('question',record)">题库预览</a>
                 </a-menu-item>
                 <a-menu-item>
-                  <a href="javascript:;" @click="$refs.table.refresh(false)">必选题设置</a>
+                  <a href="javascript:;" @click="openVisible('topic',record)">必选题设置</a>
                 </a-menu-item>
                 <a-menu-item>
                   <a-popconfirm title="是否删除?" @confirm="() => handleDelete(record)">
@@ -48,6 +47,19 @@
       </s-table>
     </a-space>
     <project-course-select ref="CourseSelect" @selectKeyDataSubmit="selectKeyDataChange" :selectRows="selData"></project-course-select>
+    <a-col :span="24" style="text-align: center;">
+      <a-button type="primary" size="default" @click="toPrep" style="margin-right: 8px;">上一步</a-button>
+      <a-button type="primary" size="default" @click="toNext">下一步</a-button>
+    </a-col>
+    <a-drawer title="课程预览" placement="right" width="1200" :closable="true" :visible="courseVisible" @close="drawerClose">
+      <p>课程预览</p>
+    </a-drawer>
+    <a-drawer title="题库预览" placement="right" width="1200" :closable="true" :visible="questionVisible" @close="drawerClose">
+      <p>题库预览</p>
+    </a-drawer>
+    <a-drawer title="必选题设置" placement="right" width="1200" :closable="true" :visible="requiredTopicVisible" @close="drawerClose">
+      <p>必选题设置</p>
+    </a-drawer>
   </a-card>
 </template>
 
@@ -80,6 +92,11 @@ export default {
       totalHours: 0, //总课时
       totalLearnHours: 0, //总学时
       totalTopicNum: 0, //题目数量
+
+      courseVisible: false, //课程预览页面显示控制
+      questionVisible: false, //题库预览页面显示控制
+      requiredTopicVisible:false, //必选题设置显示控制
+
       queryParam: {
         ids: '',
       }, //查询数据
@@ -119,6 +136,19 @@ export default {
   watch: {},
   //方法集合
   methods: {
+    //关闭抽屉
+    drawerClose(){
+      this.courseVisible = false;
+      this.requiredTopicVisible = false;
+      this.questionVisible = false;
+    },
+
+    //打开抽屉
+    openVisible(type) {
+      if(type === 'course') this.courseVisible = true;
+      else if(type === 'topic') this.requiredTopicVisible = true;
+      else if(type === 'question') this.questionVisible = true;
+    },
     //计算总学时，总分数，总课时
     calc(data) {
       this.totalHours = 0

src/views/project/form/ProjectForm.vue

@@ -124,7 +124,7 @@
           </a-col>
         </a-row>
         <a-col :span="24" style="text-align: center;">
-          <a-button type="primary" size="default" @click="toNext">下一步</a-button>
+          <a-button type="primary" size="default" @click="toNext" style="margin-right: 8px;">下一步</a-button>
           <a-button type="default" size="default" @click="close">退出</a-button>
         </a-col>
       </a-form-model>

src/views/project/form/ProjectPersonForm.vue

@@ -1,23 +1,16 @@
 <template>
   <a-card :bordered="false" title="项目人员信息">
-    <template slot="extra">
+    <!-- <template slot="extra">
       <a-button type="primary" size="default" @click="toNext">下一步</a-button>
     </template>
     <template slot="extra">
       <a-button type="primary" size="default" @click="toPrev">上一步</a-button>
-    </template>
+    </template> -->
     <a-row type="flex" justify="center" align="top">
       <a-col :span="4" id="tree">
         <a-page-header title="单位列表" sub-title="" />
         <div v-if="this.orgTree != ''">
-          <a-tree
+          <a-tree :treeData="orgTree" v-if="orgTree.length" @select="onSelect" :defaultExpandAll="true" :defaultExpandedKeys="defaultExpandedKeys" :replaceFields="replaceFields">
-            :treeData="orgTree"
-            v-if="orgTree.length"
-            @select="onSelect"
-            :defaultExpandAll="true"
-            :defaultExpandedKeys="defaultExpandedKeys"
-            :replaceFields="replaceFields"
-          >
             <a-icon slot="switcherIcon" type="down" />
           </a-tree>
         </div>
@@ -42,13 +35,7 @@
               <a-button style="margin-left: 8px" @click="() => (queryParam = {})">重置</a-button>
             </a-row>
           </a-form>
-          <s-table
+          <s-table ref="table" :columns="columns" :data="loadData" :rowKey="(record) => record.id" :rowSelection="{ selectedRowKeys: selectedRowKeys, selectedRows: selectedRows, onChange: onSelectChange }">
-            ref="table"
-            :columns="columns"
-            :data="loadData"
-            :rowKey="(record) => record.id"
-            :rowSelection="{ selectedRowKeys: selectedRowKeys, selectedRows: selectedRows, onChange: onSelectChange }"
-          >
             <span slot="serial" slot-scope="text, record, index">
               {{ index + 1 }}
             </span>
@@ -64,6 +51,10 @@
         </a-col>
       </a-col>
     </a-row>
+    <a-col :span="24" style="text-align: center;">
+      <a-button type="primary" size="default" @click="toPrev" style="margin-right: 8px;">上一步</a-button>
+      <a-button type="primary" size="default" @click="toNext">下一步</a-button>
+    </a-col>
   </a-card>
 </template>
 

src/views/project/form/ProjectTestPaperFormationStrategy.vue

@@ -1,6 +1,6 @@
 <template>
   <a-card :bordered="false" title="组卷策略信息">
-    <template slot="extra">
+    <!-- <template slot="extra">
       <a-button type="primary" size="default" @click="toPrev">上一步</a-button>
     </template>
     <template slot="extra">
@@ -8,7 +8,7 @@
     </template>
     <template slot="extra">
       <a-button type="primary" size="default" @click="toIssue">发布</a-button>
-    </template>
+    </template> -->
     <a-form-model :rules="rules" :model="form" v-bind="formItemLayout">
       <a-row :gutter="24">
         <a-col :md="10" :sm="12">
@@ -54,6 +54,11 @@
         </a-table>
       </a-card>
     </a-form-model>
+    <a-col :span="24" style="text-align: center;">
+      <a-button type="primary" size="default" @click="toPrev" style="margin-right: 8px;">上一步</a-button>
+      <a-button type="primary" size="default" @click="toSave" style="margin-right: 8px;">保存</a-button>
+      <a-button type="primary" size="default" @click="toIssue">发布</a-button>
+    </a-col>
   </a-card>
 </template>
 
@@ -118,7 +123,7 @@ export default {
           title: '总分',
           dataIndex: 'totalScore',
           customRender: (value, row, index) => {
-            return { children: value, attrs: { rowSpan: index == 0 ? 3 : 0 } }
+            return { children: value, attrs: { rowSpan: index == 0 ? 5 : 0 } }
           },
         },
       ],
@@ -150,7 +155,10 @@ export default {
   // 生命周期 - 创建完成（可以访问当前this实例）
   created() {
     if (this.tableData.length == 0) {
-      getQuestionNumByCourseIds({ids:this.form.lessonIds}).then((res) => {
+      let ids = this.form.lessonIds.map((t) => {
+        return  parseInt(t.ids);
+      })
+      getQuestionNumByCourseIds({ ids: ids}).then((res) => {
         this.tableData = res.data
       })
     }
@@ -174,4 +182,4 @@ export default {
 }
 </script>
 <style scoped>
-</style>
+</style>ß