Commit Graph

5382 Commits

Author SHA1 Message Date
joylink_cuiweidong
b0e5d7a6b6 信号机操作代码整理 2020-06-18 09:46:29 +08:00
joylink_cuiweidong
426aed9ef1 剧本代码调整 2020-06-18 09:20:42 +08:00
joylink_cuiweidong
eefbf70002 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-17 18:36:45 +08:00
joylink_cuiweidong
0983307bc7 剧本代码调整 2020-06-17 18:36:22 +08:00
zyy
ceb3602ab2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-17 18:29:47 +08:00
zyy
6c272d3a6c 调整组件 2020-06-17 18:29:35 +08:00
sunzhenyu
47d77d6925 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-17 18:17:00 +08:00
sunzhenyu
b70feae183 增加三维驾驶超速报警和牵引状态mmi显示,增加剧本设计中三维驾驶 2020-06-17 18:16:49 +08:00
zyy
b39f278a5d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-17 17:48:33 +08:00
zyy
c35ceb948c 道岔公共组件提取 2020-06-17 17:48:19 +08:00
joylink_cuiweidong
1886663445 宁波一号线,北京一号线,佛山有轨电车操作代码调整 2020-06-17 17:08:34 +08:00
joylink_cuiweidong
068fc65f3d 剧本代码调整 2020-06-17 15:33:04 +08:00
joylink_cuiweidong
da2e975094 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-17 15:31:39 +08:00
joylink_cuiweidong
556d7fa109 仿真右侧列车显示代码调整 2020-06-17 15:31:15 +08:00
zyy
a047c9996e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-17 15:24:28 +08:00
zyy
ba8f138de3 提取信号机通用组件 2020-06-17 15:24:16 +08:00
fan
bc4ad0658e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-17 14:57:32 +08:00
fan
7ae4206448 福州一号线操作定义配置 2020-06-17 14:57:20 +08:00
joylink_cuiweidong
283206e55d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-17 14:19:07 +08:00
joylink_cuiweidong
b78f90034a 剧本录制代码调整 2020-06-17 14:18:46 +08:00
fan
ca539976a0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-17 13:35:34 +08:00
fan
89ae6e8c0f 列车整理 2020-06-17 13:35:21 +08:00
sunzhenyu
3ec20a75c6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-17 13:32:29 +08:00
sunzhenyu
71a0faa648 三维cctv站台名站台标方向添加 2020-06-17 13:32:14 +08:00
zyy
52bee79e22 删除多余组件 2020-06-17 11:16:56 +08:00
zyy
18c4d36606 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-17 10:30:11 +08:00
zyy
b530818a7e 调整综合检控 cctv 流程 2020-06-17 10:29:56 +08:00
joylink_cuiweidong
9da1e3bbac Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-17 09:57:13 +08:00
joylink_cuiweidong
584654daec 剧本代码调整 2020-06-17 09:56:51 +08:00
zyy
88ac5afa45 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-17 09:16:16 +08:00
zyy
17158401de 调整综合监控导航栏 2020-06-17 09:16:03 +08:00
joylink_cuiweidong
4fb17151df 佛山有轨电车操作代码调整 2020-06-17 09:01:18 +08:00
fan
6cc44b5528 合并代码 2020-06-16 18:38:21 +08:00
fan
3b171130f9 福州列车显示调整&表单组件button增加loading 2020-06-16 18:36:18 +08:00
sunzhenyu
e7a9b8f737 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-16 18:18:56 +08:00
sunzhenyu
e415dc28c0 修改三维驾驶mmi车门显示和控制面板关门灯 2020-06-16 18:18:47 +08:00
zyy
73338a7eaa 增加宁波线路车站折返逻辑 2020-06-16 17:49:55 +08:00
zyy
6d7c75e5f8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-16 16:39:20 +08:00
zyy
7f242ba443 调整综合监控绘图元素, 调整按图折返配置 2020-06-16 16:39:07 +08:00
fan
d0e862823a 控制模式转换调整 2020-06-16 15:33:38 +08:00
fan
5462b24c6a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-16 15:10:47 +08:00
fan
a6ff101a6e 竞业达页面调整 2020-06-16 15:10:39 +08:00
zyy
53823aea04 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-16 15:02:00 +08:00
zyy
f62de1971f 增加宁波线路 站后折返皮肤配置 2020-06-16 15:01:29 +08:00
fan
5ecb65a577 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-16 14:53:08 +08:00
fan
db98a53907 福州道岔&列车操作 2020-06-16 14:52:57 +08:00
zyy
10502988a4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-16 14:45:50 +08:00
zyy
dfdbddad2b 调整综合监控数据,调整地图绘制功能按钮显示状态逻辑判断 2020-06-16 14:45:34 +08:00
fan
2e5b07d7e2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-16 13:56:47 +08:00
fan
5292afe4dd 宁波一号线人工车头码车显示&哈尔滨title+V1.0&福州道岔操作调整(未完) 2020-06-16 13:56:33 +08:00