Commit Graph

1782 Commits

Author SHA1 Message Date
lixg
25063036af feat:修改版本号 2022-12-19 22:20:57 +08:00
lixg
1d968037ae feat:合并 2022-12-19 21:44:44 +08:00
lixg
360b068a1b fix:修改公告内容 2022-12-19 21:44:20 +08:00
yuping
829a799c99 -- 不带出名称 2022-12-19 21:41:38 +08:00
yuping
83a0ae8e18 -- 开课学员bug 2022-12-19 21:37:23 +08:00
yuping
66464fee6a Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/views/learningpath/LearningPath.vue
#	src/views/projectcenter/ProjectManage.vue
2022-12-19 21:03:03 +08:00
yuping
f8650e799a -- 学员数 2022-12-19 21:01:13 +08:00
lixg
23f3d134c5 feat:合并 2022-12-19 20:45:54 +08:00
lixg
d8e0b3c1b5 fix:修改发布学员人数 2022-12-19 20:45:23 +08:00
yuping
7fa58cdea1 -- bug 2022-12-19 20:38:02 +08:00
yuping
dd9c9cbf4c -- bug 2022-12-19 20:18:14 +08:00
yuping
d7aa5fc856 -- bug 2022-12-19 19:56:27 +08:00
yuping
78ecfd3d6a -- 学员泪飙默认不展示 2022-12-19 19:41:08 +08:00
yuping
790030d8d1 -- 项目不需要选择阶段 2022-12-19 19:35:54 +08:00
yuping
3c2d8ca5f5 Merge remote-tracking branch 'origin/develop' into develop 2022-12-19 18:27:43 +08:00
yuping
47648682a5 -- 学员添加进度和最后学习时间 2022-12-19 18:27:24 +08:00
lixg
27f17155a9 feat:修改编辑评估 2022-12-19 17:38:32 +08:00
lixg
35f561c411 feat:合并 2022-12-19 17:34:00 +08:00
lixg
ff2a15ae1f fix:修改学员操作样式 2022-12-19 17:33:25 +08:00
yuping
045efac89e -- bug 2022-12-19 17:24:12 +08:00
yuping
603a725970 Merge remote-tracking branch 'origin/develop' into develop 2022-12-19 17:20:02 +08:00
yuping
dc591453e1 -- bug 2022-12-19 17:19:50 +08:00
lixg
ca49ab9dfc feat:合并 2022-12-19 14:34:57 +08:00
lixg
0c7db91d78 feat:合并 2022-12-19 10:16:52 +08:00
zhangyc
47a0b9a89f console.log("版本0.9.16------------"); 2022-12-19 09:05:45 +08:00
zhangyc
c3dc9b711a 开课评估回显 2022-12-19 08:03:52 +08:00
zhangyc
fa7896c044 面授评估回显 2022-12-19 07:57:52 +08:00
zhangyc
68686f6e95 评估题目 2022-12-18 23:11:15 +08:00
zhangyc
1922a0a5df Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-18 22:57:43 +08:00
zhangyc
d22d80ae38 评估列表bug 2022-12-18 22:57:38 +08:00
lixg
777b257b1b feat:合并 2022-12-18 21:16:14 +08:00
yuping
29faef7d52 -- bug 2022-12-18 20:44:43 +08:00
yuping
ac62da7d5c -- bug 2022-12-18 17:18:19 +08:00
yuping
bf1d3a70e3 -- bug 2022-12-18 17:00:06 +08:00
yuping
a013339aaa Merge remote-tracking branch 'origin/develop' into develop 2022-12-18 16:31:47 +08:00
yuping
a19b1afe69 -- bug 2022-12-18 16:31:19 +08:00
yuping
034a75424a -- 添加学员 2022-12-18 13:49:23 +08:00
zhangyc
e840fa2cc1 merge 2022-12-17 21:27:31 +08:00
zhangyc
79d4a0db00 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-17 21:21:44 +08:00
zhangyc
3a4ad2e7af 评估列表 2022-12-17 21:20:36 +08:00
lixg
85f84ddee4 feat:合并 2022-12-17 20:50:43 +08:00
yuping
d057c9b66c Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/views/projectcenter/TaskPage.vue
2022-12-17 17:41:47 +08:00
yuping
c1983082a5 -- 添加学员 2022-12-17 17:40:47 +08:00
lixg
9b8d2a700d feat:合并 2022-12-17 15:26:14 +08:00
zhangyc
94e0982817 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-16 17:47:35 +08:00
zhangyc
6bd7df51f9 直播时间 2022-12-16 16:24:35 +08:00
yuping
9090261a8f -- 修改 2022-12-16 14:27:06 +08:00
yuping
47aa65ff43 -- 修改 2022-12-16 14:13:00 +08:00
yuping
faab473261 -- 修改 2022-12-16 14:11:46 +08:00
yuping
3a7c6e4601 -- 修改 2022-12-16 14:00:55 +08:00