Commit Graph

523 Commits

Author SHA1 Message Date
zhangsir
3d0915f7ec 讲师认证管理认证 2024-05-13 22:39:57 +08:00
zhangsir
9ead7c7f4d 讲师认证管理认证 2024-05-13 18:50:27 +08:00
zhangsir
babe05c7d4 Merge branch 'zcwy-0511-out2' into zcwy-0511-out
# Conflicts:
#	src/api/examineApi.js
#	src/views/gratefulteacher/AddLevelImportTec.vue
#	src/views/gratefulteacher/InstructorCertification.vue
#	src/views/gratefulteacher/LecturerManagement.vue
2024-05-11 22:22:21 +08:00
zhangsir
f60e70f7d3 讲师认证2 2024-05-11 21:55:20 +08:00
zhangsir
f58ae089f2 讲师认证 2024-05-11 21:52:29 +08:00
zhangsir
9b3b9accb1 修改二维码扫码失败 2024-04-17 13:51:17 +08:00
zhangsir
a14261003d 测评上传报告逻辑修改 2024-04-12 20:55:16 +08:00
zhangsir
7e19cbd787 测评 2024-04-03 15:03:24 +08:00
zhangsir
5d4746a033 测评上传 2024-03-28 19:22:18 +08:00
zhangsir
0b817af9d4 测评上传 2024-03-28 08:29:25 +08:00
zhangsir
30b012577d 测评上传 2024-03-26 17:07:07 +08:00
zhangsir
0d0cbaba29 测评上传 2024-03-26 14:30:55 +08:00
zhangsir
ad0793da66 测评上传 2024-03-26 10:26:02 +08:00
zhangsir
b1b53e3efd 测评上传 2024-03-25 17:16:07 +08:00
zhangsir
fd0025892f 测评上传 2024-03-22 17:37:17 +08:00
zhangsir
76444ce613 路径图超时加载一分钟 2024-03-01 16:43:24 +08:00
zhangsir
aa9ca5fff4 Merge branch 'test11' into zcwy-zsx0223
# Conflicts:
#	src/components/drawers/router/RouterFaceStu.vue
2024-02-23 10:37:22 +08:00
zhangsir
74942ee4cf 522细节修改 2024-01-31 18:26:02 +08:00
zhangsir
ab34f1737f 二维码积分 2024-01-30 14:13:07 +08:00
zhangsir
c04c9e91d6 修改522 2024-01-23 17:59:37 +08:00
joshen
a330db9eb7 Merge branch 'zcwyMaster' into 'master_1030'
Zcwy master

See merge request !149
2023-10-30 20:03:39 +08:00
zhangsir
50fa2c3980 课程推荐 2023-10-11 18:35:30 +08:00
zhangsir
47e180b9f4 课程推荐 2023-10-10 18:03:29 +08:00
BOE\10867418
8889002123 去除 2023-09-21 15:18:39 +08:00
BOE\10867418
b87f11da8a 统一处理报错 2023-09-21 15:13:50 +08:00
joshen@zcwytd.com
96a5f7445c Merge branch 'dw_master' into boe_dongwu0919 2023-09-20 17:26:31 +08:00
yuping
7eb3f493e1 Merge remote-tracking branch 'origin/user-modify' into user-modify 2023-09-19 17:05:52 +08:00
yuping
9ab862397b fix bug 2023-09-19 17:05:40 +08:00
nisen
fcdce3f082 修改推送接口时间 2023-09-19 14:21:31 +08:00
yuping
0112a88185 ---fix bug 2023-09-14 15:00:39 +08:00
nisen
77121a63d2 案例选所有人 2023-09-13 11:31:34 +08:00
BOE\10867418
2a50f04e0c 报表合并到生产 2023-09-07 14:45:53 +08:00
nisen
4709e99cc3 修改 2023-09-06 17:48:16 +08:00
joshen@zcwytd.com
f543d1ee5b 新增教师节 2023-09-06 17:21:30 +08:00
BOE\10867418
582806b2d8 Merge branch 'dongwu-master'
# Conflicts:
#	src/views/case/CaseManage.vue
2023-08-27 16:46:12 +08:00
yuping
87b364703b ---fix bug 2023-08-27 14:41:55 +08:00
yuping
c2113a33e6 Merge branch 'user-modify'
# Conflicts:
#	src/api/ThirdApi.js
2023-08-25 16:10:34 +08:00
yuping
0938845250 ---fix bug 2023-08-25 16:10:03 +08:00
weixiaobo@boe.com.cn
c287b3d86e 员工学习数据 2023-08-21 18:42:53 +08:00
weixiaobo@boe.com.cn
55ca2e4273 项目报表 2023-08-18 18:43:44 +08:00
BOE\10867418
f902de8044 更新 2023-08-18 17:49:38 +08:00
BOE\10867418
cfc1f3ab77 fix 2023-08-17 15:16:01 +08:00
yujicun
a660fa8685 Merge remote-tracking branch 'origin/user-modify' into dev0731 2023-08-05 10:36:59 +08:00
yuping
6804653285 fix bug 2023-08-04 17:51:27 +08:00
yujicun
7c089620f8 Merge remote-tracking branch 'origin/user-modify' into dev0731 2023-08-04 17:08:51 +08:00
yuping
379f9448bd fix bug 2023-08-04 16:45:15 +08:00
yujicun
dfeb4bdf98 Merge remote-tracking branch 'origin/user-modify' into dev0731 2023-08-04 13:44:34 +08:00
yuping
e033ab825e fix bug 2023-08-04 12:16:28 +08:00
yujicun
360dc4c0cc Merge remote-tracking branch 'origin/user-modify' into dev0731 2023-08-04 11:36:39 +08:00
yuping
a3a09ed70b fix bug 2023-08-04 11:32:47 +08:00