Commit Graph

7 Commits

Author SHA1 Message Date
zyy
5771905881 增加机电控制模式 2020-01-20 18:29:06 +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
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