Commit Graph

836 Commits

Author SHA1 Message Date
zhangyc
d22d80ae38 评估列表bug 2022-12-18 22:57:38 +08:00
zhangyc
e840fa2cc1 merge 2022-12-17 21:27:31 +08:00
zhangyc
79d4a0db00 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-17 21:21:44 +08:00
zhangyc
3a4ad2e7af 评估列表 2022-12-17 21:20:36 +08:00
yuping
d057c9b66c Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/views/projectcenter/TaskPage.vue
2022-12-17 17:41:47 +08:00
yuping
c1983082a5 -- 添加学员 2022-12-17 17:40:47 +08:00
zhangyc
94e0982817 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-16 17:47:35 +08:00
zhangyc
6bd7df51f9 直播时间 2022-12-16 16:24:35 +08:00
yuping
47aa65ff43 -- 修改 2022-12-16 14:13:00 +08:00
yuping
faab473261 -- 修改 2022-12-16 14:11:46 +08:00
yuping
eaf36fe377 Merge remote-tracking branch 'origin/develop' into develop 2022-12-16 13:55:00 +08:00
yuping
9784f84db3 -- 修改 2022-12-16 13:54:26 +08:00
zhangyc
e90aaf83e4 归属组织打印 2022-12-16 08:51:44 +08:00
zhangyc
e7a3d00140 课程名、项目名称修改提示重复 2022-12-16 01:21:02 +08:00
zhangyc
50c1583c46 时间去掉秒 2022-12-16 00:59:45 +08:00
zhangyc
b3e568176e 项目时间搜索 2022-12-16 00:01:56 +08:00
zhangyc
e98d3cd5ea 撤回的评估 还在添加评估列表里 2022-12-15 20:05:08 +08:00
zhangyc
00c122042c 测评增加type字段 2022-12-15 11:55:27 +08:00
lixg
d05fd14aae feat:合并 2022-12-14 20:56:22 +08:00
lixg
eece67eb22 fix:修改添加任务项目列表 2022-12-14 20:55:34 +08:00
yuping
74e41e9abe Merge remote-tracking branch 'origin/develop' into develop 2022-12-14 20:36:58 +08:00
yuping
42340e38d0 -- bug 2022-12-14 20:36:37 +08:00
lixg
652282773f feat:修改 2022-12-14 17:52:13 +08:00
zhangyc
4b12a51f51 merge 2022-12-14 16:04:10 +08:00
zhangyc
117dd5f184 隐藏缺失字段 2022-12-14 16:00:23 +08:00
yuping
57d83419dc -- bug 2022-12-14 14:27:05 +08:00
zhangyc
233d334840 修复提示请选中关卡问题 2022-12-14 14:09:01 +08:00
lixg
ea3315ac32 fix:修改创建评估及编辑评估回显 2022-12-14 11:55:48 +08:00
lixg
a70b55906f feat:合并 2022-12-14 09:04:17 +08:00
lixg
0382f7ae12 feat:修改版本号 2022-12-14 09:03:23 +08:00
zhangyc
aef73624d6 面授课分类 2022-12-14 08:39:46 +08:00
zhangyc
03d9cce131 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-14 07:27:17 +08:00
zhangyc
7c8ae62f70 bug 2022-12-14 07:27:04 +08:00
lixg
a093dd629e feat:合并 2022-12-13 22:01:08 +08:00
lixg
68f5a4957e feat:合并 2022-12-13 21:49:54 +08:00
zhangyc
d9608d69e3 管理 2022-12-13 17:56:18 +08:00
zhangyc
171ad0af18 考试列表改为试卷列表,课程分类搜索 2022-12-13 14:14:19 +08:00
yuping
405b1b1c02 Merge remote-tracking branch 'origin/develop' into develop 2022-12-13 09:55:31 +08:00
zhangyc
a8c7308cc2 审核日志只有一条 2022-12-13 09:11:52 +08:00
zhangyc
89e889506b 课程库bug 2022-12-13 00:41:11 +08:00
yuping
2e78827971 -- 组织不搜索 2022-12-12 23:17:13 +08:00
zhangyc
adb22f6d0e 始终选中一个关卡 2022-12-12 18:16:12 +08:00
zhangyc
b744d6ae74 修改button 操作按钮样式 2022-12-12 02:10:09 +08:00
yuping
f915af36b9 -- 添加学员 2022-12-11 19:33:41 +08:00
zhangyc
4b19a86790 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-11 17:09:47 +08:00
zhangyc
53c5f4a903 表格样式 2022-12-11 17:07:06 +08:00
lixg
fd1b80f28a feat:合并 2022-12-11 16:19:07 +08:00
lixg
ca067afa02 feat:增加旧系统页面 2022-12-11 15:36:41 +08:00
zhangyc
cd94fe07d3 时间统一为时分秒 2022-12-11 14:47:55 +08:00
zhangyc
1b9f976f55 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-11 11:55:07 +08:00