From ac8975365566e7a39cc2949fa65c25885a1d02c8 Mon Sep 17 00:00:00 2001
From: Yuanjianghong <hbzgyjh@126.com>
Date: Wed, 1 Sep 2021 11:12:32 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/project/project.js                    |   2 +-
 .../project/form/ProjectCourseSelect.vue      | 140 ++++++++++++++----
 src/views/project/form/ProjectStepForm.vue    |   4 +-
 3 files changed, 118 insertions(+), 28 deletions(-)

diff --git a/src/api/project/project.js b/src/api/project/project.js
index 5dcef94..3409795 100644
--- a/src/api/project/project.js
+++ b/src/api/project/project.js
@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 const projectApi = {
   add: 'project/add',
-  getDict:'projecct/getDict',
+  getDict:'project/dict/get',
 //   get: 'sys/menu/get',
 //   update: 'sys/menu/update',
 //   del: 'sys/menu/delete',
diff --git a/src/views/project/form/ProjectCourseSelect.vue b/src/views/project/form/ProjectCourseSelect.vue
index f542728..8d6824f 100644
--- a/src/views/project/form/ProjectCourseSelect.vue
+++ b/src/views/project/form/ProjectCourseSelect.vue
@@ -1,38 +1,126 @@
 <template>
-<div>
-    <h1>课程选择</h1>
-</div>
+  <div>
+    <a-form-model :model="form" :label-col="labelCol" :wrapper-col="wrapperCol" :layout="vertical">
+      <a-space direction="vertical" style="width: 100%">
+        <a-space direction="horizontal">
+          <span>总课时：{{ totalHours }}, 总学时要求：{{ totalLearnHours }}, 总题目数量：{{ totalTopicNum }} </span>
+          课程名:
+          <a-input v-model="queryParam.projectName" style="width: 100%" />
+          <a-button type="primary" icon="search" @click="$refs.table.refresh(true)">查询</a-button>
+          <a-button icon="select" @click="() => (queryParam = {})">添加课程</a-button>
+        </a-space>
+        <s-table
+          ref="table"
+          size="default"
+          rowKey="id"
+          :columns="columns"
+          :data="loadData"
+          :rowSelection="options.rowSelection"
+        >
+          <span slot="serial" slot-scope="text, record, index">
+            {{ index + 1 }}
+          </span>
+          <!--  slot-scope="text, record" -->
+          <span slot="action">
+            <template>
+              <a-button type="primary" icon="search" @click="$refs.table.refresh(true)">课程预览</a-button>
+              <a-button type="primary" icon="search" @click="$refs.table.refresh(true)">题库预览</a-button>
+              <a-button type="primary" icon="search" @click="$refs.table.refresh(true)">必选题设置</a-button>
+              <!-- <a href="javascript:;" @click="handleEdit(record)">修改</a>
+            <a-divider type="vertical" />
+            <a-popconfirm title="是否删除?" @confirm="() => handleDelete(record)">
+              <a href="javascript:;">删除</a>
+            </a-popconfirm>
+            <a-divider type="vertical" />
+            <a href="javascript:;" @click="handleDetail(record)">详情</a>
+            <a-divider type="vertical" /> -->
+            </template>
+          </span>
+        </s-table>
+        <a-form-model-item :wrapper-col="{ span: 14, offset: 4 }">
+          <a-button type="primary" @click="toNext"> 下一步 </a-button>
+          <a-button style="margin-left: 10px"> 取消 </a-button>
+        </a-form-model-item>
+      </a-space>
+    </a-form-model>
+  </div>
 </template>
 
 <script>
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）
 //例如：import 《组件名称》 from '《组件路径》'
+import { STable } from '@/components'
 
 export default {
-//import引入的组件需要注入到对象中才能使用
-components: {},
-props: {},
-data() {
-//这里存放数据
-return {};
-},
-//计算属性 类似于data概念
-computed: {},
-//监控data中的数据变化
-watch: {},
-//方法集合
-methods: {},
-created() {},  //生命周期 - 创建完成（可以访问当前this实例）
-mounted() {}, //生命周期 - 挂载完成（可以访问DOM元素）
-beforeCreate() {}, //生命周期 - 创建之前
-beforeMount() {}, //生命周期 - 挂载之前
-beforeUpdate() {}, //生命周期 - 更新之前
-updated() {}, //生命周期 - 更新之后
-beforeDestroy() {}, //生命周期 - 销毁之前
-destroyed() {}, //生命周期 - 销毁完成
-activated() {} //如果页面有keep-alive缓存功能，这个函数会触发
-};
+  //import引入的组件需要注入到对象中才能使用
+  components: {
+    STable,
+  },
+  props: {},
+  data() {
+    //这里存放数据
+    return {
+      form: {},
+      totalHours: 0, //总课时
+      totalLearnHours: 0, //总学时
+      totalTopicNum: 0, //题目数量
+      //查询数据
+      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: '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
+        })
+      },
+    }
+  },
+  //计算属性 类似于data概念
+  computed: {},
+  //监控data中的数据变化
+  watch: {},
+  //方法集合
+  methods: {
+    toNext() {
+      console.log('ProjectCourseSelect-toNext', this.form)
+      const {
+        form: { validateFields },
+      } = this
+      // 先校验，通过表单校验后，才进入下一步
+      validateFields((err, values) => {
+        if (!err) {
+          this.$emit('nextStep')
+        }
+      })
+    },
+  },
 
+  //生命周期 - 创建完成（可以访问当前this实例）
+  created() {},
+  mounted() {}, //生命周期 - 挂载完成（可以访问DOM元素）
+  beforeCreate() {}, //生命周期 - 创建之前
+  beforeMount() {}, //生命周期 - 挂载之前
+  beforeUpdate() {}, //生命周期 - 更新之前
+  updated() {}, //生命周期 - 更新之后
+  beforeDestroy() {}, //生命周期 - 销毁之前
+  destroyed() {}, //生命周期 - 销毁完成
+  activated() {}, //如果页面有keep-alive缓存功能，这个函数会触发
+}
 </script>
 <style scoped>
 </style>
\ No newline at end of file
diff --git a/src/views/project/form/ProjectStepForm.vue b/src/views/project/form/ProjectStepForm.vue
index 80df7b0..745058b 100644
--- a/src/views/project/form/ProjectStepForm.vue
+++ b/src/views/project/form/ProjectStepForm.vue
@@ -45,11 +45,13 @@ export default {
   methods: {
 
     // handler
+    //下一步
     nextStep () {
-      if (this.currentTab < 2) {
+      if (this.currentTab < 5) {
         this.currentTab += 1
       }
     },
+    //上一步
     prevStep () {
       if (this.currentTab > 0) {
         this.currentTab -= 1

From e06874281e099495116d3c3c3956ac8e449ef54a Mon Sep 17 00:00:00 2001
From: qinjie <jqinjie@foxmail.com>
Date: Wed, 1 Sep 2021 14:44:31 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=BB=93=E6=9E=84?=
 =?UTF-8?q?=E6=A0=91=E9=80=89=E4=B8=AD=E7=BB=84=E4=BB=B6=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E9=80=89=E4=B8=AD=E7=AC=AC=E4=B8=80=E4=B8=AA=E8=8A=82=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/OrgTree/Index.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/OrgTree/Index.vue b/src/components/OrgTree/Index.vue
index 70feb80..c53935e 100644
--- a/src/components/OrgTree/Index.vue
+++ b/src/components/OrgTree/Index.vue
@@ -108,8 +108,14 @@ export default {
         this.selectKey = this.defaultOrganizationId;
         this.$emit('getSelectTreeKey', this.selectKey);
       }
+    } else {
+      // 如果没有传入默认显示节点 则自动显示树的第一个
+      let firstNode = this.treeData[0];
+      this.defaultSelectedKeys.push(firstNode.key);
+      this.selectTitle = firstNode.title;
+      this.selectKey = firstNode.key;
+      this.$emit('getSelectTreeKey', this.selectKey);
     }
-    console.log(this.defaultSelectedKeys)
   },
   methods: {
     // 点击组织机构数节点时调用

From c69726e30d4889fda99480aa3d0bb72f04eba6d9 Mon Sep 17 00:00:00 2001
From: qinjie <jqinjie@foxmail.com>
Date: Wed, 1 Sep 2021 14:49:07 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9C=BA=E6=9E=84?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=BB=84=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/OrgTree/Index.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/OrgTree/Index.vue b/src/components/OrgTree/Index.vue
index c53935e..0b3b1bf 100644
--- a/src/components/OrgTree/Index.vue
+++ b/src/components/OrgTree/Index.vue
@@ -122,6 +122,8 @@ export default {
     selectTree(selectedKeys, e) {
       this.selectKey = e.node.dataRef.key;
       this.selectTitle = e.node.dataRef.title;
+      this.defaultSelectedKeys = [];
+      this.defaultSelectedKeys.push(this.selectKey);
       this.$emit('getSelectTreeKey', this.selectKey);
     },
     // 展开/收起节点时触发