joylink_cuiweidong
|
16f255fcae
|
bug136 南铁院11站：现地仿真里岔心设置限速后不显示数字 调整
|
2021-01-21 14:15:00 +08:00 |
|
fan
|
e71fe4cea8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-21 13:45:32 +08:00 |
|
fan
|
6df9350155
|
卡斯柯实训调整&南京二号线封锁调整
|
2021-01-21 13:45:20 +08:00 |
|
sunzhenyu
|
19fb971847
|
修改三维驾驶非驾驶车辆更新逻辑
|
2021-01-21 11:16:19 +08:00 |
|
sunzhenyu
|
f13b062db8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-21 11:14:02 +08:00 |
|
sunzhenyu
|
6647ff9b58
|
修改三维驾驶非驾驶车辆更新逻辑
|
2021-01-21 11:13:53 +08:00 |
|
lVAL
|
eac5a23ddf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/foshan_01/operationConfig.js
|
2021-01-21 11:10:52 +08:00 |
|
lVAL
|
b8a36028fd
|
增加 佛山线全线限速配置注释
|
2021-01-21 11:09:51 +08:00 |
|
joylink_cuiweidong
|
1d32bd66b4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/foshan_01/operationConfig.js
|
2021-01-21 11:04:25 +08:00 |
|
joylink_cuiweidong
|
cd9aa64552
|
佛山线路 实训代码调整
|
2021-01-21 11:02:04 +08:00 |
|
lVAL
|
322f0724c1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-21 10:42:27 +08:00 |
|
lVAL
|
f0829b768b
|
增加佛州线实训配置
|
2021-01-21 10:42:17 +08:00 |
|
fan
|
356ec2db79
|
南京二号线调整
|
2021-01-21 10:13:30 +08:00 |
|
fan
|
ac4580f1b3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-21 10:06:13 +08:00 |
|
fan
|
89700f2245
|
卡斯柯调整
|
2021-01-21 10:05:59 +08:00 |
|
joylink_cuiweidong
|
c5da33da6f
|
代码调整
|
2021-01-20 18:47:19 +08:00 |
|
lVAL
|
8e634b78e9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 18:45:24 +08:00 |
|
lVAL
|
9ed523fb86
|
增加佛州控制模式
|
2021-01-20 18:45:05 +08:00 |
|
fan
|
50321992c0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 18:29:24 +08:00 |
|
fan
|
75e48959ba
|
调整生成课程和试卷问题&设置运行等级报错调整
|
2021-01-20 18:29:12 +08:00 |
|
joylink_cuiweidong
|
ea99e7a9e4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 18:13:58 +08:00 |
|
lVAL
|
2dc837020c
|
增加控制模式实训
|
2021-01-20 18:14:03 +08:00 |
|
joylink_cuiweidong
|
7171601b06
|
佛山线路 实训 代码调整
|
2021-01-20 18:13:42 +08:00 |
|
lVAL
|
2408e28509
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/foshan_01/operationConfig.js
|
2021-01-20 17:53:00 +08:00 |
|
lVAL
|
87f2d274d1
|
修改指令
|
2021-01-20 17:52:34 +08:00 |
|
joylink_cuiweidong
|
913a9229d9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 17:47:22 +08:00 |
|
joylink_cuiweidong
|
cc462621f5
|
佛山线 实训 代码调整
|
2021-01-20 17:47:05 +08:00 |
|
lVAL
|
d2a7098a90
|
删除测试 debugger
|
2021-01-20 17:43:56 +08:00 |
|
lVAL
|
5cacc9b6e6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 17:42:50 +08:00 |
|
lVAL
|
338a7c9cbe
|
增加信号机封锁解封 实训
|
2021-01-20 17:42:42 +08:00 |
|
fan
|
2440e1e280
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 16:47:31 +08:00 |
|
fan
|
295ddee738
|
调整showMode初始值
|
2021-01-20 16:47:20 +08:00 |
|
lVAL
|
8d25d8c1d8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 16:33:31 +08:00 |
|
lVAL
|
711f0bc70a
|
修改 成都3 实训配置情况
|
2021-01-20 16:33:19 +08:00 |
|
fan
|
287e6251b7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 16:26:42 +08:00 |
|
fan
|
5a36ce69fe
|
添加线路配置项 signalHumanControlBeforeSetAtsControlOrCIAutoTrigger、cancelAtsControlOfAllRoutesWhenCancelRoute
|
2021-01-20 16:26:32 +08:00 |
|
joylink_cuiweidong
|
88234d9154
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 16:20:58 +08:00 |
|
joylink_cuiweidong
|
fe81a31883
|
佛山有轨电车 线路 暂时隐藏 iscs ibp 数据
|
2021-01-20 16:20:20 +08:00 |
|
lVAL
|
a4a7494975
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 16:10:25 +08:00 |
|
lVAL
|
78822e9c30
|
成都3 实训引导总锁配置，先注释掉
|
2021-01-20 16:10:14 +08:00 |
|
fan
|
2e4cdc698e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 16:07:37 +08:00 |
|
fan
|
70045c8f87
|
现地行调条件显示调整
|
2021-01-20 16:07:10 +08:00 |
|
lVAL
|
5764a103c8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 15:53:51 +08:00 |
|
lVAL
|
c8e2b30271
|
增加 成都3 中控、站控、紧急站控、扣车、设置跳停、取消跳停实训
|
2021-01-20 15:53:36 +08:00 |
|
fan
|
25b6ad4ca8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 15:53:23 +08:00 |
|
fan
|
34aca8de12
|
现地行调条件显示调整
|
2021-01-20 15:53:13 +08:00 |
|
sunzhenyu
|
1286bb79ba
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 15:41:30 +08:00 |
|
sunzhenyu
|
0fb8eeb52b
|
修改三维驾驶和沙盘读取站场图内外侧数据验证
|
2021-01-20 15:41:20 +08:00 |
|
joylink_cuiweidong
|
c8c4264be9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 15:32:08 +08:00 |
|
joylink_cuiweidong
|
057d7a7d75
|
北交大项目 运行图预览打不开 bug 处理
|
2021-01-20 15:31:41 +08:00 |
|