Commit Graph

170 Commits

Author SHA1 Message Date
fan
8a7de3c22c 佛山皮肤调整 2020-04-15 09:44:44 +08:00
fan
e9ee5112d4 佛山皮肤调整 2020-04-15 09:33:21 +08:00
fan
b833ac1acd 佛山皮肤调整 2020-04-15 09:19:47 +08:00
fan
2613b68413 佛山列车显示调整&西安二号线集中站分割符 2020-04-14 18:51:09 +08:00
fan
61c2260d93 西安二号线调整 2020-04-14 15:45:13 +08:00
fan
b7e6b9a8c1 佛山运行图导入上行时间调整&西安二号线车站调整 2020-04-13 18:30:21 +08:00
fan
20491dac81 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-13 17:13:52 +08:00
fan
f91c8e37d2 佛山运行图导入参数调整&西安二号线车站调整 2020-04-13 17:12:33 +08:00
joylink_cuiweidong
ccf028e5bb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-13 13:08:30 +08:00
joylink_cuiweidong
e083015580 西安二号线 屏蔽门和站台的状态代码调整 2020-04-13 13:08:17 +08:00
fan
472dd1b62a 佛山运行图导入校验调整&西安二号线车站调整 2020-04-13 10:43:02 +08:00
fan
b0797644f9 实训课程编辑调整&线二号线调整 2020-04-10 17:50:26 +08:00
fan
11586aef30 哈尔滨现地显示BUG调整&西安二号线皮肤调整 2020-04-10 16:45:41 +08:00
joylink_cuiweidong
45e6a12825 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 16:32:15 +08:00
joylink_cuiweidong
5a8f4e0fe6 西安二号线 屏蔽门绘图代码调整 2020-04-09 16:31:53 +08:00
fan
f2ba430cc5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 14:49:06 +08:00
fan
50579656eb 进路控制信号机按消息批次处理&西安二计轴调整&&实训管理老地图处理(未完) 2020-04-09 14:47:44 +08:00
joylink_cuiweidong
1f4d8ae061 西安二号线 站台绘图调整 2020-04-09 13:01:48 +08:00
fan
2e1b356da9 调整区段限速判断 2020-04-08 16:21:08 +08:00
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
fan
f495a2d560 实训占位符调整&皮肤调整 2020-04-08 14:06:45 +08:00
fan
b089aa6651 实训占位符调整&皮肤调整 2020-04-08 13:23:19 +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
1017058855 站台状态显示位置调整 2020-04-02 09:48:55 +08:00
fan
ebd90d2485 本地项目调整&elementUI升版本至2.12.0 2020-04-01 15:32:06 +08:00
fan
848875bd57 关闭gzip 2020-04-01 14:39:29 +08:00
fan
e344e63469 宁波停站时间调整 2020-04-01 14:30:11 +08:00
zyy
4ef3c69f9f 调整显示内容 判断 2020-03-31 15:34:55 +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
fan
8f69177fe1 暂存 2020-03-30 09:47:26 +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
19b945962b 站台调整 2020-03-27 17:26:17 +08:00
fan
5c7394454d 调整 2020-03-27 11:35:46 +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
ead5bd01e6 站台调整 2020-03-26 15:04:52 +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
joylink_cuiweidong
8c01b4129f 列车绘图代码调整 2020-03-25 18:34:43 +08:00
zyy
a2875baa19 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-25 18:26:30 +08:00
zyy
41100ac9bf 调整宁波线路 道岔 封锁 单锁状态 2020-03-25 18:26:19 +08:00
fan
5bcb42e0f2 宁波调整 2020-03-25 17:32:57 +08:00
joylink_cuiweidong
ad4de2cd45 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-25 17:16:16 +08:00
joylink_cuiweidong
ef33f0f628 宁波一号线 增加列车移入显示边框 2020-03-25 17:15:16 +08:00
fan
1210496ecb Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-25 15:24:08 +08:00