Commit Graph

6746 Commits

Author SHA1 Message Date
fan
246568175f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-31 13:28:32 +08:00
fan
c44a081afa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-31 13:27:38 +08:00
fan
8c07cf764a 代码调整 2020-08-31 13:27:27 +08:00
zyy
00ebcd739e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-31 13:25:41 +08:00
zyy
41fe728af4 调整运行图显示 2020-08-31 13:25:26 +08:00
sunleking
9ca8f50dea 修改按钮文字描述 2020-08-31 11:16:18 +08:00
zyy
d579dc7a73 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-31 10:35:07 +08:00
zyy
8e6280e542 调整格式 2020-08-31 10:34:51 +08:00
joylink_cuiweidong
2637b952f3 代码调整 2020-08-31 10:31:36 +08:00
joylink_cuiweidong
b98039d5fd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-31 10:13:39 +08:00
joylink_cuiweidong
8027bc90ae 宁波福州佛山默认不显示道岔区段的名称调整 2020-08-31 10:13:26 +08:00
zyy
bdbb99a1fb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-31 10:11:20 +08:00
zyy
778387a0e9 调整扣车流程, 状态 2020-08-31 10:11:02 +08:00
fan
e6f7ade236 调度大赛调整 2020-08-31 09:23:12 +08:00
fan
bf381cb697 调度大赛调整 2020-08-28 18:04:46 +08:00
fan
589513759f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 17:57:56 +08:00
fan
818010b18f 调度大赛调整 2020-08-28 17:57:42 +08:00
zyy
d2b75185fc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 17:47:30 +08:00
zyy
ae02d527c9 调整福州线路新版操作 2020-08-28 17:47:17 +08:00
sunzhenyu
4668783e72 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 17:27:00 +08:00
sunzhenyu
ed00bc646b 修复三维驾驶切车后未复位模型 2020-08-28 17:26:51 +08:00
zyy
5dcfee72d6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 17:22:26 +08:00
zyy
adb62a3209 增加列车右键操作,调整配置 2020-08-28 17:22:12 +08:00
fan
ba505a899e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 16:58:33 +08:00
fan
a28f7a3975 调度大赛调整 2020-08-28 16:58:17 +08:00
joylink_cuiweidong
576c62bf4a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 16:52:33 +08:00
joylink_cuiweidong
d5dabca2c6 代码调整
区段(parentCode)字段处理
2020-08-28 16:52:19 +08:00
fan
56aefdb207 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 15:28:37 +08:00
fan
16a4b0fb84 调度大赛调整 2020-08-28 15:28:24 +08:00
joylink_cuiweidong
b4c5a29026 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 14:43:47 +08:00
joylink_cuiweidong
3ffffffe8d 宁波一号线实训调整
剧本编制代码调整
2020-08-28 14:43:30 +08:00
sunzhenyu
79af11beb6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 14:42:12 +08:00
sunzhenyu
7b6281ab42 修改第三人称观看vr初始视角,修改三维驾驶webworker中解析字符串 2020-08-28 14:42:04 +08:00
zyy
a5180c306c 调整运行图 2020-08-28 14:29:59 +08:00
zyy
a12939ded9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 13:29:57 +08:00
zyy
152c472b69 调整考试流程 2020-08-28 13:29:45 +08:00
fan
4c8e447d59 运行图参数调整 2020-08-28 13:16:14 +08:00
zyy
d991a65517 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 11:31:10 +08:00
zyy
1f8641e3ea 调整运行图 2020-08-28 11:30:55 +08:00
fan
f3e65258d9 行调大赛调整 2020-08-28 11:04:12 +08:00
fan
0adf841597 行调大赛调整 2020-08-28 10:59:44 +08:00
fan
74a5459a32 调度大赛调整 2020-08-27 19:05:15 +08:00
fan
d4118c58a0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 19:02:00 +08:00
fan
f87506dfd9 调度大赛调整 2020-08-27 19:01:50 +08:00
joylink_cuiweidong
ea1f4c4dee 剧本预览代码调整 2020-08-27 18:46:00 +08:00
zyy
4ba9bcdc82 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 18:41:49 +08:00
zyy
ae9f9a962b 调整加载代码 2020-08-27 18:41:33 +08:00
fan
3c016a5c4b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 17:21:13 +08:00
fan
869981f606 调度大赛调整 2020-08-27 17:21:01 +08:00
sunzhenyu
70cf60d9a6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 17:13:42 +08:00