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 |
|
fan
|
145259d3b5
|
传输信号机 && 佛山进路预览调整
|
2021-01-19 11:09:53 +08:00 |
|
joylink_cuiweidong
|
05a8c85d6b
|
代码调整
|
2021-01-19 09:20:37 +08:00 |
|
joylink_cuiweidong
|
4cbc3de4ea
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-18 18:06:23 +08:00 |
|
joylink_cuiweidong
|
ba80512efa
|
南京二号线 站台添加 月台 按钮
|
2021-01-18 18:06:08 +08:00 |
|
fan
|
f18c48ffa8
|
南京二号线初始获取车站调整&计轴占用状态调整
|
2021-01-18 17:24:00 +08:00 |
|
fan
|
1ba5d404b5
|
南京二号线进路锁闭封锁状态调整
|
2021-01-18 16:51:45 +08:00 |
|
fan
|
58f1bc5950
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-18 16:22:38 +08:00 |
|
fan
|
cff6a78d3a
|
南京二号线行调点击空白关闭
|
2021-01-18 16:22:26 +08:00 |
|
lVAL
|
198602923c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-18 15:49:00 +08:00 |
|
lVAL
|
7d61451fa9
|
修改 应答器 创建的几个优化问题，以及南京线路中心左键弹窗，右键不弹
|
2021-01-18 15:48:05 +08:00 |
|
fan
|
14091957d7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-18 15:41:43 +08:00 |
|
joylink_cuiweidong
|
d322aad5d4
|
南京二号线 站台安全门 通信正常开启状态 调整
|
2021-01-18 15:16:00 +08:00 |
|
fan
|
6aea2334e6
|
南京二号线 控制模式none 车站字体闪烁
|
2021-01-18 14:10:55 +08:00 |
|
fan
|
fa412d1079
|
南京二号线 状态调整
|
2021-01-18 10:52:06 +08:00 |
|
fan
|
1c9c8aab8a
|
南京二号线 道岔 侧防 和进路锁闭 优先级调整
|
2021-01-15 18:00:32 +08:00 |
|
fan
|
bacdca5e19
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 17:53:05 +08:00 |
|
fan
|
844b2ee382
|
南京二号线引导进路
|
2021-01-15 17:52:54 +08:00 |
|
joylink_cuiweidong
|
0eb7ca8a06
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 17:17:33 +08:00 |
|
joylink_cuiweidong
|
f61df9b1e8
|
岔心状态 绘图代码调整
|
2021-01-15 17:17:17 +08:00 |
|
fan
|
45869c5362
|
信号机状态调整
|
2021-01-15 16:59:58 +08:00 |
|
fan
|
a60209a10f
|
信号机状态调整
|
2021-01-15 16:01:15 +08:00 |
|
fan
|
cd5bcfe888
|
信号机&道岔状态调整
|
2021-01-15 15:24:19 +08:00 |
|
lVAL
|
356042f673
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 11:00:05 +08:00 |
|
lVAL
|
ec30635c02
|
修改应答器图层以及回车修改属性的问题
|
2021-01-15 10:59:58 +08:00 |
|
joylink_cuiweidong
|
04e4df6225
|
代码调整
|
2021-01-15 10:38:35 +08:00 |
|
joylink_cuiweidong
|
4e28468ad9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 10:33:15 +08:00 |
|
joylink_cuiweidong
|
a86c76422f
|
岔心绘图代码调整
区段绘图（左右关联区段 关系）调整
|
2021-01-15 10:32:57 +08:00 |
|
fan
|
15928a6248
|
道岔封锁状态调整
|
2021-01-15 09:42:19 +08:00 |
|
joylink_cuiweidong
|
c8d0bf50f5
|
代码调整
|
2021-01-14 17:11:10 +08:00 |
|
joylink_cuiweidong
|
06edd5f531
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-14 17:00:04 +08:00 |
|
joylink_cuiweidong
|
3dd6696140
|
代码调整
|
2021-01-14 16:59:41 +08:00 |
|
fan
|
359e24dfbd
|
merge
|
2021-01-14 16:35:45 +08:00 |
|
fan
|
ab804e3b95
|
南京二号线状态调整 道岔长闪
|
2021-01-14 16:26:04 +08:00 |
|
joylink_cuiweidong
|
28babc78f9
|
岔心 绘图调整
|
2021-01-14 16:03:48 +08:00 |
|
fan
|
ec87dc8eaf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-14 14:43:03 +08:00 |
|
fan
|
9c7c0f674e
|
南京二号线状态调整
|
2021-01-14 14:42:53 +08:00 |
|
joylink_cuiweidong
|
845f10caf6
|
岔心绘图代码调整
bug调整：新建完一个信号机 三个状态不发生改变
|
2021-01-14 13:04:04 +08:00 |
|
joylink_cuiweidong
|
3be5df98e8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-13 18:33:21 +08:00 |
|
joylink_cuiweidong
|
becb6a03df
|
岔心代码调整
|
2021-01-13 18:33:07 +08:00 |
|
lVAL
|
1dfa8f5b19
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-13 18:08:02 +08:00 |
|
lVAL
|
37bc98d706
|
修改应答器 计算方式
|
2021-01-13 18:07:49 +08:00 |
|
joylink_cuiweidong
|
c42a184b7b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-13 17:54:11 +08:00 |
|
joylink_cuiweidong
|
7ac59f6006
|
岔心 绘图代码调整
|
2021-01-13 17:53:51 +08:00 |
|
lVAL
|
9f4155b70d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-13 17:45:49 +08:00 |
|
lVAL
|
15f94a7d1d
|
优化 应答器创建 选择关联区段类型 以及优化绘制显示位置
|
2021-01-13 17:45:38 +08:00 |
|
joylink_cuiweidong
|
752b4e9a26
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/config/skinCode/nanjing_02.js
# src/jmapNew/utils/parser.js
|
2021-01-13 17:43:15 +08:00 |
|
joylink_cuiweidong
|
99644039d3
|
新建车站以后 无法点击其他的东西 bug 调整
|
2021-01-13 17:34:57 +08:00 |
|
joylink_cuiweidong
|
7599458c8f
|
岔心 元素绘图代码调整
|
2021-01-13 17:01:53 +08:00 |
|
lVAL
|
fd3f82e7ba
|
修改炼精二号线 逻辑区段名称大小
|
2021-01-13 14:18:48 +08:00 |
|
lVAL
|
006d784178
|
修改应答器bug
|
2021-01-13 10:26:52 +08:00 |
|
joylink_cuiweidong
|
fbb8157ff1
|
代码调整
|
2021-01-12 20:20:56 +08:00 |
|
joylink_cuiweidong
|
12acee5bc7
|
代码调整
|
2021-01-12 18:06:52 +08:00 |
|
joylink_cuiweidong
|
1e2e8c2609
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/config/skinCode/nanjing_02.js
# src/jmapNew/shape/Responder/index.js
|
2021-01-12 17:27:25 +08:00 |
|
joylink_cuiweidong
|
85a88a9431
|
岔心 绘图代码调整
|
2021-01-12 17:25:32 +08:00 |
|
lVAL
|
64df012fc3
|
设置应答器 绘图显示 仿真不显示
|
2021-01-12 11:32:39 +08:00 |
|
lVAL
|
8c261bb3a6
|
优化应答器 状态处理功能
|
2021-01-12 11:00:16 +08:00 |
|
lVAL
|
7bacd3c49f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-12 10:07:50 +08:00 |
|
lVAL
|
9bd12bb82e
|
增加应答器配置
|
2021-01-12 10:07:31 +08:00 |
|
fan
|
9a74d3ee39
|
成绩导出调整
|
2021-01-11 17:51:54 +08:00 |
|