Commit Graph

67 Commits

Author SHA1 Message Date
joylink_cuiweidong
597f5cb990 代码调整 2020-05-09 16:39:33 +08:00
fan
cd57807d1f iscs状态表调整 2020-05-09 09:26:19 +08:00
fan
f6b6dd2f46 iscs状态表调整 2020-05-09 09:15:13 +08:00
joylink_cuiweidong
107cc4b73b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-08 18:37:56 +08:00
joylink_cuiweidong
76fd09cf08 iscs 绘图代码调整
新版地图 交路绘图代码调整
2020-05-08 18:37:00 +08:00
fan
d7da333e07 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-08 17:20:52 +08:00
fan
d524dc9d4d iscs调整 2020-05-08 17:20:43 +08:00
joylink_cuiweidong
0200d8acf9 iscs 绘图代码调整 2020-05-08 14:17:51 +08:00
joylink_cuiweidong
01ff826744 iscs 绘图调整 2020-05-08 10:18:47 +08:00
joylink_cuiweidong
2084f4cf03 iscs 绘图代码调整 2020-05-07 18:15:13 +08:00
joylink_cuiweidong
d2586049e3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/iscs/constant/iscsData.js
#	src/views/iscs/iscsSystem/config/index.vue
2020-05-07 16:47:52 +08:00
fan
62d12e8ed5 iscs调整图元说明公共区域 2020-05-07 16:39:38 +08:00
joylink_cuiweidong
11e1c23402 iscs 绘图代码调整
iscs 绘图 添加虚线
iscs 绘图数据调整
2020-05-07 16:38:24 +08:00
fan
0f81decc2c iscs调整 2020-05-07 13:49:03 +08:00
fan
ed3f1cee82 iscs调整&新版考试实训类型匹配 2020-05-07 10:16:15 +08:00
zyy
e156bac9ca 增加公共地图ibp配置绘图 逻辑 2020-03-13 18:19:04 +08:00
joylink_cuiweidong
73ee89f299 iscs 代码调整 2020-02-10 11:17:51 +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
222462d289 iscs 绘图代码调整 2020-02-07 19:12:35 +08:00
joylink_fanyuhong
60d6ab5db9 iscs调整 2020-02-07 18:59:48 +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_fanyuhong
e00e9e1802 Revert "iscs 绘图数据修改"
This reverts commit 169035c
2020-02-07 12:12:47 +08:00
joylink_cuiweidong
169035cddf iscs 绘图数据修改 2020-02-07 11:25:27 +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_cuiweidong
ec5e77ed0a iscs 绘图代码修改 2020-02-07 09:58:08 +08:00
joylink_cuiweidong
52d62a8e4f ics 扶梯绘图代码调整 2020-02-07 09:52:47 +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
joylink_cuiweidong
6ce533be52 iscs 绘图代码调整 2020-02-06 17:54:37 +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
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
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_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
7ce1b02447 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-05 17:30:32 +08:00