joylink_cuiweidong
|
030a603da4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-27 10:40:50 +08:00 |
|
joylink_cuiweidong
|
c52474b771
|
宁波三号线（泰雷兹）
扣车后没有显示扣车标识修改
|
2021-01-27 10:38:34 +08:00 |
|
fan
|
f92e017f1b
|
调整南京二号线岔区设限显示
|
2021-01-26 18:19:04 +08:00 |
|
fan
|
abed3ef7c1
|
BUG108: 浙大网新仿真：道岔单解时出现字母“E”后，右键点击出现“使能”，此时不点击使能，而点击空白处，再点击字母E，没有反应，并且初始化后E还在闪烁 && 南京二排列进路后封锁区段显示调整
|
2021-01-26 16:19:29 +08:00 |
|
joylink_cuiweidong
|
bd9917c0ca
|
道岔区段 切除闪烁绘图代码调整
|
2021-01-26 14:04:17 +08:00 |
|
joylink_cuiweidong
|
194b31094d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-25 17:48:00 +08:00 |
|
joylink_cuiweidong
|
6b0d8cf772
|
代码调整
|
2021-01-25 17:47:49 +08:00 |
|
fan
|
f4db53df3f
|
调整南京二号线显示问题
|
2021-01-25 17:42:01 +08:00 |
|
joylink_cuiweidong
|
e49cce6b8a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-25 13:51:23 +08:00 |
|
joylink_cuiweidong
|
41447e97dc
|
代码调整
|
2021-01-25 13:51:13 +08:00 |
|
joylink_cuiweidong
|
d3546c5de2
|
岔心鼠标事件 绘图代码调整
|
2021-01-25 13:48:37 +08:00 |
|
fan
|
98342c2423
|
南京二号线遮盖信号机的颜色调整
|
2021-01-25 10:23:13 +08:00 |
|
fan
|
a55f69a3cb
|
南京二号线 延时解锁
|
2021-01-22 21:28:30 +08:00 |
|
fan
|
32f68ed895
|
道岔状态调整
|
2021-01-22 19:35:14 +08:00 |
|
fan
|
97d8a66ccb
|
道岔的故障和预复位的显示
|
2021-01-22 16:55:00 +08:00 |
|
fan
|
e0fe554699
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-22 13:59:42 +08:00 |
|
fan
|
4a0c7e1e95
|
逻辑区段实际长度设置调整
|
2021-01-22 13:59:32 +08:00 |
|
joylink_cuiweidong
|
5d7810b6f9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-21 19:19:41 +08:00 |
|
joylink_cuiweidong
|
3e6da71787
|
代码调整
|
2021-01-21 19:19:20 +08:00 |
|
fan
|
2cdbc1ee78
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-21 19:12:17 +08:00 |
|
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
|
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 |
|
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
|
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 |
|
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 |
|
fan
|
89700f2245
|
卡斯柯调整
|
2021-01-21 10:05:59 +08:00 |
|
fan
|
5a36ce69fe
|
添加线路配置项 signalHumanControlBeforeSetAtsControlOrCIAutoTrigger、cancelAtsControlOfAllRoutesWhenCancelRoute
|
2021-01-20 16:26:32 +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
|
34aca8de12
|
现地行调条件显示调整
|
2021-01-20 15:53:13 +08:00 |
|
lVAL
|
332aa9b61a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-19 18:22:14 +08:00 |
|
lVAL
|
35a98a6e00
|
修改 nameAlone 报错的优化
|
2021-01-19 18:22:04 +08:00 |
|
joylink_cuiweidong
|
10ed69f5ec
|
代码调整
|
2021-01-19 17:44:18 +08:00 |
|
joylink_cuiweidong
|
745dbd6859
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-19 17:15:07 +08:00 |
|
joylink_cuiweidong
|
df6ede1e4b
|
南京二号线 站台操作调整
|
2021-01-19 17:14:47 +08:00 |
|
fan
|
c6e9e1fe38
|
列车状态调整
|
2021-01-19 16:07:32 +08:00 |
|
fan
|
12be0c61cb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-19 13:26:05 +08:00 |
|
fan
|
daea6e1760
|
传输信号机选中状态
|
2021-01-19 13:25:53 +08:00 |
|
lVAL
|
5f80334433
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-19 13:04:06 +08:00 |
|
lVAL
|
696af622b7
|
调整南京2岔芯设置限速和设置封锁
|
2021-01-19 13:03:43 +08:00 |
|
fan
|
732c44fea0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-19 11:10:04 +08:00 |
|