Commit Graph

19 Commits

Author SHA1 Message Date
joylink_cuiweidong
b11ad0cc4f 新版地图 自动信号列表 添加自动信号名称筛选
连锁出清区段限制为物理区段和道岔区段
2020-01-21 16:18:33 +08:00
zyy
1501124923 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-21 10:23:58 +08:00
zyy
6bd3ad8b42 调整机电控制模式样式 2020-01-21 10:23:52 +08:00
joylink_cuiweidong
8b574e723f iscs 系统滚动条样式调整 2020-01-21 09:28:14 +08:00
fan
17783e0147 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-20 18:34:13 +08:00
fan
5f014536cf PA调整 2020-01-20 18:33:47 +08:00
joylink_cuiweidong
e4d1ec8eb4 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-20 18:30:09 +08:00
joylink_cuiweidong
e9f52faf89 iscs 系统代码调整 2020-01-20 18:29:51 +08:00
zyy
f2cc16c03f Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-20 18:29:12 +08:00
zyy
5771905881 增加机电控制模式 2020-01-20 18:29:06 +08:00
joylink_cuiweidong
87c2e61cdf iscs 系统 乘客信息 主画面 页面调整 2020-01-20 15:37:57 +08:00
zyy
9ea26b8f4f Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/views/iscs/iscsSystem/config/pis/mainScreen.vue
2020-01-20 14:05:09 +08:00
zyy
7fd8e11649 搭建iscs系统架子 2020-01-20 14:04:31 +08:00
fan
847b80e9d9 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-20 11:10:37 +08:00
fan
b67fe4fd17 iscs PA界面调整 2020-01-20 11:09:12 +08:00
joylink_cuiweidong
cb21623773 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-20 11:05:16 +08:00
joylink_cuiweidong
2499c23a2b iscs 系统界面乘客信息代码调整 2020-01-20 11:05:05 +08:00
zyy
8b68d80a81 调整模块iscs显示样式 2020-01-20 10:55:33 +08:00
zyy
a033690502 调整综合监控文件位置及加载方式 2020-01-20 09:20:09 +08:00