Commit Graph

3860 Commits

Author SHA1 Message Date
fan
e43ad1fa99 调整哈尔滨显示 2020-03-31 09:27:02 +08:00
fan
a3b6c3b59c 创建线下用户 2020-03-30 20:28:20 +08:00
fan
38bed2b045 Merge branches 'dev' and 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-30 19:59:00 +08:00
fan
19d5f71596 调整哈尔滨打包设计平台 2020-03-30 19:58:37 +08:00
zyy
38ada8ccb2 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-30 17:54:01 +08:00
zyy
919639ad03 调整哈尔滨现地操作步骤流程完善 2020-03-30 17:53:44 +08:00
fan
8e4c1d05c8 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-30 17:41:54 +08:00
fan
2db44747ee 生成线下用户 2020-03-30 17:41:27 +08:00
joylink_cuiweidong
d4f3a4afa2 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-30 17:39:16 +08:00
joylink_cuiweidong
8c2f1cf729 新剧本 仿真类型切换代码调整 2020-03-30 17:39:00 +08:00
fan
2de6c8c787 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-30 17:16:16 +08:00
fan
9c18770137 生成线下用户 2020-03-30 17:15:45 +08:00
joylink_cuiweidong
0d5645a027 新版剧本接口代码调整 2020-03-30 16:56:38 +08:00
fan
5d21051eaa Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-30 16:53:09 +08:00
fan
338a9e9683 生成线下用户 2020-03-30 16:52:53 +08:00
joylink_cuiweidong
68f77a25b6 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-30 16:16:29 +08:00
joylink_cuiweidong
8f6f033870 剧本仿真切换仿真类型代码调整 2020-03-30 16:16:11 +08:00
zyy
af6eb5917f Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-30 16:15:50 +08:00
zyy
0c56d049ec 调整哈尔滨现地实训操作步骤 2020-03-30 16:15:35 +08:00
fan
238f8a3d88 生成线下用户 2020-03-30 15:29:07 +08:00
fan
343b8fd55e Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-30 15:28:28 +08:00
fan
b229e9c08a 生成线下用户 2020-03-30 15:28:13 +08:00
fan
779b958613 站台调整 2020-03-30 15:27:13 +08:00
joylink_cuiweidong
52dd666430 新版公共地图预览代码调整 2020-03-30 15:26:47 +08:00
joylink_cuiweidong
fba96dcaaa 佛山有轨线路 步骤操作代码调整 2020-03-30 14:34:19 +08:00
fan
643c12335c Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_stand
# Conflicts:
#	src/utils/baseUrl.js
2020-03-30 14:26:27 +08:00
fan
e82e77a507 站台调整 2020-03-30 14:22:57 +08:00
joylink_cuiweidong
fa3400790b 宁波一号线步骤操作代码调整 2020-03-30 14:18:07 +08:00
joylink_cuiweidong
3a383793f8 北京一号线 步骤操作代码调整 2020-03-30 13:33:53 +08:00
fan
dee1efe00f Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-30 13:07:32 +08:00
fan
ab4928d924 差异化打包调整&哈尔滨登录页 2020-03-30 13:07:11 +08:00
joylink_cuiweidong
17c26e26a2 佛山一号线 宁波一号线 步骤操作代码调整 2020-03-30 11:27:34 +08:00
joylink_cuiweidong
08dc9befc4 北京一号线 宁波一号线 步骤操作调整 2020-03-30 11:03:35 +08:00
zyy
72f121b7a5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-30 10:28:22 +08:00
zyy
0321340863 调整步骤运行数据 2020-03-30 10:28:08 +08:00
fan
8f69177fe1 暂存 2020-03-30 09:47:26 +08:00
joylink_cuiweidong
1a998f405a 佛山一号线 操作代码调整 2020-03-30 09:45:23 +08:00
zyy
ba57262d2a 调整实训步骤校验逻辑 2020-03-27 18:53:28 +08:00
joylink_cuiweidong
60f1149a27 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-27 18:46:04 +08:00
joylink_cuiweidong
f51bad9c3a 代码调整 2020-03-27 18:45:48 +08:00
zyy
c5dbd2b141 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/utils/baseUrl.js
2020-03-27 18:20:28 +08:00
zyy
47519b7040 调整道岔生成默认状态,调整道岔皮肤配置 2020-03-27 18:19:40 +08:00
fan
a8d9aa001c Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-27 18:15:02 +08:00
fan
6ef1fc2013 实训调整 2020-03-27 18:14:46 +08:00
joylink_cuiweidong
93dc9a6983 新版剧本编制接口调整 2020-03-27 17:29:01 +08:00
fan
c30eae5b1e Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-27 17:26:39 +08:00
fan
19b945962b 站台调整 2020-03-27 17:26:17 +08:00
zyy
a95e940255 调整实训步骤校验 2020-03-27 14:37:28 +08:00
fan
3a8a3b87d8 调整左边弹框显示 2020-03-27 14:01:57 +08:00
fan
fb8d0b6615 Merge remote-tracking branch 'origin/dev_training' into dev_n
# Conflicts:
#	src/views/designPlatform/demonList.vue
2020-03-27 13:55:00 +08:00