Commit Graph

743 Commits

Author SHA1 Message Date
fan
7e0834b13a 代码哈尔滨实训数据&本地导入导出 2020-04-09 18:22:10 +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
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
4f416e355d 宁波一号线现地 请求站控代码调整 2020-04-09 14:37:37 +08:00
joylink_cuiweidong
1f4d8ae061 西安二号线 站台绘图调整 2020-04-09 13:01:48 +08:00
zyy
78995be06f 调整右键点击道岔区段获取道岔菜单列表 2020-04-09 09:39:14 +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
dd2d572409 道岔的 确认计轴有效的指令参数修改 2020-04-08 15:43:09 +08:00
joylink_cuiweidong
9c4c447dee 宁波一号线操作代码调整 2020-04-08 15:37:05 +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
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
fan
d82b89b57e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-07 18:32:00 +08:00
fan
a1c4a901af 实训步骤生成 2020-04-07 18:30:46 +08:00
zyy
635b593b56 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-07 18:23:48 +08:00
zyy
f12f84f97b 调整实训一键生成,调整宁波线路实训定义 2020-04-07 18:22:26 +08:00
joylink_cuiweidong
778d74ecd5 北京一号线现地 道岔 站台实训操作步骤代码调整 2020-04-07 17:19:28 +08:00
zyy
f26eea8f4b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-07 16:19:34 +08:00
zyy
402a383bf6 删除多余打印,调整名称 2020-04-07 16:19:24 +08:00
joylink_cuiweidong
2853eb04fd 宁波线路实训操作代码调整 2020-04-07 15:25:33 +08:00
fan
87ddad535b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-07 14:41:38 +08:00
fan
6667adca07 实训调整 2020-04-07 14:40:24 +08:00
zyy
1f6b627768 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-07 13:38:28 +08:00
zyy
aa06844b18 地图绘制信号机增加偏移量字段 2020-04-07 13:37:17 +08:00
fan
6498f68295 宁波实训调整 2020-04-07 13:09:34 +08:00
zyy
d3f28ff338 Merge branch 'test' 2020-04-03 18:34:04 +08:00
fan
75bb1f315e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-03 18:32:49 +08:00
fan
64401f7085 宁波设置通过模式时为止偏移 2020-04-03 18:31:38 +08:00
zyy
0a6f32d6b2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-03 18:09:23 +08:00
zyy
da896de45b 调整进路流程,定义 2020-04-03 18:09:07 +08:00