Commit Graph

3145 Commits

Author SHA1 Message Date
joylink_cuiweidong
73ee89f299 iscs 代码调整 2020-02-10 11:17:51 +08:00
zyy
7b9f378315 调整cdn 加载路径 2020-02-10 10:50:18 +08:00
joylink_cuiweidong
b3c68bf751 iscs 代码调整 2020-02-07 22:10:55 +08:00
joylink_cuiweidong
974e0ecc0d iscs 代码调整 2020-02-07 20:09:51 +08:00
joylink_cuiweidong
416766cb3e iscs 绘图显示 2020-02-07 20:02:36 +08:00
joylink_cuiweidong
a11556643a Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-07 19:53:50 +08:00
joylink_cuiweidong
67b45bea50 iscs 绘图数据代码调整 2020-02-07 19:53:05 +08:00
joylink_cuiweidong
222462d289 iscs 绘图代码调整 2020-02-07 19:12:35 +08:00
joylink_fanyuhong
60d6ab5db9 iscs调整 2020-02-07 18:59:48 +08:00
joylink_fanyuhong
789d9c8be9 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-07 18:40:26 +08:00
joylink_fanyuhong
13e2e69368 iscs调整 2020-02-07 18:40:16 +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_fanyuhong
ed49b80e1d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/iscs/constant/iscsData.js
#	src/views/iscs/iscsSystem/config/cctv/controlCCTV.vue
2020-02-07 11:58:43 +08:00
joylink_fanyuhong
cc1765c43a iscs调整 2020-02-07 11:56:19 +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
joylink_fanyuhong
42661b9e49 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:39 +08:00
zyy
04622834bd 调整数据 2020-02-07 11:03:38 +08:00
joylink_fanyuhong
4db65a3789 sics绘图 2020-02-07 11:02:43 +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
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