Commit Graph

490 Commits

Author SHA1 Message Date
joylink_cuiweidong
395d15d959 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-30 15:16:38 +08:00
joylink_cuiweidong
2f8832be83 新版绘图 交路代码调整 2020-04-30 15:16:20 +08:00
fan
26487c0dd8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-30 14:50:42 +08:00
fan
744ea986c0 绘图调整 2020-04-30 14:50:27 +08:00
joylink_cuiweidong
3f942518f1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-30 14:39:56 +08:00
joylink_cuiweidong
91b377f975 交路 列表拖拽问题调整 2020-04-30 14:38:46 +08:00
fan
c101ee8f92 绘图tab-pane延时渲染 2020-04-30 13:40:32 +08:00
fan
5682ab67b0 信号机批量设置联锁站&区段添加所属车站属性 2020-04-30 10:54:06 +08:00
fan
60fc5e27d0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-30 10:12:30 +08:00
fan
77124d842e 设备联锁关系数据校验&生成联锁功能 2020-04-30 10:12:11 +08:00
joylink_cuiweidong
44108db3bc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-30 10:08:53 +08:00
joylink_cuiweidong
7961c2c5f9 绘图 交路添加 生成交路区段数据的接口
交路和运行等级代码调整
2020-04-30 10:07:44 +08:00
fan
35d13ae529 区段绘图数据调整roadType不为'' 2020-04-29 17:53:35 +08:00
fan
1c8929cb08 绘图区段添加firstTurnBack&线路配置添加generateCycle&西安二操作调整 2020-04-29 17:25:30 +08:00
fan
057aee45fc 信号添加属性 2020-04-29 16:02:26 +08:00
joylink_cuiweidong
66cdf061c6 新版地图 绘图代码调整 2020-04-28 18:16:04 +08:00
fan
5d2fff66a8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-27 19:02:20 +08:00
fan
e39a7eadb9 西安二号线操作调整&&绘图数据调整 2020-04-27 19:02:07 +08:00
joylink_cuiweidong
1bbbc567ad 绘图 设置运行等级代码调整 2020-04-27 14:25:40 +08:00
joylink_cuiweidong
edc17912af 新版地图 绘图 交路代码调整 2020-04-27 13:56:08 +08:00
joylink_cuiweidong
2cbef52398 新版绘图 交路代码调整 2020-04-27 11:33:17 +08:00
joylink_cuiweidong
0fb3536fff 新版地图绘制 交路 停站时间 设置运行等级代码调整 2020-04-27 10:54:42 +08:00
joylink_cuiweidong
f318854de7 新版绘图 交路代码调整 2020-04-27 10:06:17 +08:00
joylink_cuiweidong
1d63ad4b36 代码调整 2020-04-26 18:49:22 +08:00
joylink_cuiweidong
c3e76998d3 新版地图绘制 设置交路 代码调整 2020-04-26 18:33:26 +08:00
joylink_cuiweidong
a3d86a4136 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-26 16:35:05 +08:00
joylink_cuiweidong
208ff362e0 新版地图绘制 设置运行等级 代码调整 2020-04-26 16:34:46 +08:00
fan
f1fac79770 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-26 16:24:49 +08:00
fan
695ea67e27 西安二号线绘图调整&西安二号线站台操作调整&派班计划冲突显示调整 2020-04-26 16:24:34 +08:00
joylink_cuiweidong
a0e3546b15 新版地图绘图 设置运行等级代码调整 2020-04-26 14:44:46 +08:00
joylink_cuiweidong
4d1f6a6a9d 新版绘图 高级数据 交路 生成站间运行时间 接口调整 2020-04-26 13:18:25 +08:00
joylink_cuiweidong
7234f95b7d 新版地图 绘图 交路接口调整 2020-04-26 10:25:35 +08:00
zyy
4d288556b0 调整绘图界面,调整实训平台鼠标隐藏bug 2020-04-23 17:11:51 +08:00
zyy
306e9f4954 调整区段绘图显隐问题 2020-04-22 18:53:20 +08:00
zyy
415d762294 调整地图绘制区段显隐关系 2020-04-22 18:02:43 +08:00
fan
b898042b96 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-22 17:13:37 +08:00
fan
8c122f93d4 运行图加载调整&绘图设备道岔故障&佛山区段颜色 2020-04-22 17:12:29 +08:00
zyy
45e10ef066 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-22 16:42:09 +08:00
zyy
00936b36ac 调整地图绘制区段关系显隐 2020-04-22 16:41:55 +08:00
fan
e51824dc80 紧急停车位置调整&绘图站间分隔&车站批量调整 2020-04-22 14:30:37 +08:00
fan
dcf7b951ab Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-21 15:15:03 +08:00
fan
2f4b765d97 运行图加载调整&交路数据调整 2020-04-21 15:08:27 +08:00
zyy
7a25c0b536 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-20 18:30:13 +08:00
zyy
dd4c575062 调整站间运行等级逻辑 2020-04-20 18:29:50 +08:00
fan
7c55c19933 交路区段区别显示&故障状态组调整 2020-04-20 17:10:50 +08:00
zyy
85189c240f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-20 15:12:14 +08:00
zyy
a49a3bfaaf 调整西安二号线数据及皮肤配置 2020-04-20 15:12:01 +08:00
fan
53d94cee59 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-20 09:58:12 +08:00
fan
ed26ff34d9 地图高级数据停站时间 2020-04-20 09:57:00 +08:00
zyy
308c33e6bc 调整区段及道岔绘图方式 2020-04-17 18:44:14 +08:00