Commit Graph

219 Commits

Author SHA1 Message Date
wyx
23c2fe2a4d Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-10 15:33:33 +08:00
wyx
3616a04840 style:面授课程样式调整 2022-12-10 15:33:26 +08:00
lixg
37774b1940 feat:合并 2022-12-10 15:22:40 +08:00
lixg
0ec71a065f feat:增加面授提示 2022-12-10 15:22:03 +08:00
wyx
97865d336e fix:课程管理页面样式修改 2022-12-10 11:38:46 +08:00
zhangyc
ce2b3dae8a 面授课bug 2022-12-09 14:30:59 +08:00
zhangyc
ed067d7c75 添加评估 2022-12-09 14:24:03 +08:00
lixg
9d55980009 feat:合并 2022-12-09 14:23:01 +08:00
lixg
c853af3316 fix:修改开课时间搜索 2022-12-09 14:22:39 +08:00
wyx
573532c727 fix:项目阶段全部删除及最后一阶段删除提示信息 2022-12-09 14:20:44 +08:00
wyx
6d98d2b59e fix:增加附件上传名字 2022-12-09 11:06:07 +08:00
zhangyc
6b6fce5ebf 开课列表字段顺序 2022-12-09 08:50:48 +08:00
zhangyc
4ced3973c8 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-09 07:12:18 +08:00
zhangyc
5e18f93725 课程库 2022-12-09 07:11:11 +08:00
yuping
4da75211e7 Merge remote-tracking branch 'origin/develop' into develop 2022-12-08 23:44:02 +08:00
yuping
b9bab9475e -- 复制开课and学员清空 2022-12-08 23:43:50 +08:00
lixg
7d47445b7a feat:合并 2022-12-08 20:32:16 +08:00
lixg
a748ae9ad3 feat:增加学习路径基本信息编辑 2022-12-08 20:31:45 +08:00
yuping
b46395410a -- 复制开课 2022-12-08 18:22:23 +08:00
yuping
c760f80f2d Merge remote-tracking branch 'origin/develop' into develop 2022-12-08 18:17:24 +08:00
yuping
6a6f1336ea -- fix bug 2022-12-08 18:17:12 +08:00
kclf
6e2dd20436 Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2022-12-08 18:15:59 +08:00
kclf
abca23d7fb t 2022-12-08 18:15:55 +08:00
yuping
9da182902c -- 复制 2022-12-08 18:11:17 +08:00
kclf
18aab4cd4d t 2022-12-08 17:31:44 +08:00
kclf
c2c9974890 Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2022-12-08 17:29:55 +08:00
kclf
827b0cba95 t 2022-12-08 17:29:52 +08:00
zhangyc
89ff5d6752 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-08 17:14:19 +08:00
zhangyc
d74443e12b 公告历史 2022-12-08 17:14:13 +08:00
lixg
eec179f6b5 fix:增加面授课签到和课程二维码 2022-12-08 16:56:36 +08:00
zhangyc
eb90a2f65c Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-08 15:27:17 +08:00
zhangyc
beca7a1877 课程审核拒绝意见 2022-12-08 15:27:11 +08:00
kclf
30c13ad158 Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2022-12-08 15:00:22 +08:00
kclf
16987a7d3e bug修复 2022-12-08 14:59:49 +08:00
zhangyc
ef10e097cb 面授课bug 2022-12-08 14:53:33 +08:00
yuping
806cb101b9 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/views/courselibrary/CoursewareManage.vue
2022-12-08 00:41:13 +08:00
yuping
20bc4096ae -- 附件 2022-12-08 00:37:16 +08:00
kclf
d54f451122 课程带富文本的弹窗抽离 2022-12-07 23:56:59 +08:00
zhangyc
edddf1b21b 面授课保存按钮 2022-12-07 21:24:25 +08:00
kclf
99a2550097 t 2022-12-07 18:21:24 +08:00
yuping
e4309d55e1 Merge remote-tracking branch 'origin/develop' into develop 2022-12-07 12:43:18 +08:00
yuping
daeb7861b7 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/views/projectcenter/ProjectAdd.vue
2022-12-07 12:39:41 +08:00
kclf
8d400d9c3d 序号 2022-12-07 12:39:09 +08:00
kclf
1324fd9a91 Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2022-12-07 12:34:28 +08:00
kclf
dc0937c7f2 序号 2022-12-07 12:33:18 +08:00
wyx
bf34366018 fix:修改课程管理页面所有表格序号展示问题 2022-12-07 12:27:01 +08:00
yuping
c84e6beddb -- 课程bug 2022-12-07 12:23:30 +08:00
kclf
093514d374 时间 2022-12-07 12:23:05 +08:00
zhangyc
4ed7a4398d 修改提示 2022-12-07 08:50:51 +08:00
zhangyc
30b68631cb 开课评估回显 2022-12-07 08:33:55 +08:00