Commit Graph

2818 Commits

Author SHA1 Message Date
zhangsir
cc1970f79f Merge branch 'boe_0701_icon' into dev0515
# Conflicts:
#	src/assets/images/ban.png
#	src/views/study/coursenew.vue
2024-07-01 17:47:16 +08:00
zhangsir
4e1f2e4e1d 修改图标 2024-07-01 17:44:54 +08:00
zhangsir
beda4f9c01 Merge branch 'zcwy-master' into dev0515 2024-07-01 16:19:54 +08:00
zhangsir
a143a8ecaa 路径图调整 2024-07-01 16:19:29 +08:00
zhangsir
5f48163f66 Merge branch 'zcwy-master' into dev0515 2024-07-01 15:46:46 +08:00
zhangsir
458e20e4c2 细节 2024-07-01 15:46:01 +08:00
zhangsir
3d20096824 Merge branch 'zcwy-master' into dev0515 2024-06-28 16:48:55 +08:00
zhangsir
8883cce52f 合并 2024-06-28 16:48:27 +08:00
zhangsir
2aa861c2a1 左侧菜单 2024-06-28 14:17:48 +08:00
zhangsir
bc408c039e Merge branch 'dev0124' into zcwy-master
# Conflicts:
#	src/components/UserCenter/menu.vue
#	src/router/index.js
2024-06-28 13:33:25 +08:00
zhangsir
4269bff0b5 左侧菜单 2024-06-28 13:30:08 +08:00
zhangsir
d80405b8fa Merge branch 'dev0124' into dev0515 2024-06-27 20:36:19 +08:00
zhangsir
c0575661c0 xijie 2024-06-27 20:35:52 +08:00
zhangsir
2030879c1f 左侧菜单 2024-06-27 19:02:42 +08:00
zhangsir
a6c6b7160c Merge branch 'dev0124' into dev0515 2024-06-27 14:02:25 +08:00
zhangsir
233f21e310 细节 2024-06-27 14:02:00 +08:00
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