Commit Graph

6147 Commits

Author SHA1 Message Date
joylink_cuiweidong
5532bc5eba Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 16:54:51 +08:00
joylink_cuiweidong
3aa0d55ea3 剧本编制代码调整 2020-07-09 16:54:31 +08:00
sunzhenyu
f424184363 修改录制界面三维驾驶初始车辆显示 2020-07-09 16:39:58 +08:00
sunzhenyu
df3b8eebd7 修改综合演练三维驾驶退出 2020-07-09 16:03:33 +08:00
sunzhenyu
93e0b71ab4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 15:46:19 +08:00
sunzhenyu
27d4c93775 修改三维编辑器 2020-07-09 15:46:12 +08:00
joylink_cuiweidong
9b3cd2dc3d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 15:45:47 +08:00
fan
22f94f7ef5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 15:47:07 +08:00
fan
81be7e776d 设备登录调整 2020-07-09 15:46:52 +08:00
joylink_cuiweidong
ffab9631ce 代码调整 2020-07-09 15:45:32 +08:00
joylink_cuiweidong
84485c6f1d 剧本编制代码调整 2020-07-09 15:44:12 +08:00
joylink_cuiweidong
b7d0f11b9c 去掉断点 2020-07-09 15:16:12 +08:00
joylink_cuiweidong
15c6a151c9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 15:09:35 +08:00
joylink_cuiweidong
763d04d630 剧本编制 切换角色 过滤掉不在线的司机 2020-07-09 15:09:18 +08:00
fan
8af4eb6187 设备登录调整 2020-07-09 15:06:15 +08:00
fan
6aa7fdf1bc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 13:06:04 +08:00
fan
404c56e874 过滤司机角色调整 2020-07-09 13:05:50 +08:00
fan
577cc3c887 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 11:07:33 +08:00
zyy
8a4bbbd682 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 11:07:20 +08:00
zyy
a16f8ebf00 配置哈尔滨项目路由 2020-07-09 11:07:06 +08:00
fan
e658fb7889 哈尔滨项目调整 2020-07-09 11:07:04 +08:00
joylink_cuiweidong
9e71ca967f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 10:51:14 +08:00
joylink_cuiweidong
c315f9121a 剧本编制代码调整 2020-07-09 10:50:56 +08:00
fan
6bfe538bfc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 10:25:16 +08:00
fan
b14a730bab 哈尔滨项目调整 2020-07-09 10:25:04 +08:00
joylink_cuiweidong
0c95382b7e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 10:18:16 +08:00
joylink_cuiweidong
96ff4c49f6 剧本编制代码调整 2020-07-09 10:17:55 +08:00
zyy
f48d584a8e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 10:16:49 +08:00
zyy
49ac7ba919 调整路由校验权限流程 2020-07-09 10:16:33 +08:00
fan
b07991b21f 登录页面调整 2020-07-09 09:38:51 +08:00
joylink_cuiweidong
3cd9d9416b 剧本代码调整 2020-07-08 18:56:32 +08:00
joylink_cuiweidong
dac800a86f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 18:36:07 +08:00
joylink_cuiweidong
b1005fd2ac 剧本编制代码调整 2020-07-08 18:35:46 +08:00
zyy
3693994526 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 18:35:25 +08:00
zyy
c4ffc859ce 调整大屏配置逻辑,登陆权限流程 2020-07-08 18:35:12 +08:00
fan
37d88998ab 清除会话@成员 2020-07-08 18:22:14 +08:00
fan
14835db67b 仿真清除数据调整 2020-07-08 18:06:22 +08:00
fan
62430ea87b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 17:36:43 +08:00
fan
050fc8141c 设备登录调整 2020-07-08 17:36:32 +08:00
sunzhenyu
eff2657d08 修改综合演练屏蔽门直接显示 2020-07-08 17:24:38 +08:00
fan
3196304f1c 调整虚拟屏蔽门登录跳转路径 2020-07-08 16:43:18 +08:00
fan
5edd9f536e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 16:30:06 +08:00
fan
5b1aad5fc7 调整虚拟屏蔽门配置 2020-07-08 16:29:40 +08:00
sunzhenyu
faa57eb3c9 修改三维设备切换模型bug 2020-07-08 16:15:35 +08:00
zyy
6ff8019898 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 15:49:41 +08:00
zyy
fd89fe974e 调整列车驾驶设备 2020-07-08 15:49:16 +08:00
fan
e8d54bc1d0 合并代码 2020-07-08 15:42:23 +08:00
fan
714113c819 设备登录调整 2020-07-08 15:40:55 +08:00
zyy
7c8d1319f3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 14:40:18 +08:00
zyy
753172433c 调整实训流程 2020-07-08 14:40:04 +08:00