Commit Graph

4146 Commits

Author SHA1 Message Date
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
sunzhenyu
6f4c81473c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-03 15:08:31 +08:00
sunzhenyu
76d17b380e 修改三维车站屏蔽门动画 2020-04-03 15:08:17 +08:00
joylink_cuiweidong
bab89c4bae Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-03 14:44:08 +08:00
joylink_cuiweidong
f323651087 北京一号线现地行调操作步骤调整 2020-04-03 14:43:54 +08:00
fan
19900d9816 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-03 13:36:59 +08:00
fan
6147d2f32a 注释环境变量VUE_APP_PRO 2020-04-03 13:35:29 +08:00
fan
ba759b1d77 哈尔滨本地项目调整 2020-04-03 13:33:33 +08:00
zyy
6fd9276fe8 调整实训步骤,及地图加载状态 2020-04-03 13:30:04 +08:00
fan
62131c2166 成都三实训调整 2020-04-03 13:08:06 +08:00
joylink_cuiweidong
e5067edcce 北京一号线区段操作步骤代码调整 2020-04-02 18:57:04 +08:00
sunzhenyu
50eb7c2315 修改三维驾驶和仿真模型,增加隧道背景 2020-04-02 18:48:04 +08:00
fan
6916884045 哈尔滨实训 2020-04-02 18:38:21 +08:00
fan
068b6dd632 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-02 17:53:46 +08:00
fan
97eca75407 哈尔滨实训 2020-04-02 17:51:59 +08:00
joylink_cuiweidong
187ca7317e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-02 17:49:07 +08:00
joylink_cuiweidong
478d5a1083 去掉断点 2020-04-02 17:48:54 +08:00
zyy
e1d0aa6af5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-02 17:16:12 +08:00
zyy
34c7ad0fba 调整实训查询表头逻辑 2020-04-02 17:15:55 +08:00
fan
e45ec364a5 宁波实训跳转集中站 2020-04-02 16:52:59 +08:00
fan
e49f32d6b2 宁波实训跳转集中站 2020-04-02 16:28:07 +08:00
fan
a9294357b5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-02 16:24:04 +08:00
fan
523a1f9cd6 宁波实训跳转集中站 2020-04-02 16:22:53 +08:00
joylink_cuiweidong
e273b1be18 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-02 16:16:56 +08:00
joylink_cuiweidong
5874d8f665 北京一号线操作步骤调整 2020-04-02 16:16:45 +08:00
zyy
8fdd0d27bb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/scripts/cmdPlugin/ValidateHandler.js
2020-04-02 15:01:18 +08:00
zyy
dd26f5fd96 调整宁波一号线实训步骤定义 2020-04-02 15:00:28 +08:00
fan
75df1f7d2d 宁波考试&教学添加切换集中站 2020-04-02 14:46:21 +08:00
zyy
747595e8e8 Merge branch 'test' 2020-04-02 11:25:57 +08:00
zyy
4fb316277d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-02 11:20:49 +08:00
zyy
864cbd0420 调整代码 2020-04-02 11:20:35 +08:00