Commit Graph

1370 Commits

Author SHA1 Message Date
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
yuping
430699e020 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/views/courselibrary/CoursewareManage.vue
2022-12-08 18:10:14 +08:00
yuping
c18c6566d3 -- bug 2022-12-08 18:07:21 +08:00
kclf
69ce539b5a t 2022-12-08 17:32:52 +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
58d80e0f38 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-08 17:21:38 +08:00
zhangyc
025f3c47f9 审核意见字数限制 2022-12-08 17:21:34 +08:00
wyx
666929935c Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-08 17:17:42 +08:00
wyx
805241a90e 修改版本号 2022-12-08 17:17:38 +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
wyx
2749baf7c6 fix:展示图片判断 2022-12-08 16:59:21 +08:00
lixg
3bcb5e3efe feat:合并 2022-12-08 16:56:54 +08:00
lixg
eec179f6b5 fix:增加面授课签到和课程二维码 2022-12-08 16:56:36 +08:00
wyx
4948756a6e Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-08 16:48:10 +08:00
wyx
c2584cf342 增加待审核课程附件前方图标根据不同文件格式进行展示 2022-12-08 16:48:06 +08:00
lixg
53feaf313c feat:合并 2022-12-08 16:00:56 +08:00
lixg
9a22f3d547 fix:修改单层项目创建及编辑成功后的跳转 2022-12-08 16:00:36 +08:00
wyx
bda0bc3e0f fix:模板库测评任务添加 2022-12-08 15:59:21 +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
lixg
d079b21a9f feat:合并 2022-12-08 15:24:26 +08:00
lixg
a189d96260 fix:修改学员总数不一致 2022-12-08 15:24:08 +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
49dbe74893 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-08 14:58:00 +08:00
zhangyc
167f4b1906 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-08 14:57:56 +08:00
wyx
ebacaecd9e fix:模板库增加添加案例 2022-12-08 14:55:08 +08:00
zhangyc
ef10e097cb 面授课bug 2022-12-08 14:53:33 +08:00
lixg
84ee457c09 feat:合并 2022-12-08 14:33:11 +08:00
lixg
25c220e84d fix:修改投票 2022-12-08 14:32:53 +08:00
yuping
7d2c3d4fd9 -- bug 2022-12-08 13:57:50 +08:00
yuping
5ac44cef02 -- bug 2022-12-08 13:09:09 +08:00
yuping
2f0758b8ef Merge remote-tracking branch 'origin/develop' into develop 2022-12-08 12:49:12 +08:00
yuping
88a59aa9d6 -- 取消localstory缓存 2022-12-08 12:48:57 +08:00
wyx
2f073b259d fix:模板库添加阶段及添加在线任务 2022-12-08 12:44:53 +08:00
zhangyc
f93419b046 模板公告 2022-12-08 12:37:35 +08:00
zhangyc
1c166746a9 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-08 09:00:00 +08:00
zhangyc
bfbe1d9550 公告 2022-12-08 08:49:57 +08:00
lixg
819617a698 fix:修改版本号 2022-12-08 08:49:16 +08:00
lixg
300b88009a feat:合并 2022-12-08 08:48:45 +08:00
yuping
20ccdff24f -- 项目模板修改 2022-12-08 02:54:21 +08:00
yuping
9c20c64649 -- bug 2022-12-08 02:05:56 +08:00
yuping
cd7ba1f674 -- bug 2022-12-08 00:55:11 +08:00