From 5199b00cf4775b4377ec767f610555751c2409be Mon Sep 17 00:00:00 2001
From: cgd_mac <349008059@qq.com>
Date: Thu, 24 Feb 2022 16:49:31 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AD=A6=E5=91=98=E7=AB=AF=E9=A6=96?=
=?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/mycourse/index.js | 12 +-
src/config/router.config.js | 14 +-
.../mycourseList/CentralizedTraining.vue | 84 ++++--
.../CentralizedTrainingDetail.vue | 24 +-
src/views/myhome/index.vue | 275 ++++++++++++++++++
src/views/notice/NoticeDetail.vue | 3 +-
6 files changed, 370 insertions(+), 42 deletions(-)
create mode 100644 src/views/myhome/index.vue
diff --git a/src/api/mycourse/index.js b/src/api/mycourse/index.js
index 1a013ba..ee7a979 100644
--- a/src/api/mycourse/index.js
+++ b/src/api/mycourse/index.js
@@ -4,7 +4,9 @@ const mycourseApi = {
mycourseList: 'myCourse/getMyCourseList', // 我的课程列表,课程搜索
addMyCourse: 'myCourse/addMyCourse', // 添加课程
centerList: 'focused/training/list', // 集中培训列表
- centerDetail: 'focused/training/list', // 集中培训详情
+ centerDetail: 'focusTrain/getDetail', // 集中培训详情
+ centerJoin: 'project/terminalTrain/enroll', // 集中培训报名
+ centerSign: 'project/terminalTrain/sign', // 集中培训签到
recommendList: 'sys/recommend/listPage', // 系统推荐课程列表
recommendDetail: 'sys/recommend/detail', // 系统课程推荐详情
getCourseDetail: 'myCourse/getCourseDetail', // 我的课程详情
@@ -18,6 +20,14 @@ const mycourseApi = {
getMyCourseList: 'studyStatistics/getMyCourseList' // 课程学习统计
}
+export function reqCenterJoin (data) {
+ return request({
+ url: mycourseApi.centerJoin,
+ method: 'POST',
+ data: data
+ })
+}
+
export function reqMycourseCount (params) {
return request({
url: mycourseApi.getMyCourseList,
diff --git a/src/config/router.config.js b/src/config/router.config.js
index 8731450..3b82a75 100644
--- a/src/config/router.config.js
+++ b/src/config/router.config.js
@@ -1,5 +1,5 @@
// eslint-disable-next-line
-import { UserLayout, BasicLayout, RouteView } from '@/layouts'
+import { UserLayout, BasicLayout, RouteView } from '@/layouts';
import { bxAnaalyse } from '@/core/icons'
export const asyncRouterMap = [
@@ -16,20 +16,26 @@ export const asyncRouterMap = [
name: 'dashboard',
redirect: '/dashboard/workplace',
component: RouteView,
- meta: { title: '仪表盘', keepAlive: true, icon: bxAnaalyse /* permission: [ 'dashboard' ] */ },
+ meta: {
+ title: '仪表盘',
+ keepAlive: true,
+ icon: bxAnaalyse /* permission: [ 'dashboard' ] */
+ },
children: [
{
path: 'workplace',
name: 'Workplace',
component: () => import('@/views/dashboard/Workplace'),
- meta: { title: '工作台', keepAlive: false/*, permission: [ 'dashboard' ] */ }
+ meta: { title: '工作台', keepAlive: false /*, permission: [ 'dashboard' ] */ }
}
]
}
]
},
{
- path: '*', redirect: '/404', hidden: true
+ path: '*',
+ redirect: '/404',
+ hidden: true
}
]
diff --git a/src/views/mycourse/mycourseList/CentralizedTraining.vue b/src/views/mycourse/mycourseList/CentralizedTraining.vue
index fc8ea26..b54d9fc 100644
--- a/src/views/mycourse/mycourseList/CentralizedTraining.vue
+++ b/src/views/mycourse/mycourseList/CentralizedTraining.vue
@@ -1,28 +1,39 @@
-
+
+ :rowKey="record => record.id"
+ >
+
+ {{record.trainName}}
+
{{ record.trainSdate }}至{{ record.trainEdate }}
未发布
- 未开始
- 进行中
- 已结束
- 已中止
+ 未开始
+ 进行中
+ 已结束
+ 已中止
-
- 培训详情
+
+ 报名参加
+
+ 已报名
@@ -30,21 +41,22 @@
diff --git a/src/views/mycourse/mycourseList/CentralizedTrainingDetail.vue b/src/views/mycourse/mycourseList/CentralizedTrainingDetail.vue
index a5d841e..17b6b3c 100644
--- a/src/views/mycourse/mycourseList/CentralizedTrainingDetail.vue
+++ b/src/views/mycourse/mycourseList/CentralizedTrainingDetail.vue
@@ -1,5 +1,11 @@
-
+
{{ data.trainName }}
@@ -16,21 +22,19 @@
{{ data.learningContent }}
-
- {{ data.contact }}({{ data.phone }})
-
+ {{ data.contact }}({{ data.phone }})
{{ data.remark }}
+
diff --git a/src/views/notice/NoticeDetail.vue b/src/views/notice/NoticeDetail.vue
index 9be07af..48a5033 100644
--- a/src/views/notice/NoticeDetail.vue
+++ b/src/views/notice/NoticeDetail.vue
@@ -131,7 +131,8 @@ export default {
methods: {
// 返回 按钮
close () {
- this.$router.push({ path: '/notice/list', query: {} })
+ // this.$router.push({ path: '/notice/list', query: {} })
+ this.$router.go(-1)
},
getDetail (id) {
noticeGet({ id: id }).then(res => {