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 |
|
fan
|
a697ab21d5
|
调整实训
|
2020-03-27 13:52:14 +08:00 |
|
zyy
|
7380953642
|
增加宁波线路实训操作
|
2020-03-27 13:45:36 +08:00 |
|
fan
|
5c7394454d
|
调整
|
2020-03-27 11:35:46 +08:00 |
|
joylink_cuiweidong
|
d4279dd03a
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-27 11:31:53 +08:00 |
|
joylink_cuiweidong
|
966bed109b
|
新版剧本代码调整
|
2020-03-27 11:31:40 +08:00 |
|
zyy
|
97e9c8ca47
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-27 11:25:08 +08:00 |
|
zyy
|
faf772712c
|
调整增加自动生成实训操作步骤
|
2020-03-27 11:24:47 +08:00 |
|
sunzhenyu
|
b8d4cbcaba
|
将三维沙盘中设备信息按钮隐藏
|
2020-03-27 11:04:25 +08:00 |
|
fan
|
3c1d038a81
|
实训仿真调整
|
2020-03-27 10:51:49 +08:00 |
|
fan
|
723f8ff3e8
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-27 10:18:58 +08:00 |
|
fan
|
1adc50b2d1
|
站台调整
|
2020-03-27 10:17:24 +08:00 |
|
zyy
|
d92813ed72
|
调整道岔定位绘图
|
2020-03-27 10:02:41 +08:00 |
|
fan
|
f34de4f001
|
实训调整
|
2020-03-26 18:42:01 +08:00 |
|
zyy
|
aba49d9ee4
|
增加联锁表配置查询条件
|
2020-03-26 17:23:19 +08:00 |
|
fan
|
ead5bd01e6
|
站台调整
|
2020-03-26 15:04:52 +08:00 |
|
fan
|
8a90e2389b
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-26 10:42:20 +08:00 |
|
joylink_cuiweidong
|
9a9716e5a9
|
佛山有轨电车操作代码调整
|
2020-03-26 09:56:46 +08:00 |
|
fan
|
aadbe543a5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-26 09:44:27 +08:00 |
|
sunzhenyu
|
72f27c7a6f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-03-25 18:47:27 +08:00 |
|
sunzhenyu
|
9de8b430ee
|
修改三维沙盘和三维驾驶行车逻辑，设备动画逻辑，通信逻辑
|
2020-03-25 18:47:14 +08:00 |
|