Commit Graph

20 Commits

Author SHA1 Message Date
zyy
2faa2688e5 综合监控广播 2020-05-15 18:36:31 +08:00
joylink_cuiweidong
ec0d0ccc29 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/views/iscs/iscsSystem/config/index.vue
2020-05-08 10:21:17 +08:00
joylink_cuiweidong
01ff826744 iscs 绘图调整 2020-05-08 10:18:47 +08:00
fan
dff19a4e8f iscs调整 2020-05-07 18:48:51 +08:00
fan
b0e63f77ed iscs调整 2020-05-07 18:47:13 +08:00
joylink_cuiweidong
d2586049e3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/iscs/constant/iscsData.js
#	src/views/iscs/iscsSystem/config/index.vue
2020-05-07 16:47:52 +08:00
fan
62d12e8ed5 iscs调整图元说明公共区域 2020-05-07 16:39:38 +08:00
joylink_cuiweidong
11e1c23402 iscs 绘图代码调整
iscs 绘图 添加虚线
iscs 绘图数据调整
2020-05-07 16:38:24 +08:00
joylink_cuiweidong
135e9bddb7 iscs 机电传感器页面布局 2020-05-07 11:20:52 +08:00
zyy
3e14220cfc 调整综合监控站台数据,及样式 2020-03-20 11:20:13 +08:00
zyy
12377d8704 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-21 16:44:53 +08:00
zyy
610dff44d4 增加机电样式 2020-01-21 16:44:46 +08:00
fan
35a94fd31d 广播页面调整 2020-01-21 16:05:52 +08:00
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