yuping
|
59cff1b7a9
|
-- 项目名称校验
|
2022-12-10 21:29:22 +08:00 |
|
yuping
|
ee870a1d80
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-12-10 21:15:33 +08:00 |
|
yuping
|
f74c68fc25
|
-- 项目名称校验
|
2022-12-10 21:00:42 +08:00 |
|
wyx
|
400af51269
|
style:面授管理时间搜索样式修改
|
2022-12-10 20:21:48 +08:00 |
|
wyx
|
10725d6e05
|
fix:项目/课程审核日志展示
|
2022-12-10 20:14:45 +08:00 |
|
wyx
|
0a8e7c3651
|
fix:审核管理待审核和已审核课程课程分类回显
|
2022-12-10 19:05:56 +08:00 |
|
wyx
|
fc40fb41fb
|
fix:编辑面授课分类问题
|
2022-12-10 18:48:09 +08:00 |
|
wyx
|
a39684a29f
|
fix:面授课分类回显
|
2022-12-10 18:37:48 +08:00 |
|
yuping
|
d88364b2f6
|
-- 组员名单bug
|
2022-12-10 18:22:24 +08:00 |
|
yuping
|
d05d21eb78
|
-- 学员添加
|
2022-12-10 18:13:30 +08:00 |
|
yuping
|
45c404464a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-12-10 18:05:55 +08:00 |
|
yuping
|
05695d18f9
|
-- 学员添加
|
2022-12-10 18:05:46 +08:00 |
|
yuping
|
4a66e1a657
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# src/views/courselibrary/courseModal.vue
|
2022-12-10 17:52:36 +08:00 |
|
yuping
|
0133b49fdd
|
-- 内容分类
|
2022-12-10 17:51:37 +08:00 |
|
lixg
|
481ba9fb42
|
feat:合并
|
2022-12-10 17:51:36 +08:00 |
|
lixg
|
705f408c78
|
fix:修改学习路径创建时间搜索
|
2022-12-10 17:51:16 +08:00 |
|
wyx
|
bf3579b60c
|
fix:下拉框不跟随滚动问题
|
2022-12-10 17:43:24 +08:00 |
|
wyx
|
32a11ea121
|
fix:增加面授课内容分类
|
2022-12-10 17:40:52 +08:00 |
|
yuping
|
4b8fcc7503
|
-- 学员不回显
|
2022-12-10 17:08:41 +08:00 |
|
yuping
|
a08906df47
|
-- loading
|
2022-12-10 16:48:30 +08:00 |
|
yuping
|
c15e2c2809
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# src/views/projectcenter/ProjectAdd.vue
# src/views/projectcenter/ProjectManage.vue
|
2022-12-10 16:41:41 +08:00 |
|
yuping
|
7864c1ec0f
|
-- 样式修改
|
2022-12-10 16:41:08 +08:00 |
|
lixg
|
d3517aee53
|
feat:合并
|
2022-12-10 16:38:43 +08:00 |
|
lixg
|
1ecca577c2
|
feat:隐藏左侧导航栏没有的功能
|
2022-12-10 16:37:22 +08:00 |
|
yuping
|
e905422a8e
|
-- 样式修改
|
2022-12-10 16:33:48 +08:00 |
|
yuping
|
57916500fb
|
-- 样式修改
|
2022-12-10 16:25:05 +08:00 |
|
yuping
|
56a52e6e77
|
-- 样式修改
|
2022-12-10 16:16:32 +08:00 |
|
yuping
|
2aa428b17f
|
-- 样式修改
|
2022-12-10 16:13:51 +08:00 |
|
yuping
|
9627d7675b
|
-- 样式修改
|
2022-12-10 16:11:24 +08:00 |
|
yuping
|
d296d9cfc2
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# src/views/projectcenter/ProjectAdd.vue
|
2022-12-10 16:08:17 +08:00 |
|
yuping
|
dc4ed49418
|
-- 样式修改
|
2022-12-10 16:00:54 +08:00 |
|
lixg
|
8c231335a3
|
feat:合并
|
2022-12-10 15:55:09 +08:00 |
|
lixg
|
7aebd9c345
|
feat:添加在线课面授课任务命名规则
|
2022-12-10 15:52:53 +08:00 |
|
yuping
|
428509096b
|
-- 样式修改
|
2022-12-10 15:37:33 +08:00 |
|
yuping
|
f35e3bf729
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-12-10 15:37:14 +08:00 |
|
yuping
|
4a06cfc4c6
|
-- 样式修改
|
2022-12-10 15:37:01 +08:00 |
|
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 |
|
yuping
|
664dc9500c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-12-10 15:27:51 +08:00 |
|
yuping
|
4579c619fb
|
-- 样式修改
|
2022-12-10 15:27:42 +08:00 |
|
lixg
|
37774b1940
|
feat:合并
|
2022-12-10 15:22:40 +08:00 |
|
lixg
|
0ec71a065f
|
feat:增加面授提示
|
2022-12-10 15:22:03 +08:00 |
|
yuping
|
39f8bd9830
|
-- 新建学员管理
|
2022-12-10 14:49:53 +08:00 |
|
wyx
|
aed2511d4f
|
style:增加favicon图标更改fe-manage文字显示为京东方大学堂
|
2022-12-10 12:14:59 +08:00 |
|
wyx
|
fbb93fcac1
|
fix:顶部tab显示问题
|
2022-12-10 12:01:09 +08:00 |
|
wyx
|
86b476d63b
|
fix:调整课程库显示顺序,增加在线管理界面嵌入
|
2022-12-10 11:57:01 +08:00 |
|
wyx
|
97865d336e
|
fix:课程管理页面样式修改
|
2022-12-10 11:38:46 +08:00 |
|
zhangyc
|
6fc160ae79
|
关卡改管理
|
2022-12-10 11:00:21 +08:00 |
|
wyx
|
7d3ad6efc0
|
fix
|
2022-12-10 10:11:23 +08:00 |
|
yuping
|
d748163daa
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-12-09 18:33:09 +08:00 |
|