joylink_fanyuhong
|
60d6ab5db9
|
iscs调整
|
2020-02-07 18:59:48 +08:00 |
|
zyy
|
ef03e10b5a
|
desc: 调整数据
|
2020-02-07 18:38:00 +08:00 |
|
zyy
|
13fcc80c41
|
desc: 增加状态
|
2020-02-07 18:19:56 +08:00 |
|
joylink_cuiweidong
|
f944e90380
|
iscs acs 门禁站台层绘图数据调整
|
2020-02-07 16:16:36 +08:00 |
|
joylink_cuiweidong
|
7994b79594
|
ISCS 绘图数据修改
|
2020-02-07 15:34:59 +08:00 |
|
joylink_fanyuhong
|
41f43f9d08
|
iscs调整
|
2020-02-07 14:43:27 +08:00 |
|
joylink_fanyuhong
|
dc951d278e
|
61 数据调整
|
2020-02-07 12:18:12 +08:00 |
|
joylink_fanyuhong
|
e00e9e1802
|
Revert "iscs 绘图数据修改"
This reverts commit 169035c
|
2020-02-07 12:12:47 +08:00 |
|
joylink_fanyuhong
|
6cd8099226
|
Revert "iscs 绘图数据修改"
This reverts commit 6211ca9
|
2020-02-07 12:11:02 +08:00 |
|
joylink_cuiweidong
|
6211ca97cf
|
iscs 绘图数据修改
|
2020-02-07 11:26:17 +08:00 |
|
joylink_cuiweidong
|
169035cddf
|
iscs 绘图数据修改
|
2020-02-07 11:25:27 +08:00 |
|
joylink_fanyuhong
|
8601589112
|
iscs调整
|
2020-02-07 11:11:15 +08:00 |
|
joylink_fanyuhong
|
3a3382986a
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-07 11:06:17 +08:00 |
|
joylink_fanyuhong
|
65a03836d8
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/iscs/constant/iscsData.js
|
2020-02-07 11:05:54 +08:00 |
|
zyy
|
04622834bd
|
调整数据
|
2020-02-07 11:03:38 +08:00 |
|
zyy
|
f5af476867
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/iscs/constant/iscsData.js
|
2020-02-07 10:50:44 +08:00 |
|
zyy
|
f9eee573b2
|
绘图显示在iscs界面上
|
2020-02-07 10:48:48 +08:00 |
|
joylink_fanyuhong
|
c65429fc1c
|
sics调整
|
2020-02-07 10:06:10 +08:00 |
|
joylink_cuiweidong
|
fe43e82be9
|
iscs acs 站台界面绘制
|
2020-02-07 09:54:50 +08:00 |
|
joylink_cuiweidong
|
52d62a8e4f
|
ics 扶梯绘图代码调整
|
2020-02-07 09:52:47 +08:00 |
|
zyy
|
197f3936a4
|
数据保存
|
2020-02-06 20:11:55 +08:00 |
|
zyy
|
4a9b866cc4
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-06 19:43:55 +08:00 |
|
zyy
|
395702e6e6
|
数据更新
|
2020-02-06 19:43:46 +08:00 |
|
joylink_cuiweidong
|
3ab8c10f45
|
iscs fas 闸机绘图代码修改
|
2020-02-06 19:09:41 +08:00 |
|
zyy
|
ccc7cae9f5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/iscs/constant/iscsData.js
|
2020-02-06 18:06:33 +08:00 |
|
zyy
|
08fde3c3f4
|
数据保存
|
2020-02-06 18:05:49 +08:00 |
|
joylink_fanyuhong
|
35a0acfa2c
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/iscs/constant/iscsData.js
|
2020-02-06 18:05:25 +08:00 |
|
joylink_fanyuhong
|
ca6c51d0cc
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/iscs/constant/iscsData.js
|
2020-02-06 18:05:12 +08:00 |
|
joylink_fanyuhong
|
fb13bcd484
|
iscs调整
|
2020-02-06 18:02:56 +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 |
|
joylink_fanyuhong
|
95dbb60509
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/iscs/constant/iscsData.js
|
2020-02-06 17:04:58 +08:00 |
|
joylink_fanyuhong
|
c03faf9946
|
iscs调整
|
2020-02-06 17:02:49 +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
|
81ea1a4d3a
|
ISCS 绘图数据修改
|
2020-02-06 16:49:01 +08:00 |
|
joylink_cuiweidong
|
0e10532316
|
iscs 绘图代码调整
|
2020-02-06 15:04:48 +08:00 |
|
joylink_fanyuhong
|
00fe7cd40a
|
iscs绘图
|
2020-02-06 13:56:21 +08:00 |
|
zyy
|
b7d10fa587
|
前台保存数据
|
2020-02-06 13:17:31 +08:00 |
|
zyy
|
0f4e64b0fc
|
增加报警系统数据
|
2020-02-06 11:20:16 +08:00 |
|
zyy
|
a54616fc2c
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/iscs/constant/iscsData.js
|
2020-02-06 10:24:18 +08:00 |
|
zyy
|
963c6e8f84
|
调整绘图元素
|
2020-02-06 10:23:20 +08:00 |
|
joylink_fanyuhong
|
e2a3b5d94a
|
iscs调整
|
2020-02-06 09:42:07 +08:00 |
|
joylink_fanyuhong
|
f12fabfd8e
|
iscs调整
|
2020-02-05 17:30:12 +08:00 |
|
zyy
|
694c0c441c
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/iscs/constant/iscsData.js
|
2020-02-05 17:21:50 +08:00 |
|
zyy
|
ebb1626edd
|
保存数据
|
2020-02-05 17:21:04 +08:00 |
|
joylink_cuiweidong
|
e560ee0e02
|
iscs 矩形和文字 右键操作修改
|
2020-02-05 17:05:57 +08:00 |
|
zyy
|
1673c5ad7f
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/iscs/constant/iscsData.js
# src/views/iscs/iscsDraw/iscsCommonElem/line.vue
# src/views/iscs/iscsDraw/iscsOperate/index.vue
|
2020-02-05 16:58:51 +08:00 |
|
zyy
|
a0ac36401b
|
调整报警系统绘图基础元素问题
|
2020-02-05 16:57:01 +08:00 |
|
joylink_fanyuhong
|
96e11142ed
|
iscs调整
|
2020-02-05 16:53:28 +08:00 |
|
zyy
|
1948f89856
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/iscs/constant/iscsData.js
|
2020-02-05 16:25:24 +08:00 |
|
zyy
|
61f02f4616
|
调整基础线段元素
|
2020-02-05 16:24:19 +08:00 |
|
joylink_fanyuhong
|
72305c2228
|
iscs调整
|
2020-02-05 15:59:52 +08:00 |
|
joylink_fanyuhong
|
180384404a
|
iscs调整
|
2020-02-05 14:59:14 +08:00 |
|
joylink_fanyuhong
|
50c9ab0d96
|
iscs调整
|
2020-02-05 14:43:12 +08:00 |
|
zyy
|
57fcf95047
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-05 12:22:06 +08:00 |
|
zyy
|
aa709a546d
|
增加前台保存iscs
|
2020-02-05 12:21:56 +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
|
a03b002beb
|
iscs调整
|
2020-01-15 13:27:07 +08:00 |
|
fan
|
9233728346
|
iscs调整
|
2020-01-15 10:11:26 +08:00 |
|
fan
|
365f36edef
|
iscs 绘图
|
2020-01-14 09:06:03 +08:00 |
|