From eb13a01c2c5f05b18326d05f926af42ec655e9e5 Mon Sep 17 00:00:00 2001
From: Yuanjianghong <hbzgyjh@126.com>
Date: Mon, 8 Nov 2021 10:18:45 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project/ProjectStepForm.vue         |  2 +-
 src/views/project/form/ProjectCourseList.vue  | 28 ++++++-------------
 .../project/form/ProjectCourseSelect.vue      | 12 +++-----
 src/views/project/form/ProjectForm.vue        |  4 +--
 4 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/src/views/project/ProjectStepForm.vue b/src/views/project/ProjectStepForm.vue
index 9a64d7a..2627017 100644
--- a/src/views/project/ProjectStepForm.vue
+++ b/src/views/project/ProjectStepForm.vue
@@ -1,7 +1,7 @@
 <template>
   <!-- PageHeader 第二种使用方式 (v-slot) -->
   <a-card :bordered="false" :title="title">
-    <a-steps class="steps" :current="currentTab">
+    <a-steps class="steps" type="navigation" :current="currentTab">
       <a-step title="基本信息" />
       <a-step title="选择单位" />
       <!-- v-if="['2', '3', '4'].includes(form.trainWay)" -->
diff --git a/src/views/project/form/ProjectCourseList.vue b/src/views/project/form/ProjectCourseList.vue
index fae88a5..be0a795 100644
--- a/src/views/project/form/ProjectCourseList.vue
+++ b/src/views/project/form/ProjectCourseList.vue
@@ -9,7 +9,7 @@
         <a-button icon="select" @click="$refs.CourseSelect.edit({})">添加课程</a-button>
       </a-space>
 
-      <s-table ref="table" size="default" rowKey="id" :columns="columns" :data="loadData">
+      <s-table ref="table" size="default" rowKey="id" :columns="columns" :data="data1">
         <span slot="serial" slot-scope="text, record, index">
           {{ index + 1 }}
         </span>
@@ -49,34 +49,24 @@ export default {
   data() {
     //这里存放数据
     return {
-      form: this.$form.createForm(this, { name: 'project' }),
+      labelCol: {},
+      wrapperCol: {},
+      vertical: 'vertical',
+      data1: {},
       totalHours: 0, //总课时
       totalLearnHours: 0, //总学时
       totalTopicNum: 0, //题目数量
-      //查询数据
-      queryParam: {},
-      // 表头
+      queryParam: {},//查询数据
       columns: [
         { title: '序号', key: 'id', dataIndex: 'id', width: 60, scopedSlots: { customRender: 'serial' } },
         { title: '课程编号', dataIndex: 'courseNo', key: 'courseNo' },
         { title: '课程名称', dataIndex: 'courseName', key: 'courseName' },
         { title: '课时', dataIndex: 'courseHours', key: 'courseHours', customRender: (text) => text + '分' },
         { title: '学时要求', dataIndex: 'learnHours', key: 'learnHours', customRender: (text) => text + '分' },
-        { title: '题量', dataIndex: 'topicNumber', key: 'projectName' },
+        { title: '题量', dataIndex: 'topicNumber', key: 'topicNumber' },
         { title: '项目名称', dataIndex: 'projectName', key: 'projectName' },
-        {
-          title: '操作',
-          width: 200,
-          align: 'center',
-          scopedSlots: { customRender: 'action' },
-        },
-      ],
-      // 加载数据方法 必须为 Promise 对象
-      loadData: (parameter) => {
-        return getProjectList(Object.assign(parameter, this.queryParam)).then((res) => {
-          return res
-        })
-      },
+        { title: '操作', width: 200, align: 'center', scopedSlots: { customRender: 'action' }, },
+      ],      // 表头
     }
   },
   //计算属性 类似于data概念
diff --git a/src/views/project/form/ProjectCourseSelect.vue b/src/views/project/form/ProjectCourseSelect.vue
index 1b882dd..5688663 100644
--- a/src/views/project/form/ProjectCourseSelect.vue
+++ b/src/views/project/form/ProjectCourseSelect.vue
@@ -12,8 +12,8 @@
     <a-row type="flex" justify="center" align="top">
       <a-col :span="6">
         <a-menu v-model="current" mode="horizontal">
-          <a-menu-item key="mail"> <a-icon type="mail" />系统课程</a-menu-item>
-          <a-menu-item key="app"> <a-icon type="appstore" />自制课程</a-menu-item>
+          <a-menu-item key="sys"> <a-icon type="mail" />系统课程</a-menu-item>
+          <a-menu-item key="self"> <a-icon type="appstore" />自制课程</a-menu-item>
         </a-menu>
         <a-input-search style="margin-bottom: 8px" placeholder="Search" @change="onChange" />
         <a-tree
@@ -43,10 +43,6 @@
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）
 //例如：import 《组件名称》 from '《组件路径》'
 
-/**------------------------------------------------------------ */
-420500199901110031
-/**----------------------------------------------------------------- */
-
 export default {
   //import引入的组件需要注入到对象中才能使用
   components: {},
@@ -57,11 +53,11 @@ export default {
       visible: false,
       confirmLoading: false,
       current: ['mail'],
-
+      modalTitle: '',
       expandedKeys: [],
       searchValue: '',
       autoExpandParent: true,
-      gData,
+      gData: [],
     }
   },
   //计算属性 类似于data概念
diff --git a/src/views/project/form/ProjectForm.vue b/src/views/project/form/ProjectForm.vue
index 9dc747e..26b550f 100644
--- a/src/views/project/form/ProjectForm.vue
+++ b/src/views/project/form/ProjectForm.vue
@@ -86,13 +86,13 @@
           <a-form-item :style="{ display: 'inline-block', width: 'calc(30% - 1px)' }">
             <a-input-number v-model="form.examNumber" :min="0" style="width: 100%" />
           </a-form-item>
-          <span> 补考次数: </span>
+          <!-- <span> 补考次数: </span>
           <a-form-item :style="{ display: 'inline-block', width: 'calc(30% - 1px)' }">
             <a-input-number v-model="form.resitNumber" :min="0" style="width: 100%" />
           </a-form-item>
           <a-form-item :style="{ display: 'inline-block', width: 'calc(30% - 1px)' }">
             <a-button type="primary" @click="randomResit"> 随机补考 </a-button>
-          </a-form-item>
+          </a-form-item> -->
         </a-form-item>
       </a-col>