Commit Graph

2889 Commits

Author SHA1 Message Date
yuping
a4460cac9d Merge remote-tracking branch 'origin/develop' into develop 2023-02-26 01:03:42 +08:00
yuping
f26797140f -- fix bug 2023-02-26 01:03:26 +08:00
lpq
bcecb11202 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-02-26 01:03:22 +08:00
lpq
1d786e427a 配置文件 2023-02-26 01:03:11 +08:00
yuping
60401def68 Merge remote-tracking branch 'origin/develop' into develop 2023-02-26 01:02:12 +08:00
lpq
ed3c9c2336 解决冲突 2023-02-26 01:01:57 +08:00
yuping
bba12e350a Merge remote-tracking branch 'origin/develop' into develop 2023-02-26 01:01:50 +08:00
yuping
be5704f2d6 -- fix bug 2023-02-26 01:01:25 +08:00
lpq
9e1f010d9f 项目签到时间 2023-02-26 00:58:40 +08:00
lpq
ab70395a76 项目签到 2023-02-26 00:57:55 +08:00
zhangyc
2c0ee70d8d fix:讨论说明改为必填 2023-02-25 23:15:56 +08:00
caozc
0efc5e5485 fix:设置-编辑:点击编辑跳转报错 2023-02-25 22:43:24 +08:00
lixg
e3437adf0a feat:合并 2023-02-25 22:28:45 +08:00
caozc
afe9b38669 update 2023-02-25 22:28:10 +08:00
lixg
145c8e6acb feat:合并 2023-02-25 22:12:42 +08:00
lixg
6a17b59a08 feat:修改itm 2023-02-25 22:12:09 +08:00
wyx
6a40173961 fix:外部考试学员成绩显示问题 2023-02-25 22:07:46 +08:00
lpq
4acc13ee4d Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-02-25 22:02:35 +08:00
lpq
f0b63f901d Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-02-25 22:02:26 +08:00
wyx
c855f03fc9 fix:作业上传及导出问题 2023-02-25 22:02:21 +08:00
lpq
729d25527e 小组长不允许换组 2023-02-25 22:02:17 +08:00
lixg
5b24b8ef58 feat:修改面授评分 2023-02-25 22:00:41 +08:00
lixg
96a63b8c09 feat:修改测评 2023-02-25 21:54:32 +08:00
lixg
5a824809f4 feat:合并 2023-02-25 21:46:38 +08:00
lixg
4687416952 feat:修改面授课开课是否显示评分 2023-02-25 21:46:12 +08:00
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
zhangyc
c780e19660 去掉localhost 2023-02-25 14:31:01 +08:00