Commit Graph

9586 Commits

Author SHA1 Message Date
fan
258796555e 车队进路调整 2021-01-21 19:11:50 +08:00
joylink_cuiweidong
2b6e1ca117 岔心 代码调整 2021-01-21 19:02:28 +08:00
joylink_cuiweidong
a9ea00c0c8 南京十一站 代码调整 2021-01-21 18:39:00 +08:00
fan
60e82ec34e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 17:45:09 +08:00
fan
ff6dac7c60 南二强解道岔&强解区段 2021-01-21 17:44:57 +08:00
lVAL
49b7de7cae 调整西安 开放自动进路和关闭自动进路 实训 2021-01-21 17:08:17 +08:00
lVAL
84306b2507 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 17:00:22 +08:00
lVAL
1e488cdec6 西安2号线,修改开放自动进路和取消自动进路 实训配置 2021-01-21 17:00:12 +08:00
lVAL
0b9aeacda3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 16:38:52 +08:00
joylink_cuiweidong
5fec6faef3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 16:38:49 +08:00
lVAL
2f2316e353 增加西安2区故解流程 2021-01-21 16:38:44 +08:00
joylink_cuiweidong
21f4b004c9 西安二号线 开放自动进路/关闭自动进路 操作添加 2021-01-21 16:38:29 +08:00
fan
45fd2d348b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 16:32:22 +08:00
fan
5b69262124 南京二好像长闪短闪调整 2021-01-21 16:32:11 +08:00
joylink_cuiweidong
8e958875f4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 15:54:13 +08:00
joylink_cuiweidong
e5069bbe92 西安二号线 部分操作 暂时隐藏 2021-01-21 15:53:51 +08:00
lVAL
56df3cd81c 添加 南京2 道岔 强解道岔配置 2021-01-21 15:53:37 +08:00
lVAL
bdbd5b9cc0 删除 福州2现地定位反位右键操作 2021-01-21 15:49:52 +08:00
lVAL
5bf71f2d7a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 15:28:32 +08:00
lVAL
c3c3548574 修改,西安2 删除现地 信号机封锁解封配置 2021-01-21 15:28:21 +08:00
joylink_cuiweidong
5b1e331d26 岔心区段 批量设置集中站 调整 2021-01-21 14:49:02 +08:00
joylink_cuiweidong
be9e15567e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 14:15:18 +08:00
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