Commit Graph

4111 Commits

Author SHA1 Message Date
zyy
8026e14da8 调整道岔重置,调整宁波定义 2020-04-09 17:03:22 +08:00
fan
47e692d3a4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 16:52:19 +08:00
fan
5036229c47 操作定义老地图处理 2020-04-09 16:51:17 +08:00
joylink_cuiweidong
3db904a75e 代码调整 2020-04-09 16:45:34 +08:00
joylink_cuiweidong
45e6a12825 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 16:32:15 +08:00
joylink_cuiweidong
5a8f4e0fe6 西安二号线 屏蔽门绘图代码调整 2020-04-09 16:31:53 +08:00
fan
0adcf6dac1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 16:14:29 +08:00
fan
79f473ad8b 实训管理老地图处理(未完) 2020-04-09 16:11:36 +08:00
zyy
184ff9d1e2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 15:21:57 +08:00
zyy
ee10377b04 调整区段字段显示逻辑,道岔计轴区段显示道岔菜单 2020-04-09 15:21:44 +08:00
fan
bcb9251f9e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 14:51:25 +08:00
fan
f2ba430cc5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 14:49:06 +08:00
joylink_cuiweidong
52e26e4d30 宁波一号线 查询进路状态步骤操作调整 2020-04-09 14:48:25 +08:00
fan
50579656eb 进路控制信号机按消息批次处理&西安二计轴调整&&实训管理老地图处理(未完) 2020-04-09 14:47:44 +08:00
joylink_cuiweidong
d9a8eb1c7d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 14:37:52 +08:00
joylink_cuiweidong
4f416e355d 宁波一号线现地 请求站控代码调整 2020-04-09 14:37:37 +08:00
zyy
15df2687c3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 13:45:18 +08:00
zyy
b6d03d24a8 调整区段绘制方式 2020-04-09 13:45:01 +08:00
joylink_cuiweidong
1f4d8ae061 西安二号线 站台绘图调整 2020-04-09 13:01:48 +08:00
joylink_cuiweidong
bcca3c5858 一键生成实训代码调整 2020-04-09 09:42:35 +08:00
zyy
78995be06f 调整右键点击道岔区段获取道岔菜单列表 2020-04-09 09:39:14 +08:00
joylink_cuiweidong
2ddd132327 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 09:23:25 +08:00
joylink_cuiweidong
c942d4e840 实训一键生成代码调整 2020-04-09 09:23:09 +08:00
fan
88bb30c413 实训管理调整(tabel 实训类型和操作不显示) 2020-04-08 18:47:48 +08:00
fan
9ea9d56309 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-08 18:39:31 +08:00
fan
630ccfd016 信号机调整 2020-04-08 18:38:08 +08:00
joylink_cuiweidong
c736edf9cc 代码调整 2020-04-08 16:45:51 +08:00
joylink_cuiweidong
132f7bad3c 代码调整 2020-04-08 16:27:55 +08:00
joylink_cuiweidong
78a8581152 宁波一号线 实训请求站控 操作调整 2020-04-08 16:24:44 +08:00
fan
2e1b356da9 调整区段限速判断 2020-04-08 16:21:08 +08:00
joylink_cuiweidong
4154b4ce20 系统指令字典添加 产品类型 参数 2020-04-08 15:59:49 +08:00
joylink_cuiweidong
dd2d572409 道岔的 确认计轴有效的指令参数修改 2020-04-08 15:43:09 +08:00
joylink_cuiweidong
9c4c447dee 宁波一号线操作代码调整 2020-04-08 15:37:05 +08:00
fan
b723628d80 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-08 15:33:45 +08:00
fan
5bd90ea0d1 实训操作类型筛选调整 2020-04-08 15:32:35 +08:00
joylink_cuiweidong
053648e0a3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-08 15:29:16 +08:00
joylink_cuiweidong
4c2ef28572 西安二号线 线路配置文件调整 2020-04-08 15:29:03 +08:00
joylink_cuiweidong
1554803dd4 代码调整 2020-04-08 15:27:55 +08:00
zyy
14e4c2c785 调整 框选设置元素 设备集中站流程 2020-04-08 15:20:29 +08:00
fan
df0d560df8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-08 14:25:27 +08:00
fan
02d4b8f71f 进路复制 2020-04-08 14:24:11 +08:00
zyy
85eef4b8f9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-08 14:14:04 +08:00
zyy
425b7d3869 Merge branch 'master' into test 2020-04-08 14:12:58 +08:00
fan
f495a2d560 实训占位符调整&皮肤调整 2020-04-08 14:06:45 +08:00
fan
013360534b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-08 13:29:30 +08:00
fan
507e28adde Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-08 13:25:45 +08:00
joylink_cuiweidong
23aa213778 指令字典参数调整 2020-04-08 13:25:10 +08:00
fan
b089aa6651 实训占位符调整&皮肤调整 2020-04-08 13:23:19 +08:00
joylink_cuiweidong
08a3480dad Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/scripts/OperationConfig.js
2020-04-08 13:10:31 +08:00
joylink_cuiweidong
613a88ca90 实训操作步骤文件拆分 2020-04-08 11:26:55 +08:00