Commit Graph

41 Commits

Author SHA1 Message Date
zyy
af26f55e9b 调整裁判管理报名列表 2020-05-20 18:32:52 +08:00
fan
e3034f630e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-20 14:46:39 +08:00
fan
b137adbd69 哈尔滨地图问题调整&竞赛管理 2020-05-20 14:46:26 +08:00
zyy
31bcad0449 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-20 13:25:44 +08:00
zyy
61c3650621 路由权限生成调整逻辑 2020-05-20 13:25:31 +08:00
sunzhenyu
4819efc14e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-19 18:00:47 +08:00
zyy
cb0fcd1a3f 增加报名页面 2020-05-19 16:56:36 +08:00
sunzhenyu
5046a886fd merge 2020-05-19 16:50:34 +08:00
sunzhenyu
6a25030a53 修改三维数据 2020-05-19 16:49:56 +08:00
zyy
63e52f1986 调整理论竞赛流程页面 2020-05-19 13:10:45 +08:00
zyy
f2430c3625 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/router/index_Common.js
2020-05-19 10:32:07 +08:00
zyy
3a72195e15 调整竞赛系统页面路由 2020-05-19 10:30:27 +08:00
fan
eba0bff786 竞赛系统 2020-05-19 10:18:01 +08:00
zyy
27891b29c8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/store/modules/permission.js
2020-05-19 09:05:27 +08:00
zyy
09b3b684cf 调整竞赛系统路由 2020-05-19 09:03:38 +08:00
fan
86d59db177 调整路由处理 2020-05-18 17:59:38 +08:00
zyy
9591cbd268 调整竞赛系统登陆权限 2020-05-18 13:08:45 +08:00
zyy
2faa2688e5 综合监控广播 2020-05-15 18:36:31 +08:00
zyy
6391e8e881 调整竞赛系统路径,页面路由配置 2020-05-15 16:01:16 +08:00
zyy
ae5916b90a 调整竞赛系统路由配置 2020-05-15 14:50:05 +08:00
fan
55fdd65195 调整学生管理权限 2020-05-14 14:03:19 +08:00
fan
8335ee1259 调整列车详情显示和路由课程创建角色处理 2020-05-14 11:03:24 +08:00
fan
e72fdcdb78 合并导航栏 2020-05-13 18:59:28 +08:00
fan
e35709ac2c 学生管理调整 2020-05-13 18:21:55 +08:00
fan
92eaa38aef 贵州装备班级相关&绘图逻辑区段调整 2020-05-12 19:07:48 +08:00
joylink_cuiweidong
46f40bd381 剧本代码调整 2020-05-11 14:32:40 +08:00
zyy
fe5f6cecc9 调整大屏系统界面加载宽度 2020-05-09 20:13:32 +08:00
fan
22fffd340f 大屏测试 2020-05-06 16:57:07 +08:00
sunzhenyu
fd14da2cee merge menudemon 2020-04-24 18:01:03 +08:00
sunzhenyu
8f15f049f1 修改三维动画播放器重复更新bug,增加宁波线路三维背景,修改三维仿真行车逻辑改为后台数据控制 2020-04-24 18:00:12 +08:00
zyy
4d288556b0 调整绘图界面,调整实训平台鼠标隐藏bug 2020-04-23 17:11:51 +08:00
fan
d44faf55ea 调整西安地铁登录页面 2020-04-21 15:47:25 +08:00
fan
4231966cac 取消cdn加载&调整快速入口进入房间 2020-04-17 09:13:40 +08:00
fan
d69e155e91 贵州装备添加联锁角色&&项目配置规整(未完) 2020-04-16 15:52:56 +08:00
fan
1bfe76c291 添加西安地铁页面&&项目配置规整(未完) 2020-04-16 13:47:40 +08:00
fan
79f473ad8b 实训管理老地图处理(未完) 2020-04-09 16:11:36 +08:00
fan
ba759b1d77 哈尔滨本地项目调整 2020-04-03 13:33:33 +08:00
fan
cd414962eb 调整提交 2020-04-01 18:14:48 +08:00
fan
8f30d436ee 调整绘图&三维跳转页面icon 2020-04-01 16:24:03 +08:00
fan
63c73ab78c Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
#	src/views/jlmap3d/simulation/jl3dsimulation.vue
2020-03-31 11:14:33 +08:00
fan
ab4928d924 差异化打包调整&哈尔滨登录页 2020-03-30 13:07:11 +08:00