Commit Graph

2802 Commits

Author SHA1 Message Date
zhangsir
7183ce608e Merge branch 'dev0124' into dev0515 2024-06-27 11:10:09 +08:00
zhangsir
ef0bcbf542 细节 2024-06-27 11:09:37 +08:00
zhangsir
503d9f88ad Merge branch 'dev0124' into dev0515 2024-06-26 11:18:24 +08:00
zhangsir
3d018a4221 合并 2024-06-26 11:17:57 +08:00
zhangsir
819bdca807 Merge branch 'dev0124' into dev0515 2024-06-26 09:05:37 +08:00
zhangsir
8db79d599b 考试 2024-06-26 09:05:10 +08:00
zhangsir
07a18ed994 Merge branch 'dev0124' into dev0515 2024-06-25 23:03:49 +08:00
zhangsir
4d96ad1b22 路径 2024-06-25 23:03:22 +08:00
zhangsir
f6047280fd Merge branch 'zcwy-master' into dev0515 2024-06-25 20:13:16 +08:00
zhangsir
bee4253448 考试 2024-06-25 20:12:51 +08:00
zhangsir
99cd7cea6b 跳转 2024-06-25 20:09:29 +08:00
zhangsir
2836e01179 Merge branch 'dev0124' into dev0515 2024-06-25 13:53:39 +08:00
zhangsir
6ebafa6ed7 考试细节 2024-06-25 13:53:14 +08:00
zhangsir
4f26bddc3a Merge branch 'dev0124' into dev0515 2024-06-24 20:53:44 +08:00
zhangsir
9c198f52a3 全岗位 2024-06-24 20:53:11 +08:00
zhangsir
48f74fe6b4 Merge branch 'dev0124' into dev0515 2024-06-24 14:18:28 +08:00
zhangsir
94de112f49 全岗位 2024-06-24 14:17:59 +08:00
zhangsir
6800e7ff05 Merge branch 'dev0124' into dev0515 2024-06-24 11:37:38 +08:00
zhangsir
2f9c3827ee 修改考试样式 2024-06-24 11:36:58 +08:00
zhangsir
7f66f7d6c0 Merge branch 'dev0124' into dev0515 2024-06-22 17:22:54 +08:00
zhangsir
245ce904ac 细节 2024-06-22 17:22:25 +08:00
zhangsir
ac9c8cedc4 Merge branch 'pingcode-20240615' into dev0515 2024-06-21 17:05:48 +08:00
joshen
18111ea4a7 新建课程列表隐藏没有权限的操作按钮 2024-06-21 17:04:23 +08:00
zhangsir
be81ab9e0b Merge branch 'pingcode-20240615' into dev0515 2024-06-21 16:39:55 +08:00
joshen
17b88f5ec7 课程在线课选择权限数据修改 2024-06-21 16:36:36 +08:00
zhangsir
3a3628a5ce Merge branch 'dev0124' into dev0515 2024-06-21 14:59:30 +08:00
zhangsir
7a413ff1c7 路径图定位完善 2024-06-21 14:59:03 +08:00
zhangsir
9e785bba5f Merge branch 'dev0124' into dev0515 2024-06-21 13:36:02 +08:00
zhangsir
cd9bf1261a 路径图细节除定位完善 2024-06-21 13:35:21 +08:00
zhangsir
c47036ffdf Merge branch 'dev0124' into dev0515 2024-06-20 17:12:29 +08:00
zhangsir
95ba2f107b 路径图显示 2024-06-20 17:11:58 +08:00
zhangsir
b168ef2ab6 Merge branch 'zcwy-master' into dev0515 2024-06-20 14:09:34 +08:00
zhangsir
0a6548ba57 审核回退 2024-06-20 14:09:09 +08:00
zhangsir
932e4bb000 Merge branch 'zcwy-master' into dev0515 2024-06-20 12:28:39 +08:00
zhangsir
eee49b3742 审核 2024-06-20 12:02:23 +08:00
zhangsir
ef6602b06d Merge branch 'dev0124' into dev0515 2024-06-20 11:46:38 +08:00
zhangsir
f133294879 细节 2024-06-20 11:46:04 +08:00
zhangsir
a9d63ab8a9 Merge branch 'dev0124' into dev0515 2024-06-19 19:55:20 +08:00
zhangsir
94595f256d 细节 2024-06-19 19:54:52 +08:00
zhangsir
416cc7a8ea Merge branch 'zcwy-master' into pingcode-20240615
# Conflicts:
#	src/views/study/coursenew.vue
2024-06-19 18:42:20 +08:00
zhangsir
fcc452240b Merge branch 'pingcode-20240615' into dev0515 2024-06-19 17:46:09 +08:00
joshen
15f11ae4c9 视频禁用拖动修改 2024-06-19 17:44:44 +08:00
zhangsir
9efcb4660b Merge branch 'zcwy-master' into dev0515 2024-06-19 16:29:43 +08:00
zhangsir
17528eb465 考试状态 2024-06-19 16:28:59 +08:00
zhangsir
b486332cfb Merge branch 'zcwy-master' into dev0515 2024-06-18 15:29:29 +08:00
zhangsir
10f955a58f 修改图片 2024-06-18 15:29:04 +08:00
zhangsir
80700d4b75 Merge branch 'pingcode-20240615' into dev0515
# Conflicts:
#	src/views/study/coursenew.vue
2024-06-18 14:36:13 +08:00
joshen
5e3b122984 学员端视频播放器逻辑调整 2024-06-18 14:22:11 +08:00
zhangsir
b0b1f474a8 Merge branch 'dev0124' into dev0515 2024-06-18 11:35:26 +08:00
zhangsir
b691688775 取消错误提示 2024-06-18 11:34:53 +08:00