Commit Graph

4669 Commits

Author SHA1 Message Date
fan
1601b655d1 地图数据维护中提示调整 2020-05-09 20:24:59 +08:00
joylink_cuiweidong
5b0d16c920 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-09 20:21:43 +08:00
joylink_cuiweidong
b5a3a195f7 代码调整 2020-05-09 20:21:20 +08:00
zyy
3212b4362b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-09 20:13:53 +08:00
zyy
fe5f6cecc9 调整大屏系统界面加载宽度 2020-05-09 20:13:32 +08:00
fan
c5f63c9e52 添加地图数据维护中提示&存在仿真管理添加类型 2020-05-09 19:35:56 +08:00
fan
fc68903ff5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-09 19:24:22 +08:00
fan
29881aab0b 添加地图数据维护中提示&存在仿真管理添加类型 2020-05-09 19:24:12 +08:00
zyy
1d2e835b85 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-09 18:48:30 +08:00
zyy
d90996da48 调整大屏系统行数放到配置 2020-05-09 18:48:08 +08:00
joylink_cuiweidong
81450fbc9e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-09 18:24:37 +08:00
fan
f16936d9c3 信号机接近区段 2020-05-09 18:24:35 +08:00
joylink_cuiweidong
13ae9eba9c 代码调整 2020-05-09 18:24:21 +08:00
joylink_cuiweidong
9796280970 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-09 17:49:40 +08:00
joylink_cuiweidong
de024b9a45 代码调整 2020-05-09 17:49:25 +08:00
fan
d761c287af Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-09 17:32:29 +08:00
fan
e50edafb0c 校验调整 2020-05-09 17:32:13 +08:00
zyy
17547d31ce Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-09 17:27:42 +08:00
zyy
8e81a00847 调整区段绘图方式 2020-05-09 17:27:28 +08:00
joylink_cuiweidong
3215ac97ab Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-09 16:40:06 +08:00
joylink_cuiweidong
597f5cb990 代码调整 2020-05-09 16:39:33 +08:00
fan
0386d1f9b4 删除打印日志 2020-05-09 15:36:48 +08:00
fan
b990150b0f merger 2020-05-09 14:24:55 +08:00
fan
a66f36f293 批量设置调整 2020-05-09 14:23:20 +08:00
zyy
e59ab1400a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-09 14:16:25 +08:00
zyy
bb7556a876 调整宁波线路操作失败提示 2020-05-09 14:16:09 +08:00
fan
c4298fa612 批量设置调整 2020-05-09 13:03:57 +08:00
fan
6b6c7d8402 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-09 10:51:23 +08:00
fan
d8d795c1fb 调整绘图页面菜单 2020-05-09 10:51:13 +08:00
zyy
571cd461b6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-09 10:25:20 +08:00
joylink_cuiweidong
dcfc07cd9e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-09 10:24:30 +08:00
zyy
d45a7fa39d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-09 10:24:17 +08:00
joylink_cuiweidong
95ccbd47b9 代码调整 2020-05-09 10:24:04 +08:00
zyy
109c581e0e 调整iscs样式 2020-05-09 10:23:56 +08:00
fan
5e81c395fb iscs火灾报警系统状态 2020-05-09 10:12:33 +08:00
fan
e56aa4d004 iscs火灾报警系统状态 2020-05-09 10:04:57 +08:00
fan
c1aa6596fa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-09 09:26:32 +08:00
fan
cd57807d1f iscs状态表调整 2020-05-09 09:26:19 +08:00
fan
f6b6dd2f46 iscs状态表调整 2020-05-09 09:15:13 +08:00
fan
09e49a2b0a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-08 18:52:59 +08:00
fan
84e212c48b 站台站台轨位置校验&站台属性是否显示不生效修改&站台中站台轨属性不可修改&tab页懒加载导致的数据未展示问题调整 2020-05-08 18:52:46 +08:00
joylink_cuiweidong
eb62d2d641 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-08 18:51:44 +08:00
joylink_cuiweidong
285700c10d 代码调整 2020-05-08 18:51:29 +08:00
joylink_cuiweidong
107cc4b73b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-08 18:37:56 +08:00
joylink_cuiweidong
76fd09cf08 iscs 绘图代码调整
新版地图 交路绘图代码调整
2020-05-08 18:37:00 +08:00
sunzhenyu
ffb90ccdfd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-08 18:06:41 +08:00
sunzhenyu
eed9189d7a 继电器逻辑修改 2020-05-08 18:06:33 +08:00
fan
5eeac156db 添加批量设置关联站台区段所属车站 2020-05-08 17:39:38 +08:00
fan
d7da333e07 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-08 17:20:52 +08:00
fan
d524dc9d4d iscs调整 2020-05-08 17:20:43 +08:00