Commit Graph

4369 Commits

Author SHA1 Message Date
lpq
c5d3f6fdd9 学员人数限制 2023-02-25 21:42:12 +08:00
lpq
8b00105410 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-02-25 21:29:58 +08:00
lpq
6089ab74f9 清除勾选组员选中状态 2023-02-25 21:29:18 +08:00
caozc
7f616f5278 fix:项目=》模板库=》编辑积分规则 2023-02-25 21:09:26 +08:00
lixg
4203f4fe77 feat:合并 2023-02-25 20:34:15 +08:00
lixg
dd87c14781 feat:修改评估图片及面授课新建 2023-02-25 20:33:44 +08:00
李东进1
2d8687324f 问题修复 2023-02-25 20:07:07 +08:00
yuping
58a264d082 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/views/projectcenter/TaskAdd.vue
2023-02-25 19:41:57 +08:00
yuping
ac30e5eeca -- fix bug 2023-02-25 19:41:05 +08:00
wyx
279b8797b2 fix:切换到项目积分重新获取学员列表数据 2023-02-25 18:03:26 +08:00
wyx
59cc55d197 fix:项目积分-学员获取-操作查看-增加积分类型获取 2023-02-25 17:50:32 +08:00
lpq
92b32f85b0 修改提示词 2023-02-25 17:44:52 +08:00
lpq
b11fa0066a 直播考勤数据导出 2023-02-25 17:43:08 +08:00
lpq
7f98ee7b11 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-02-25 17:31:12 +08:00
lpq
4e47e2ce39 小组人数只能由小改大,不能由大改小 2023-02-25 17:31:03 +08:00
wyx
8922047f51 style:邀请审核样式修改 2023-02-25 17:26:46 +08:00
wyx
fad70a8ad3 fix:项目审核记录分页判断修改 2023-02-25 17:21:59 +08:00
lpq
74c0b80c15 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-02-25 17:16:33 +08:00
lpq
ab2a37e485 编辑小组 2023-02-25 17:16:23 +08:00
caozc
85713a9c04 增加催促考试 2023-02-25 17:06:54 +08:00
lixg
2a8f06b027 feat:修改案例 2023-02-25 16:49:06 +08:00
lixg
7a08d62e0d feat:修改项目说明 2023-02-25 16:16:33 +08:00
lixg
ab868feec7 feat:合并 2023-02-25 15:59:39 +08:00
lixg
09f8be77ba feat:修改面授课样式问题 2023-02-25 15:59:06 +08:00
dongruihua
ae121a7f4a Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop
# Conflicts:
#	vue.config.js
2023-02-25 14:56:05 +08:00
zhangyc
c780e19660 去掉localhost 2023-02-25 14:31:01 +08:00
caozc
f04d3e31b4 fix 添加阶段不置顶 2023-02-25 13:24:46 +08:00
dongruihua
10c9ad20c9 Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop
# Conflicts:
#	vue.config.js
2023-02-25 09:26:29 +08:00
lpq
2c6e09445f 导出组员 2023-02-25 09:02:29 +08:00
lpq
88cae415b5 修改导入小组长提示语 2023-02-25 08:07:54 +08:00
yuping
2eca74a7f4 -- fix bug 2023-02-25 02:45:20 +08:00
yuping
27e001cca9 Merge remote-tracking branch 'origin/develop' into develop 2023-02-25 01:56:32 +08:00
yuping
b47e1163d4 -- fix bug 2023-02-25 01:56:21 +08:00
lpq
ca126adb7c 提交代码 2023-02-25 01:49:54 +08:00
lpq
fc897e9129 签到 2023-02-25 01:34:34 +08:00
yuping
d34189fd7e -- fix bug 2023-02-25 01:25:01 +08:00
yuping
fc19c0132e Merge remote-tracking branch 'origin/develop' into develop 2023-02-25 01:09:52 +08:00
yuping
876831635b -- fix bug 2023-02-25 01:09:35 +08:00
lpq
6c4326aca0 签到 2023-02-25 01:04:19 +08:00
yuping
e512cffc9c -- fix bug 2023-02-25 00:40:06 +08:00
yuping
b6bf0606fc Merge remote-tracking branch 'origin/develop' into develop 2023-02-24 23:23:46 +08:00
yuping
606ec95c66 -- fix bug 2023-02-24 23:23:24 +08:00
lpq
806e1b8bf4 考试编辑状态下 2023-02-24 23:11:49 +08:00
lixg
5e484d992a feat:合并 2023-02-24 22:56:46 +08:00
lixg
b917c626dd feat:面授课预览增加目标人群及资源归属 2023-02-24 22:56:21 +08:00
yuping
d750267f41 Merge remote-tracking branch 'origin/develop' into develop 2023-02-24 22:55:38 +08:00
yuping
b198c31057 -- fix bug 2023-02-24 22:55:22 +08:00
lpq
a663f4711d 换组功能 2023-02-24 22:39:03 +08:00
lpq
8273426db0 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-02-24 22:38:52 +08:00
lixg
fe37c6e273 feat:修改审核 2023-02-24 21:53:46 +08:00