Commit Graph

3115 Commits

Author SHA1 Message Date
joylink_fanyuhong
4db65a3789 sics绘图 2020-02-07 11:02:43 +08:00
joylink_fanyuhong
6604c4eb00 sics调整 2020-02-07 10:17:49 +08:00
joylink_fanyuhong
c65429fc1c sics调整 2020-02-07 10:06:10 +08:00
joylink_fanyuhong
e183991b01 sics调整 2020-02-07 10:05:51 +08:00
joylink_fanyuhong
a4109e6ae9 iscs调整 2020-02-07 10:01:15 +08:00
joylink_cuiweidong
ec5e77ed0a iscs 绘图代码修改 2020-02-07 09:58:08 +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
joylink_fanyuhong
a11195a509 iscs调整 2020-02-06 18:14:13 +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
cb2fa49f96 iscs调整 2020-02-06 17:08:01 +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
291af56b2f iscs调整 2020-02-06 14:54:19 +08:00
joylink_fanyuhong
2765e860ac iscs绘图 2020-02-06 14:33:21 +08:00
joylink_fanyuhong
00fe7cd40a iscs绘图 2020-02-06 13:56:21 +08:00
joylink_fanyuhong
f33fbbfb52 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/iscs/constant/iscsData.js
2020-02-06 13:39:23 +08:00
joylink_fanyuhong
3bd848cc15 iscs调整 2020-02-06 13:36:42 +08:00
zyy
f219fe98bd Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-06 13:17:40 +08:00
zyy
b7d10fa587 前台保存数据 2020-02-06 13:17:31 +08:00
joylink_cuiweidong
69093e5662 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-06 12:19:57 +08:00
joylink_cuiweidong
a3679ef169 iscs 绘图元素 闸机添加是否右向属性 2020-02-06 12:17:33 +08:00
zyy
3053bdc26e Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-06 11:20:27 +08:00
zyy
0f4e64b0fc 增加报警系统数据 2020-02-06 11:20:16 +08:00
joylink_cuiweidong
f29b10e2d7 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-06 10:42:29 +08:00
joylink_cuiweidong
2c4f91d7ab iscs 绘图代码修改 2020-02-06 10:29:59 +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
6e96c3d5b7 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-06 09:42:18 +08:00
joylink_fanyuhong
e2a3b5d94a iscs调整 2020-02-06 09:42:07 +08:00
joylink_cuiweidong
5c550ed2bf iscs 绘图线段代码调整 2020-02-05 19:12:13 +08:00
joylink_cuiweidong
1c93f243e8 iscs afc acs 绘图元素代码调整 2020-02-05 17:48:27 +08:00
joylink_cuiweidong
7820e64371 iscs psd 绘图元素修改代码调整 2020-02-05 17:43:15 +08:00
joylink_fanyuhong
0000eb7bc1 iscs调整 2020-02-05 17:32:19 +08:00
joylink_fanyuhong
7ce1b02447 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-05 17:30:32 +08:00
joylink_fanyuhong
f12fabfd8e iscs调整 2020-02-05 17:30:12 +08:00