Commit Graph

1827 Commits

Author SHA1 Message Date
lixg
a862d18f18 style:修改添加学员滚动条 2022-12-21 09:54:44 +08:00
lixg
79249cb21f feat:修改版本号 2022-12-21 08:55:19 +08:00
lixg
22663e7e13 feat:合并 2022-12-21 08:47:55 +08:00
yuping
4036a56b29 Merge branch 'develop' into manage-release
# Conflicts:
#	.env.release
#	src/App.vue
2022-12-20 23:52:26 +08:00
yuping
207a453c27 -- bug 2022-12-20 21:38:58 +08:00
yuping
6c8045ff59 -- bug 2022-12-20 19:33:57 +08:00
yuping
b6cc723c25 -- 受众查询 2022-12-20 19:11:58 +08:00
yuping
389d0ac4a5 -- 受众查询 2022-12-20 18:56:33 +08:00
yuping
127039cc61 -- 受众查询 2022-12-20 18:48:10 +08:00
yuping
c5682075d0 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/components/student/CommonStudent.vue
2022-12-20 18:43:44 +08:00
yuping
d2d9992de9 -- 受众查询 2022-12-20 18:43:14 +08:00
lixg
4cacbfecfa feat:合并 2022-12-20 18:37:17 +08:00
lixg
48af0a81be feat:修改版本 2022-12-20 18:36:55 +08:00
yuping
0bbb4403e7 -- token bug 2022-12-20 18:35:15 +08:00
yuping
6cd7eb3bdc -- 屏蔽组织选择 2022-12-20 18:24:42 +08:00
yuping
d9f8f7569c -- bug 2022-12-20 18:06:14 +08:00
yuping
11b50cc89d -- bug 2022-12-20 17:56:13 +08:00
yuping
2407561e9b -- loading 2022-12-20 17:52:11 +08:00
yuping
7853e14d6a Merge remote-tracking branch 'origin/develop' into develop 2022-12-20 17:43:00 +08:00
yuping
4c4651b868 -- 资源归属不随项目经理带出 2022-12-20 17:42:49 +08:00
lixg
af79536c22 feat:合并 2022-12-20 17:30:49 +08:00
lixg
f73a467ab8 feat:合并 2022-12-20 17:30:06 +08:00
yuping
bf9d81563c -- bug 2022-12-20 17:24:55 +08:00
yuping
67b819c813 -- bug 2022-12-20 17:16:16 +08:00
wyx
a05136de4f fix:面授课编辑附件删除问题,课程大纲问题 2022-12-20 16:43:40 +08:00
lixg
0509b2f979 feat:增加删除的获取cookie 2022-12-20 16:16:40 +08:00
lixg
ed22b3f985 feat:合并 2022-12-20 15:59:59 +08:00
lixg
22356826b8 fix:修改添加作业接口判断 2022-12-20 15:59:23 +08:00
wyx
4442ca956d fix:修改任务频繁点击增加多条问题 2022-12-20 15:35:04 +08:00
wyx
febf4774ee fix:面授课添加多次点击重复添加问题 2022-12-20 14:16:03 +08:00
yuping
b971e9eca8 -- bug 2022-12-20 13:55:01 +08:00
yuping
c89473b54a Merge remote-tracking branch 'origin/develop' into develop 2022-12-20 13:28:55 +08:00
yuping
12a5829d30 -- bug 2022-12-20 13:28:45 +08:00
wuyx
dd3a40320c fix:附件下载白屏问题 2022-12-20 12:27:32 +08:00
wuyx
a2dce95b4f fix:修改模版库不同阶段不可添加同一在线和评估任务问题 2022-12-20 10:58:53 +08:00
wuyx
b9bfcd6a8c fix:修改添加考试试卷选择提交后未清空问题 2022-12-20 10:51:59 +08:00
zhangyc
e1e0622296 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-20 08:36:16 +08:00
zhangyc
a98af9134e 添加学员样式 2022-12-20 08:36:07 +08:00
zhangyc
ab725d60d1 评估名称重复校验 2022-12-20 01:44:26 +08:00
yuping
c5a277365f -- url 2022-12-20 00:51:51 +08:00
yuping
9dbc7317f6 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/components/project/NameInput.vue
2022-12-20 00:41:30 +08:00
yuping
48886971b6 -- 名称校验 2022-12-20 00:39:47 +08:00
zhangyc
bcb85b8d35 Merge branches 'develop' and 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-20 00:15:51 +08:00
zhangyc
b5e35d1417 名字重复提示 2022-12-20 00:14:44 +08:00
lixg
8ba643af57 feat:合并 2022-12-19 22:21:28 +08:00
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