fan
|
d9c15d961e
|
连接真实设备按钮仅车站值班员可见
|
2020-01-19 11:17:51 +08:00 |
|
fan
|
ea74886ba3
|
调整打开新页面时sessionStorage复制导致的路由处理错误
|
2020-01-19 10:26:40 +08:00 |
|
fan
|
15ca63be84
|
iscs调整
|
2020-01-19 10:05:55 +08:00 |
|
fan
|
d744d7a69e
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/iscs/constant/deviceRender.js
# src/iscs/constant/deviceType.js
# src/iscs/shape/factory.js
# src/iscs/utils/parser.js
|
2020-01-17 18:49:15 +08:00 |
|
fan
|
87e62a6631
|
iscs综合监控
|
2020-01-17 18:45:28 +08:00 |
|
zyy
|
0bee3cc61d
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-17 17:48:15 +08:00 |
|
zyy
|
1779f856be
|
新增iscs系统
|
2020-01-17 17:48:08 +08:00 |
|
joylink_cuiweidong
|
0bb7b11271
|
iscs bas 状态管理代码调整 生成uid代码调整 组件代码调整
|
2020-01-17 17:27:11 +08:00 |
|
joylink_cuiweidong
|
7987f6bd12
|
iscs bas 组件 uid 代码修改
|
2020-01-17 15:42:20 +08:00 |
|
zyy
|
2d5a42d363
|
调整根路径
|
2020-01-17 15:33:30 +08:00 |
|
zyy
|
3ec7d0a7e5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-17 15:32:08 +08:00 |
|
zyy
|
e4b20395c4
|
增加iscs系统，调整成都一号线运行图导入
|
2020-01-17 15:31:58 +08:00 |
|
joylink_cuiweidong
|
22419fa6c9
|
iscs bas 组件代码调整
|
2020-01-17 15:15:58 +08:00 |
|
fan
|
95e5c9f603
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-17 14:20:49 +08:00 |
|
fan
|
582fc354db
|
快速入口增加参数projectCode
|
2020-01-17 14:20:31 +08:00 |
|
zyy
|
d4b352d4ba
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-17 14:15:21 +08:00 |
|
zyy
|
b9de20f22a
|
iscs绘制元素
|
2020-01-17 14:15:14 +08:00 |
|
joylink_cuiweidong
|
d7b43924bb
|
iscs bas 组件代码调整
|
2020-01-17 14:10:40 +08:00 |
|
joylink_cuiweidong
|
9d0b565142
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-17 13:37:22 +08:00 |
|
joylink_cuiweidong
|
219e24cbcd
|
iscs bas 组件 添加
|
2020-01-17 13:37:08 +08:00 |
|
fan
|
02a6954ffd
|
仿真接口报错提示调整
|
2020-01-17 13:17:12 +08:00 |
|
fan
|
22657aa935
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-17 11:32:11 +08:00 |
|
fan
|
269cef7673
|
仿真接口调整
|
2020-01-17 11:31:53 +08:00 |
|
joylink_cuiweidong
|
589e7202fa
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-17 11:08:39 +08:00 |
|
joylink_cuiweidong
|
45fafdd0ee
|
iscs 排风机 冷水机组绘图代码调整
|
2020-01-17 11:07:44 +08:00 |
|
fan
|
69b11f98e8
|
iscs调整
|
2020-01-17 10:49:06 +08:00 |
|
fan
|
fb08f43afd
|
Merge remote-tracking branch 'origin/dev_iscs' into dev
|
2020-01-16 18:23:20 +08:00 |
|
fan
|
019ca66662
|
Merge remote-tracking branch 'origin/dev_iscs' into dev
|
2020-01-16 18:16:23 +08:00 |
|
joylink_cuiweidong
|
91c722f288
|
Merge branch 'dev_iscs' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_iscs
# Conflicts:
# src/iscs/constant/deviceRender.js
# src/iscs/constant/deviceType.js
# src/iscs/shape/factory.js
# src/iscs/utils/parser.js
|
2020-01-16 18:11:40 +08:00 |
|
fan
|
8676bef502
|
Merge branch 'dev_iscs' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_iscs
# Conflicts:
# src/iscs/constant/deviceRender.js
|
2020-01-16 18:07:18 +08:00 |
|
joylink_cuiweidong
|
eb99102c6c
|
iscs 冷水机组，冷却塔组件布局
|
2020-01-16 18:07:02 +08:00 |
|
fan
|
027518132a
|
psd子系统
|
2020-01-16 18:06:00 +08:00 |
|
zyy
|
4c140a7c2a
|
Merge branch 'dev_iscs' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_iscs
|
2020-01-16 18:03:06 +08:00 |
|
zyy
|
27257482ab
|
调整线路配置项，增加 ISCS 绘图元素
|
2020-01-16 18:02:57 +08:00 |
|
fan
|
dba419a524
|
Merge branch 'dev_iscs' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_iscs
|
2020-01-16 16:25:47 +08:00 |
|
fan
|
3b26366935
|
Psd子系统
|
2020-01-16 16:25:33 +08:00 |
|
joylink_cuiweidong
|
1cd35488e8
|
房间socket代码修改
|
2020-01-16 16:15:58 +08:00 |
|
joylink_cuiweidong
|
5357d5c23c
|
解决 页面刷新 用户进入房间的问题
|
2020-01-16 15:08:03 +08:00 |
|
zyy
|
4a67f2b096
|
Merge branch 'dev_iscs' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_iscs
# Conflicts:
# src/iscs/constant/deviceType.js
# src/iscs/shape/factory.js
# src/iscs/utils/parser.js
# src/views/system/iscsDraw/iscsOperate/index.vue
|
2020-01-16 14:54:24 +08:00 |
|
zyy
|
714c55ec8b
|
增加iscs绘制
|
2020-01-16 14:52:45 +08:00 |
|
joylink_cuiweidong
|
4103f1db8b
|
iscs 冷水机组 组件
|
2020-01-16 13:41:10 +08:00 |
|
fan
|
09a8b6b630
|
FAS子系统测试PSD
|
2020-01-16 13:28:29 +08:00 |
|
joylink_cuiweidong
|
e4bf88ddf5
|
Merge branch 'dev_iscs' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_iscs
# Conflicts:
# src/iscs/constant/deviceType.js
# src/iscs/shape/factory.js
# src/iscs/utils/parser.js
|
2020-01-16 13:20:01 +08:00 |
|
joylink_cuiweidong
|
394c5b776c
|
iscs 冷冻泵/冷却泵添加
|
2020-01-16 13:15:52 +08:00 |
|
fan
|
9b26c70100
|
FAS子系统测试PSD
|
2020-01-16 13:03:44 +08:00 |
|
fan
|
69850add99
|
Merge branch 'dev_iscs' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_iscs
|
2020-01-16 09:23:48 +08:00 |
|
fan
|
de7176ac5e
|
FAS子系统测试
|
2020-01-16 09:23:37 +08:00 |
|
joylink_cuiweidong
|
02b2ce19f1
|
iscs bas代码调整
|
2020-01-15 17:56:31 +08:00 |
|
fan
|
22c0b570a3
|
调整重连时间
|
2020-01-15 15:58:30 +08:00 |
|
fan
|
e87ebe22aa
|
删除debugger
|
2020-01-15 15:45:17 +08:00 |
|