Commit Graph

32 Commits

Author SHA1 Message Date
joylink_cuiweidong
2084f4cf03 iscs 绘图代码调整 2020-05-07 18:15:13 +08:00
fan
ed3f1cee82 iscs调整&新版考试实训类型匹配 2020-05-07 10:16:15 +08:00
zyy
13fcc80c41 desc: 增加状态 2020-02-07 18:19:56 +08:00
joylink_fanyuhong
41f43f9d08 iscs调整 2020-02-07 14:43:27 +08:00
joylink_cuiweidong
52d62a8e4f ics 扶梯绘图代码调整 2020-02-07 09:52:47 +08:00
joylink_cuiweidong
3ab8c10f45 iscs fas 闸机绘图代码修改 2020-02-06 19:09:41 +08:00
joylink_cuiweidong
8762a9ef2f iscs 绘图代码调整 2020-02-06 17:55:08 +08:00
joylink_cuiweidong
6ce533be52 iscs 绘图代码调整 2020-02-06 17:54:37 +08:00
zyy
f7a0f54376 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/iscs/constant/deviceRender.js
#	src/iscs/constant/iscsData.js
2020-02-06 16:58:09 +08:00
zyy
2ed2bd8332 数据提交 2020-02-06 16:56:24 +08:00
joylink_cuiweidong
0e10532316 iscs 绘图代码调整 2020-02-06 15:04:48 +08:00
joylink_fanyuhong
f32465165e iscs增加基础元素文字线段矩形 2020-02-05 12:14:10 +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
joylink_cuiweidong
7987f6bd12 iscs bas 组件 uid 代码修改 2020-01-17 15:42:20 +08:00
joylink_cuiweidong
22419fa6c9 iscs bas 组件代码调整 2020-01-17 15:15:58 +08:00
fan
69b11f98e8 iscs调整 2020-01-17 10:49:06 +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
27257482ab 调整线路配置项,增加 ISCS 绘图元素 2020-01-16 18:02:57 +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
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
de7176ac5e FAS子系统测试 2020-01-16 09:23:37 +08:00
fan
bf1497164c iscs调整(批量拖动) 2020-01-15 14:33:21 +08:00
fan
9233728346 iscs调整 2020-01-15 10:11:26 +08:00
fan
365f36edef iscs 绘图 2020-01-14 09:06:03 +08:00