Commit Graph

41 Commits

Author SHA1 Message Date
joylink_cuiweidong
882bb44fb2 根据设备code高亮 地图对应的设备 2019-12-19 15:52:36 +08:00
joylink_cuiweidong
fb7618c8ee Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-19 13:14:40 +08:00
joylink_cuiweidong
27196e9c54 站台创建的时候绑定集中站 2019-12-19 13:14:29 +08:00
zyy
c0c5d620cd 调整站台紧急停车创建逻辑 2019-12-19 13:12:34 +08:00
zyy
511701b116 调整数据显示字段,调整创建站台区段属性设置 2019-12-19 10:00:29 +08:00
fan
2d068a93ce Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-18 13:06:00 +08:00
fan
7cf546efe6 参数调整 2019-12-18 13:05:29 +08:00
joylink_cuiweidong
9c54da44f3 站台创建关联集中站 2019-12-18 10:01:58 +08:00
joylink_cuiweidong
b864c717fb Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/station.vue
2019-12-17 19:05:19 +08:00
joylink_cuiweidong
b4ea83eabc zc 集中站设置 2019-12-17 19:03:38 +08:00
zyy
33f140d71c 修改小站台位置 2019-12-17 18:17:33 +08:00
fan
88eeaff1e2 区段站台问题调整 2019-12-17 17:27:35 +08:00
joylink_cuiweidong
b8448aaff8 道岔设置集中站过滤
区段设置集中站过滤
车站设置集中站和管理车站列表代码调整
2019-12-17 16:22:07 +08:00
zyy
9fe6c9739d 调整代码 2019-12-17 09:13:57 +08:00
fan
b2c9e34a25 站台方向属性初始值调整 2019-12-13 17:53:34 +08:00
fan
62300d327f 站台方向属性调整 2019-12-13 17:51:00 +08:00
fan
bd1cbf4e40 站台调整 2019-12-13 16:28:34 +08:00
fan
fc3ab4cc21 站台屏蔽门调整 2019-12-13 14:19:38 +08:00
fan
083e70dc02 站台屏蔽门调整 2019-12-13 13:10:11 +08:00
zyy
6fb6ae9867 调整站台,屏蔽门默认样式 2019-12-12 10:05:28 +08:00
zyy
b2dd3d7285 调整站台生成逻辑,调整uid检测方式 2019-12-11 17:07:29 +08:00
zyy
35688adcd0 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-06 18:03:18 +08:00
zyy
dc381e2a63 desc: 新增屏蔽门绘制以及紧急停车按钮生成流程 2019-12-06 18:03:13 +08:00
fan
7cc2b68d13 绘图相关调整_(区段快捷删除调整) 2019-12-06 14:36:18 +08:00
zyy
c0c580ec1d 修改生成名字规则 2019-12-06 13:56:18 +08:00
zyy
3c4f803df2 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-06 10:31:26 +08:00
zyy
c192deb2ca 修改代码 2019-12-06 10:31:19 +08:00
joylink_cuiweidong
47c39878b7 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-06 09:01:58 +08:00
joylink_cuiweidong
e87a592b9a 代码调整 2019-12-06 09:01:05 +08:00
fan
75f400a1c7 绘图相关调整_(添加快捷删除) 2019-12-05 18:53:06 +08:00
zyy
30bab42bbf Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/index.vue
2019-12-04 14:09:29 +08:00
zyy
69e73b2195 修改代码 2019-12-04 14:08:55 +08:00
joylink_cuiweidong
eb9873e6e5 代码调整 2019-12-04 13:38:32 +08:00
joylink_cuiweidong
d94bbff72f 代码调整 2019-12-04 13:00:24 +08:00
joylink_cuiweidong
c818577e48 代码调整 2019-12-03 17:52:39 +08:00
joylink_cuiweidong
6426a70bd6 代码调整 2019-12-03 15:30:41 +08:00
joylink_cuiweidong
967d7ddaad 代码调整 2019-12-03 15:22:16 +08:00
joylink_cuiweidong
23f8f8646a 车站代码调整 2019-12-03 13:24:22 +08:00
joylink_cuiweidong
b4bfdd55b2 站台代码调整 2019-12-02 13:57:25 +08:00
joylink_cuiweidong
ae3258203e 代码调整 2019-12-02 13:17:41 +08:00
zyy
11b327984e 新增新版地图绘制文件 2019-11-29 12:51:58 +08:00