Commit Graph

4026 Commits

Author SHA1 Message Date
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
zyy
f3951c05e1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-08 10:42:21 +08:00
zyy
a27ee1e859 调整一键生成实训延迟显示 2020-04-08 10:42:06 +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
joylink_cuiweidong
3de6121cbf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-07 18:25:08 +08:00
joylink_cuiweidong
90351b37c2 北京线路步骤操作代码调整 2020-04-07 18:24:45 +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
fan
0079b698e3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-07 16:45:48 +08:00
fan
88b4bcf2bb 指令接口调整 2020-04-07 16:44:36 +08:00
fan
d3bd167c70 实训管理调整 2020-04-07 16:41:08 +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
joylink_cuiweidong
573a977544 代码调整 2020-04-07 09:52:37 +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
joylink_cuiweidong
2e0b20cfb0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-03 18:10:20 +08:00
joylink_cuiweidong
b6c571e4e5 代码调整 2020-04-03 18:10:02 +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
fan
1e19840405 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-03 17:45:44 +08:00
fan
5f7804f090 佛山运行图导入 2020-04-03 17:44:17 +08:00
fan
255ab83233 佛山运行图导入 2020-04-03 17:40:18 +08:00
sunzhenyu
c3de769691 限制驾驶视角 2020-04-03 17:21:00 +08:00
sunzhenyu
b7377f7ff1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-03 16:56:08 +08:00
sunzhenyu
7429fc47bb 修改三维仿真驾驶站台和轨道 2020-04-03 16:55:59 +08:00
joylink_cuiweidong
38a05e530d 北京一号线现地操作步骤代码调整 2020-04-03 16:31:57 +08:00