Commit Graph

7853 Commits

Author SHA1 Message Date
fan
5fec834c3f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-09 17:27:57 +08:00
fan
77b1d7d5fb ibp调整&南铁院登录页 2020-10-09 17:27:46 +08:00
joylink_cuiweidong
fbb7784a5b 竞赛系统代码调整 竞赛场景编辑代码调整 2020-10-09 17:03:11 +08:00
joylink_cuiweidong
2ea45b05a4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-09 14:38:15 +08:00
joylink_cuiweidong
68921f80ff 竞赛系统 场景加载 已经开始演出接口代码调整 2020-10-09 14:37:59 +08:00
lVAL
dbdb3f7e51 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-09 13:16:49 +08:00
lVAL
d40821f404 增加部分图层 2020-10-09 13:16:34 +08:00
joylink_cuiweidong
c701ca11b2 哈尔滨一号线 行调仿真添加道岔的解封和单解操作 2020-10-09 11:30:57 +08:00
joylink_cuiweidong
03a3dd8b4e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-09 10:58:09 +08:00
joylink_cuiweidong
fa4ada05e4 场景编辑代码调整 2020-10-09 10:57:52 +08:00
lVAL
96d77eb652 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-09 10:25:32 +08:00
lVAL
c53219ea25 编排 iscs系统下 “环境与设备监控系统” 的菜单 2020-10-09 10:25:11 +08:00
sunzhenyu
077e470aaf 修改三维静态文件cbtc路径 2020-10-09 10:02:16 +08:00
joylink_cuiweidong
cb369c9113 竞赛场景代码调整 2020-09-30 18:36:05 +08:00
joylink_cuiweidong
9c8af370fa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-30 18:17:33 +08:00
joylink_cuiweidong
9885c50891 竞赛 场景代码调整 2020-09-30 18:16:08 +08:00
sunzhenyu
2ea728751f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-30 18:06:28 +08:00
sunzhenyu
f23bf269a0 修改三维编辑器轨道停车点显示,修改三维列车救援vr操作台逻辑 2020-09-30 18:06:20 +08:00
lVAL
3e623fe0a2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-30 17:18:15 +08:00
lVAL
15a08feef8 补充优化键盘事件处理bug 2020-09-30 17:18:01 +08:00
joylink_cuiweidong
6a0fbe5dc5 福州一号线 iscs 系统代码调整 2020-09-30 16:57:38 +08:00
joylink_cuiweidong
ea8387bd23 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-30 15:59:33 +08:00
joylink_cuiweidong
63e2957216 调度电话 仿真初始化代码调整 2020-09-30 15:59:19 +08:00
fan
46dca0d34b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-30 15:22:47 +08:00
fan
7cc1adf4ab 线路添加配置 2020-09-30 15:22:36 +08:00
joylink_cuiweidong
40753ee679 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-30 15:19:20 +08:00
joylink_cuiweidong
3a0b561aa0 竞赛场景 运营统计代码调整 2020-09-30 15:19:02 +08:00
lVAL
24326c4808 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-30 14:57:19 +08:00
lVAL
65c8aeffa5 删除打印 2020-09-30 14:57:08 +08:00
lVAL
ff3aa9bc45 补充修改card 复制粘贴的问题 2020-09-30 14:56:37 +08:00
fan
0b4d9b6483 调整平台路径 2020-09-30 11:17:55 +08:00
fan
817121f7ae Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-30 10:32:52 +08:00
fan
185b942a46 调整平台路径 2020-09-30 10:32:43 +08:00
joylink_cuiweidong
082144ee01 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-30 10:16:51 +08:00
joylink_cuiweidong
fc00a6c56f 哈尔滨线路 引导进路命令代码调整 2020-09-30 10:16:15 +08:00
lVAL
d331d4d2ca Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-30 09:54:38 +08:00
lVAL
1f14423567 修改 绘制card复制粘贴的bug 2020-09-30 09:54:26 +08:00
joylink_cuiweidong
97a58458b3 代码调整 2020-09-29 18:50:43 +08:00
joylink_cuiweidong
9f78bc530d 竞赛 会话代码调整 2020-09-29 18:44:04 +08:00
joylink_cuiweidong
773e61519d 调度电话代码调整 2020-09-29 17:46:42 +08:00
joylink_cuiweidong
e7cb90c1cb 调度电话代码调整 2020-09-29 15:57:50 +08:00
joylink_cuiweidong
a6458e1519 会话 全选车站代码调整 2020-09-29 13:30:12 +08:00
joylink_cuiweidong
a6bb1fb65a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-29 13:19:05 +08:00
joylink_cuiweidong
9141a6f92c 会话代码调整 3d挂载js路径修改 帮助文档路径修改 2020-09-29 13:18:31 +08:00
fan
f5a7b6220a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-29 09:40:51 +08:00
fan
3a99a68118 调整平台路径 2020-09-29 09:40:41 +08:00
joylink_cuiweidong
f39ee786b4 竞赛 场景代码调整 2020-09-29 09:31:29 +08:00
joylink_cuiweidong
dc930dae12 代码调整 2020-09-28 21:00:14 +08:00
joylink_cuiweidong
27d4c66c8c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-28 20:54:59 +08:00
joylink_cuiweidong
ca84d29af9 场景代码调整 2020-09-28 20:54:34 +08:00