Commit Graph

465 Commits

Author SHA1 Message Date
wyx
d83ff7f13d Merge branch 'bugfix' into develop 2023-01-11 15:29:21 +08:00
wyx
10f871981e fix:修改项目阶段状态显示 2023-01-11 15:27:54 +08:00
wyx
c461261ce8 fix:修改项目阶段状态显示 2023-01-11 15:14:04 +08:00
yuping
ddbd8f900d Merge remote-tracking branch 'origin/develop' into develop 2023-01-11 10:57:12 +08:00
yuping
4db7257b57 -- 测试发版 2023-01-11 10:57:04 +08:00
zhangyc
2d1ceb0a9d Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-stu into develop 2023-01-11 10:23:44 +08:00
zhangyc
aeddb8e4fe 版本号 2023-01-11 10:23:37 +08:00
yuping
9fad4de01f Merge remote-tracking branch 'origin/develop' into develop 2023-01-11 10:19:50 +08:00
yuping
e1e9e7f721 -- bug 2023-01-11 10:19:37 +08:00
wyx
dabb995a30 feat:增加评估答题开始时间 2023-01-10 10:36:07 +08:00
wyx
e67dc797aa feat:增加评估开始时间字段 2023-01-10 09:13:04 +08:00
wyx
c51ebcfc7b fix:修改评估题目显示问题 2023-01-09 18:12:26 +08:00
zhangyc
d715b45c75 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-stu into develop 2023-01-01 19:35:51 +08:00
zhangyc
8df53386d4 未在有效时间范围内 2023-01-01 19:35:44 +08:00
yuping
414aa9831f -- 测评 2022-12-30 17:02:34 +08:00
yuping
51744fd187 Merge remote-tracking branch 'origin/develop' 2022-12-30 17:01:32 +08:00
yuping
1b008e3ef6 -- 测评 2022-12-30 17:01:10 +08:00
yuping
8e5e5734f0 Merge remote-tracking branch 'origin/develop'
# Conflicts:
#	src/App.vue
2022-12-30 16:26:05 +08:00
yuping
6eb6bacc9c Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/views/project/ProjectDetails.vue
2022-12-30 16:18:26 +08:00
yuping
76588c05a1 -- 状态 2022-12-30 16:17:32 +08:00
wyx
4d9b51b3ce fix:修改版本号 2022-12-30 15:37:43 +08:00
wyx
65f19cb014 fix:修改项目详情下案例外联已完成状态 2022-12-30 14:31:40 +08:00
wyx
1605258d06 fix:修改版本号 2022-12-30 11:07:07 +08:00
wyx
9b5325dd6b fix:面授课附件显示问题 2022-12-30 09:53:50 +08:00
wyx
7356eec843 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-stu into develop 2022-12-29 19:07:10 +08:00
wyx
16b18f5c98 fix:判断参数修改 2022-12-29 19:07:05 +08:00
yuping
f20a106a98 Merge remote-tracking branch 'origin/develop' into develop 2022-12-29 19:06:59 +08:00
yuping
9ae7fcd6c9 -- 是否允许公开报名 2022-12-29 19:06:53 +08:00
wyx
247f82a04b fix:增加项目详情当项目结束时候任务得提示及跳转到对应任务页面隐藏判断 2022-12-29 18:34:35 +08:00
wyx
6f3347cc1f fix:无阶段活动展示问题 2022-12-29 14:52:46 +08:00
wyx
4c8101d6ad fix:活动签到逻辑修改 2022-12-29 14:49:38 +08:00
wyx
c1186676ad fix:面授课详情界面课程开始时间结束时间错误修改 2022-12-29 11:11:02 +08:00
yuping
07b4ae218f -- 提示 2022-12-29 00:11:55 +08:00
yuping
f880a42fa2 Merge remote-tracking branch 'origin/manage-release' 2022-12-29 00:11:31 +08:00
yuping
cdcd3ae95f Merge remote-tracking branch 'origin/develop' into manage-release 2022-12-29 00:11:08 +08:00
yuping
048404c8ca Merge branch 'develop' into manage-release
# Conflicts:
#	src/router/index.js
2022-12-29 00:09:55 +08:00
wuyx
7191bb4ad6 fix:作业课程参数修改 2022-12-29 00:08:53 +08:00
yuping
334d04b59b -- 提示 2022-12-29 00:07:23 +08:00
yuping
a78ecd6b95 -- 提示 2022-12-29 00:00:01 +08:00
yuping
529c91bc46 -- 配置 2022-12-28 23:16:41 +08:00
yuping
4f5efab57c -- 正式环境配置 2022-12-28 23:15:14 +08:00
yuping
8ee92dda70 Merge remote-tracking branch 'origin/manage-release' 2022-12-28 22:36:32 +08:00
yuping
d68110cd9b -- 正式环境配置 2022-12-28 22:36:12 +08:00
yuping
e0551f1f3b -- 版本 2022-12-28 20:02:59 +08:00
yuping
925f7ff47b Merge remote-tracking branch 'origin/manage-release' 2022-12-28 19:58:55 +08:00
yuping
82216c755e -- 版本 2022-12-28 19:05:42 +08:00
yuping
a96a411d72 Merge branch 'develop' into manage-release 2022-12-28 19:00:20 +08:00
yuping
b96b99c4f2 Merge remote-tracking branch 'origin/develop' into develop 2022-12-28 18:59:56 +08:00
yuping
12d5cae847 -- 在线课进度 2022-12-28 18:59:27 +08:00
wyx
b84518b553 style:当面授直播无评估的时候,隐藏评估按钮 2022-12-28 17:38:14 +08:00