Commit Graph

7307 Commits

Author SHA1 Message Date
lVAL
df1fcc8f82 修改代码 2020-10-15 18:53:45 +08:00
lVAL
fe93ecebe2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-15 16:06:06 +08:00
lVAL
c2b87acfe3 增加AUS运行图编辑工具代码 2020-10-15 16:05:55 +08:00
lVAL
80fb7641ae 增加AUS运行图工具的代码 2020-10-15 16:05:30 +08:00
joylink_cuiweidong
cd55c5b269 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-15 15:39:50 +08:00
joylink_cuiweidong
45932bb10a 代码调整 2020-10-15 15:39:33 +08:00
zyy
89958942de Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-15 15:28:36 +08:00
zyy
114516abb8 调整综合监控 2020-10-15 15:28:23 +08:00
fan
41f70aadd8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-15 14:18:11 +08:00
fan
a0ac1a58e7 方向杆调整数据 2020-10-15 14:17:55 +08:00
zyy
78dd2f3d26 调整综合监控开关状态 2020-10-15 10:30:30 +08:00
zyy
3770b4a153 保存状态 2020-10-15 09:38:36 +08:00
zyy
f28262bb72 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-14 19:10:10 +08:00
zyy
4b9a98c35a 调整综合监控流程 2020-10-14 19:09:53 +08:00
lVAL
d68824b79a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-14 18:50:17 +08:00
lVAL
0010d78570 增加澳大利亚运行图编辑功能 2020-10-14 18:50:03 +08:00
joylink_cuiweidong
126a413819 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-14 18:10:48 +08:00
joylink_cuiweidong
f91dd07cab 竞赛 场景代码调整 2020-10-14 18:10:32 +08:00
sunzhenyu
a18fe74ab5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-14 18:04:16 +08:00
sunzhenyu
105b738416 修复三维cctv中列车和屏蔽门渲染顺序bug 2020-10-14 18:04:09 +08:00
joylink_cuiweidong
17a18eb328 竞赛 实操 场景调整 2020-10-14 17:10:25 +08:00
joylink_cuiweidong
96dfec83eb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-14 16:20:08 +08:00
joylink_cuiweidong
f02a55724b 代码调整 2020-10-14 16:19:52 +08:00
fan
c1d630d9f8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-14 14:28:02 +08:00
fan
17beb7b37f 方向杆调整 2020-10-14 14:27:52 +08:00
joylink_cuiweidong
9c0ef5d8af Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-14 13:35:57 +08:00
joylink_cuiweidong
5f921b7430 代码调整 2020-10-14 13:35:40 +08:00
fan
ac00ecfea7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-14 13:29:41 +08:00
fan
61fe081713 方向杆调整 2020-10-14 13:29:31 +08:00
joylink_cuiweidong
ce505f915b 竞赛平台代码调整 2020-10-14 09:47:19 +08:00
joylink_cuiweidong
a5025eda1c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-13 18:42:18 +08:00
joylink_cuiweidong
cafa638438 竞赛代码调整 2020-10-13 18:41:55 +08:00
lVAL
7f4f0d661f 修改代码 2020-10-13 18:38:43 +08:00
lVAL
9bcb18baae Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-13 18:36:03 +08:00
lVAL
a042147faf 增加group组功能 2020-10-13 18:35:50 +08:00
zyy
407afa8cd5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-13 18:31:47 +08:00
zyy
e625f4ddb7 增加编组元素列表 2020-10-13 18:31:34 +08:00
fan
8370b0cbd2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-13 18:13:21 +08:00
fan
42f706d39d 会话调整 2020-10-13 18:13:10 +08:00
sunzhenyu
645877580d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-13 18:12:06 +08:00
sunzhenyu
96ffe64eb6 修改三维vr通号上下车切换站台bug,分离三维vr通号中冗杂代码,优化部分vr功能 2020-10-13 18:11:55 +08:00
joylink_cuiweidong
d9802336c5 竞赛平台实操代码调整 2020-10-13 17:32:39 +08:00
joylink_cuiweidong
2c3c46c5bc 场景编辑代码调整 2020-10-13 17:11:46 +08:00
joylink_cuiweidong
f3f1bd8b5d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-13 16:40:27 +08:00
joylink_cuiweidong
95eb654911 场景代码调整 2020-10-13 16:39:11 +08:00
fan
d1aa2b8f39 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-13 16:34:44 +08:00
fan
9e437e43ad 方向杆调整 2020-10-13 16:34:33 +08:00
zyy
e2518c3eef Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-13 16:19:22 +08:00
zyy
eb87177bae 调整编组内容数字跟着变化 2020-10-13 16:19:13 +08:00
lVAL
d07db0e516 增加 card页面 2020-10-13 15:38:07 +08:00