fan
|
c0c1ef8d05
|
Revert "Revert "PSL""
This reverts commit 74249e59
|
2021-06-07 09:12:13 +08:00 |
|
fan
|
f10581e2dc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-04 18:06:13 +08:00 |
|
fan
|
74249e5992
|
Revert "PSL"
This reverts commit 185a3eff
|
2021-06-04 18:06:01 +08:00 |
|
fan
|
9832b0c87f
|
Revert "PSL"
This reverts commit 786d0f7a
|
2021-06-04 18:05:43 +08:00 |
|
sunzhenyu
|
e0b9861b78
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-04 18:05:19 +08:00 |
|
sunzhenyu
|
85e1faa60c
|
增加三维大铁返回按钮
|
2021-06-04 18:05:12 +08:00 |
|
yuan
|
95ce742d95
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yuanliye_PSL
|
2021-06-04 17:55:58 +08:00 |
|
yuan
|
786d0f7a9f
|
PSL
|
2021-06-04 17:55:39 +08:00 |
|
sunzhenyu
|
45a2c925ea
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-04 17:26:49 +08:00 |
|
sunzhenyu
|
23ad69529a
|
增加三维大铁驾驶界面更新，增加三维大铁信号机，修改大铁三维加载和大铁信号模块
|
2021-06-04 17:26:41 +08:00 |
|
fan
|
eb6ad1d7c8
|
调整列车故障处理 限速指令 参数范围和提示
|
2021-06-04 16:21:21 +08:00 |
|
fan
|
eeb52c7911
|
西安三列车菜单操作增加单位和提示
|
2021-06-04 16:12:16 +08:00 |
|
yuan
|
aa395d1206
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yuanliye_PSL
|
2021-06-04 16:06:12 +08:00 |
|
yuan
|
185a3eff6e
|
PSL
|
2021-06-04 16:05:56 +08:00 |
|
fan
|
b6a373a34a
|
西安三列车菜单位置调整
|
2021-06-04 14:57:08 +08:00 |
|
fan
|
50a7b6e039
|
南京二号线列监暂提
|
2021-06-04 14:22:39 +08:00 |
|
fan
|
4d89906af4
|
Merge remote-tracking branch 'origin/test_xian03training' into test
|
2021-06-04 09:52:12 +08:00 |
|
fan
|
3bcc904d5e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_xian03
|
2021-06-03 18:09:53 +08:00 |
|
fan
|
16c5659bb9
|
调整西安三号线早晚点文字提示
|
2021-06-03 18:09:43 +08:00 |
|
sunzhenyu
|
9ae1cf2ead
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-03 18:03:50 +08:00 |
|
sunzhenyu
|
1258bc4771
|
单独分出大铁三维单体设备，剔除无用接口，修改大铁驾驶界面，调试接口
|
2021-06-03 18:03:44 +08:00 |
|
fan
|
8004071e6f
|
绘图添加出站信号机进站信号机
|
2021-06-03 17:40:44 +08:00 |
|
fan
|
7ea850497a
|
西安三号线问题调整
|
2021-06-03 17:31:50 +08:00 |
|
fan
|
70d1ed2ce6
|
Merge branch 'test_xian03training' of https://git.code.tencent.com/lian-cbtc/jl-client into test_xian03training
|
2021-06-03 13:09:49 +08:00 |
|
fan
|
ae756864cf
|
西安三号线实训调整
|
2021-06-03 13:09:35 +08:00 |
|
joylink_cuiweidong
|
2a5ab20cde
|
西安三 界面 设置停站时间 显示重叠
|
2021-06-03 11:19:07 +08:00 |
|
yuan
|
c9af4a7031
|
emmm
|
2021-06-03 09:58:24 +08:00 |
|
fan
|
e34cafce7a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_tmt
|
2021-06-03 09:47:50 +08:00 |
|
fan
|
0d27da9d3b
|
南京二号线列监调整--暂提
|
2021-06-03 09:47:40 +08:00 |
|
fan
|
9dc64e67ed
|
南京二号线列监调整
|
2021-06-02 17:58:18 +08:00 |
|
fan
|
5bd0f380b6
|
南京二号线列监调整
|
2021-06-02 17:55:24 +08:00 |
|
fan
|
ad0cbdbd0f
|
南京二号线现地初始化列车没清调整
|
2021-06-02 10:22:24 +08:00 |
|
fan
|
3301f9abcd
|
南京二号线车站显示模块调整
|
2021-06-01 18:13:13 +08:00 |
|
fan
|
e134b23fcf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-01 17:50:46 +08:00 |
|
fan
|
25f546b205
|
南京二号线车站显示模块调整
|
2021-06-01 17:50:37 +08:00 |
|
joylink_cuiweidong
|
56ea29660f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-01 17:29:33 +08:00 |
|
joylink_cuiweidong
|
d58c80888e
|
西安三号线 添加道岔定反位失表
|
2021-06-01 17:29:02 +08:00 |
|
fan
|
35db44cd42
|
列车故障操作驾驶至调整
|
2021-06-01 15:36:18 +08:00 |
|
fan
|
6b90da452b
|
添加运行图加载规则
|
2021-06-01 14:57:40 +08:00 |
|
fan
|
a52c2d2126
|
信号机接近区段
|
2021-06-01 14:22:09 +08:00 |
|
fan
|
a8ce67ee4a
|
南京二号线调整
|
2021-06-01 14:06:18 +08:00 |
|
fan
|
9ac45050f9
|
列车指令调整
|
2021-06-01 11:01:02 +08:00 |
|
fan
|
a3b62e203d
|
列车指令调整
|
2021-06-01 10:22:10 +08:00 |
|
fan
|
c71f2fde96
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-01 10:13:25 +08:00 |
|
fan
|
9f4841e9e0
|
列车指令调整
|
2021-06-01 10:13:10 +08:00 |
|
zyy
|
e1958b1b8e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-31 15:53:03 +08:00 |
|
zyy
|
137b427ebe
|
调整新路预览配置
|
2021-05-31 15:52:46 +08:00 |
|
joylink_cuiweidong
|
426677ab57
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-31 15:50:59 +08:00 |
|
joylink_cuiweidong
|
3c34a5b319
|
更改 新版仿真订阅路径
|
2021-05-31 15:50:35 +08:00 |
|
sunzhenyu
|
cde07e6859
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-31 15:50:14 +08:00 |
|