Commit Graph

2838 Commits

Author SHA1 Message Date
lixg
dd8b9905dc feat:合并 2023-02-28 17:03:45 +08:00
lixg
97e857ff93 feat:修改测评 2023-02-28 17:03:23 +08:00
yuping
86e3431b04 -- fix bug 2023-02-28 16:54:50 +08:00
yuping
b7d8c9350f Merge remote-tracking branch 'origin/develop' into develop 2023-02-28 16:51:29 +08:00
yuping
2ac835e4f9 -- fix bug 2023-02-28 16:51:19 +08:00
yuping
56599b893a -- fix bug 2023-02-28 16:51:06 +08:00
yuping
626ceff4c4 -- fix bug 2023-02-28 16:43:28 +08:00
lixg
6b2104d722 feat:合并 2023-02-28 16:19:45 +08:00
lixg
35236c2679 feat:修改直播考勤签到二维码的type 2023-02-28 16:19:14 +08:00
wyx
5eb983f0f9 fix:获得证书时间显示修改 2023-02-28 16:10:44 +08:00
wyx
3d6b792caf fix:获得证书时间显示修改 2023-02-28 16:10:06 +08:00
wyx
6a03701af2 style:学习路径图c:\Users\86187\Desktop\testcode\fe-manage\src\views\learningpath\LevelAddDetail.vue 2023-02-28 15:34:18 +08:00
wyx
0df4af33d8 fix:项目添加任务,必修选修显示问题 2023-02-28 15:32:32 +08:00
wyx
e38ba60d88 fix:项目列表是否审核状态修改 2023-02-28 10:15:59 +08:00
lixg
5ab6cd680f feat:合并 2023-02-28 10:13:49 +08:00
lixg
f99916a84e feat:修改项目和学习路径二维码显示 2023-02-28 10:13:20 +08:00
quhongwei
242d996652 修改考试管理状态值判断所用字段 2023-02-28 10:05:20 +08:00
yuping
dd5de82ee0 -- fix bug 2023-02-28 01:27:16 +08:00
yuping
abaaea4fd0 Merge remote-tracking branch 'origin/develop' into develop 2023-02-28 01:09:49 +08:00
yuping
0781a1710b -- fix bug 2023-02-28 01:09:34 +08:00
quhongwei
1a0ddbc660 修改考试管理type传值 2023-02-28 00:44:33 +08:00
caozc
9b472e8a6e fix:外部考试管理;未完成考试的学员【查看答卷】按钮禁用
工号字段宽度加宽
2023-02-28 00:27:04 +08:00
wyx
9510a8604d style:隐藏创建投票上传成功后添加图片选项 2023-02-27 23:47:31 +08:00
yuping
8b4f112699 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/components/student/CommonStudent.vue
2023-02-27 23:34:44 +08:00
yuping
1b4a271eec -- fix bug 2023-02-27 23:31:48 +08:00
yuping
c4f71e7521 -- fix bug 2023-02-27 23:30:07 +08:00
wyx
9fb7e49190 fix:审核状态修改 2023-02-27 23:16:19 +08:00
peiqingliu
cea452a5d0 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-02-27 23:13:51 +08:00
peiqingliu
edac59161f 修改党组员添加时有提示问题 2023-02-27 23:13:39 +08:00
wyx
e8df193658 style:层级显示问题 2023-02-27 23:11:02 +08:00
yuping
a74d5a151b -- fix bug 2023-02-27 23:10:02 +08:00
yuping
f0b7c5c8b8 Merge remote-tracking branch 'origin/develop' into develop 2023-02-27 22:59:34 +08:00
yuping
1dea7519b3 -- fix bug 2023-02-27 22:59:22 +08:00
caozc
d654a6e46e fix: 成功提示注释掉 2023-02-27 22:42:04 +08:00
caozc
e83c81485d fix:修复共享文档开关设置没保存下来 2023-02-27 22:39:14 +08:00
wyx
a8c3521d48 fix:学员积分获取详情-积分类型展示 2023-02-27 22:31:11 +08:00
wyx
d508988437 fix:字段修改 2023-02-27 22:19:29 +08:00
caozc
fbf2658390 Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2023-02-27 22:07:06 +08:00
caozc
c8b5e00112 fix:模板库编辑阶段,没加载阶段数据 2023-02-27 21:59:24 +08:00
wyx
2d8e3de2bc fix:转审完成字段显示问题 2023-02-27 21:56:58 +08:00
wyx
08bf5bcaa5 fix:字段修改 2023-02-27 21:24:05 +08:00
wyx
ae8a79757b fix:项目在线课管理数据导出 2023-02-27 21:15:19 +08:00
lixg
945efc9cc6 feat:合并 2023-02-27 21:04:53 +08:00
lixg
8f7a3305e5 feat:修改面授等 2023-02-27 21:02:14 +08:00
wyx
41f7c90982 fix:转审字段判断 2023-02-27 20:58:27 +08:00
wyx
72f4bd9253 fix:增加待审核课程转审字段 2023-02-27 20:36:48 +08:00
caozc
75aa19b837 fix;更新模板库移动任务到阶段报错问题 2023-02-27 19:53:31 +08:00
caozc
52ddfbfc38 Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2023-02-27 19:50:05 +08:00
caozc
d5ef6f28bf fix: 更新编辑关卡时没有加载关卡信息等 2023-02-27 19:49:47 +08:00
yuping
006b59010b -- fix bug 2023-02-27 19:08:12 +08:00