Commit Graph

4011 Commits

Author SHA1 Message Date
wyx
32f42a32ed Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-02-18 11:56:48 +08:00
wyx
c0e311d86b fix:阶段id传递修改 2023-02-18 11:56:41 +08:00
wangjuan
529cc302e5 确定按钮数组移除 2023-02-18 11:47:32 +08:00
yuping
e8b82f07e1 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/views/learningpath/LevelAdd.vue
2023-02-18 11:43:37 +08:00
yuping
49510991e6 --fix bug 2023-02-18 11:42:51 +08:00
李东进1
c148b73339 导入面授报名 2023-02-18 11:41:51 +08:00
wangjuan
d02bcc7f41 确定关闭按钮 2023-02-18 11:09:38 +08:00
wangjuan
88ed4b5ed9 删除关闭X 2023-02-18 10:51:20 +08:00
wyx
e1db707977 fix:测评列表选择问题 2023-02-18 10:42:32 +08:00
wangjuan
5048362c43 新增项目修改时间 2023-02-18 10:36:29 +08:00
lpq
659cbfef7b Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-02-18 10:25:19 +08:00
wyx
c1660fdb3f fix:上传证书修改 2023-02-18 09:35:42 +08:00
李东进1
d8a3808063 前端js 2023-02-18 09:16:05 +08:00
yuping
6f66080404 Merge remote-tracking branch 'origin/develop' into develop 2023-02-18 01:17:43 +08:00
yuping
29c1b14f6c --fix bug 2023-02-18 01:17:34 +08:00
lpq
07af397303 提价 2023-02-18 01:16:34 +08:00
李东进1
e275efcb01 前端上传文件 2023-02-18 01:15:36 +08:00
yuping
9555c4c40b --fix bug 2023-02-18 00:39:43 +08:00
yuping
31186d6fba Merge remote-tracking branch 'origin/develop' into develop 2023-02-18 00:36:06 +08:00
yuping
0635c681f5 --fix bug 2023-02-18 00:35:51 +08:00
lpq
0f7e28b40b 提交 2023-02-18 00:18:09 +08:00
lpq
b5494fef33 限制组员人数 2023-02-18 00:01:54 +08:00
lpq
5adf16c199 限制组员人数超过最大值 2023-02-18 00:01:10 +08:00
yuping
5f0df5323e Merge remote-tracking branch 'origin/develop' into develop 2023-02-17 23:56:32 +08:00
yuping
84e21f40ef --fix 复制 2023-02-17 23:56:17 +08:00
lpq
2f1d0ccd78 随机小组,确认完成 关闭抽屉后清空页面数据; 2023-02-17 22:07:07 +08:00
wyx
24d58c5a0a fix:修改系统考试获取学员列表接口 2023-02-17 21:57:59 +08:00
yuping
874336864b Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/views/courselibrary/CoursewareManage.vue
2023-02-17 21:52:27 +08:00
yuping
a58d7b0835 --fix 复制 2023-02-17 21:51:42 +08:00
wyx
eb2390dea2 fix:邀请审核参数传递修改 2023-02-17 21:36:28 +08:00
wyx
a90c667b2d feat:增加考试查看答卷 2023-02-17 21:25:08 +08:00
yuping
2d3a95f1bd --fix 复制 2023-02-17 21:18:09 +08:00
yuping
b29e31721f --fix 复制 2023-02-17 19:47:02 +08:00
yuping
49b0f872eb Merge remote-tracking branch 'origin/develop' into develop 2023-02-17 18:21:36 +08:00
yuping
84106e4fb1 --fix 字典管理 2023-02-17 18:21:25 +08:00
wyx
2963e49ac5 fix:添加测评任务修改 2023-02-17 18:03:50 +08:00
yuping
5517799a74 Merge remote-tracking branch 'origin/develop' into develop 2023-02-17 17:59:42 +08:00
yuping
33429c046c --fix bug 2023-02-17 17:59:25 +08:00
wyx
8b036dacb5 fix:评估列表修改创建人和题目数量,修改新建评估样式 2023-02-17 17:24:10 +08:00
wyx
cfdb1b52ef Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-02-17 16:24:38 +08:00
wyx
b6f0489496 fix:考试任务-增加系统和外部考试区分-增加编辑区分 2023-02-17 16:24:30 +08:00
yuping
b1dde8f3a7 --fix 排序 2023-02-17 16:23:14 +08:00
yuping
15ec385b5a Merge remote-tracking branch 'origin/develop' into develop 2023-02-17 16:12:23 +08:00
yuping
70f6d01594 --fix 排序 2023-02-17 16:12:01 +08:00
wyx
7608d56432 feat:增加转审完成查看 2023-02-17 14:34:57 +08:00
wyx
69835350af fix:投票编辑 2023-02-17 12:25:31 +08:00
wyx
a7d30f3f8b fix:任务管理学员显示问题修改 2023-02-17 11:37:16 +08:00
wyx
50d91e5510 feat:增加已审核课程日志显示部分数据接入 2023-02-17 10:54:26 +08:00
dongruihua
5dfbf4541c Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2023-02-17 10:38:08 +08:00
wyx
1e6002d7d4 fix:评估管理创建人显示修改 2023-02-17 10:37:13 +08:00