Commit Graph

4587 Commits

Author SHA1 Message Date
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
huangshengfa
beabf2fb49 Merge branch 'dev_m' into 'develop'
fix:考试状态i需改

See merge request !46
2023-02-28 09:46:12 +08:00
mx00085@163.com
fff60e7a8c fix:考试状态i需改 2023-02-28 09:43:30 +08:00
huangshengfa
b8918d655d Merge branch 'dev_m' into 'develop'
fix: 时间修改

See merge request !45
2023-02-28 09:27:58 +08:00
mx00085@163.com
164724d8ad fix: 时间修改 2023-02-28 09:25:01 +08:00
huangshengfa
5ac2e40633 Merge branch 'pre-dev' into 'develop'
Pre dev

See merge request !44
2023-02-28 09:02:53 +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
yuping
c92861c02e Merge remote-tracking branch 'origin/develop' into develop 2023-02-27 19:07:57 +08:00
yuping
f430d8bdf6 -- fix bug 2023-02-27 19:07:46 +08:00
wyx
566ea6769f style:项目添加任务界面样式问题修改 2023-02-27 17:17:34 +08:00
wyx
670536de32 fix:系统考试任务状态判断 2023-02-27 17:11:36 +08:00
wyx
404201c517 fix:添加学习路径图评估查看操作 2023-02-27 16:49:37 +08:00
wyx
e4a1d2129d fix:项目投票任务管理列表学员获取 2023-02-27 15:59:34 +08:00
wyx
cdf9a7c592 fix:评估查看操作报错修改 2023-02-27 15:54:34 +08:00
wyx
4134d43d68 fix:直播说明不显示问题 2023-02-27 15:41:18 +08:00
lixg
e6d3a5af8d feat:修改删除弹窗 2023-02-27 10:31:57 +08:00