Commit Graph

3914 Commits

Author SHA1 Message Date
joylink_cuiweidong
b6c571e4e5 代码调整 2020-04-03 18:10:02 +08:00
joylink_cuiweidong
38a05e530d 北京一号线现地操作步骤代码调整 2020-04-03 16:31:57 +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
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
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
fan
4bce310d4f 福州皮肤调整 2020-04-02 11:10:27 +08:00
zyy
1599b82719 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-02 10:52:17 +08:00
zyy
8117a31c80 调整代码 2020-04-02 10:51:47 +08:00
fan
ef08c5085e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-02 09:50:30 +08:00
fan
1017058855 站台状态显示位置调整 2020-04-02 09:48:55 +08:00
zyy
dca7f94ad8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-02 09:08:21 +08:00
zyy
a17a02519d 调整宁波线路实训生成 2020-04-02 09:07:50 +08:00
joylink_cuiweidong
4f75b00c7b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-01 18:57:26 +08:00
sunzhenyu
bbd3a078c5 修改jl3dpassflow文件冲突 2020-04-01 18:46:58 +08:00
joylink_cuiweidong
06feb9e563 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-01 18:37:50 +08:00
fan
966a3d7527 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-01 18:15:26 +08:00
fan
cd414962eb 调整提交 2020-04-01 18:14:48 +08:00
sunzhenyu
12b4599e39 注释 2020-04-01 17:09:47 +08:00
sunzhenyu
f31f048846 merge 2020-04-01 16:54:01 +08:00
sunzhenyu
e401081214 修改三维设备模型道岔动画时间 2020-04-01 16:53:07 +08:00
joylink_cuiweidong
bced2eb7d1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-01 16:50:53 +08:00
joylink_cuiweidong
7bf650bd8d 代码调整 2020-04-01 16:36:20 +08:00
fan
4351d982e4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-01 16:24:17 +08:00
fan
8f30d436ee 调整绘图&三维跳转页面icon 2020-04-01 16:24:03 +08:00
sunzhenyu
fba612403a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-01 16:03:16 +08:00
sunzhenyu
d7fd261c07 修改三维客流视图画面 2020-04-01 16:03:09 +08:00
zyy
c7f7f0bc6f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-01 15:45:31 +08:00