Commit Graph

147 Commits

Author SHA1 Message Date
fan
a60971c54e 修复:进路物理区段选中逻辑区段时处理物理区段高亮 2019-12-20 17:15:15 +08:00
fan
0207e54914 进路延续保护区段选中红色 2019-12-20 15:44:12 +08:00
fan
6189318755 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-20 14:24:18 +08:00
fan
ab70d8168b 修复:进路道岔类型不显示 2019-12-20 14:23:59 +08:00
zyy
12bfdcfa66 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-20 13:48:45 +08:00
zyy
6a82d745d9 调整高级数据生成code规范 2019-12-20 13:48:37 +08:00
fan
2cbafa7950 延续保护样式调整 2019-12-20 11:22:30 +08:00
fan
438aef2764 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-20 10:20:38 +08:00
fan
2a517c8aa5 进路调整 延续保护生成线路道岔可为空,创建延续保护必须有解锁区段,时间,线路,更新是若无解锁区段和线路则删除延续保护 2019-12-20 10:20:03 +08:00
zyy
b5cc83a0e0 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-19 18:04:35 +08:00
zyy
3101af9948 增加线路皮肤配置,调整联锁站台显示列表 2019-12-19 18:04:28 +08:00
fan
9cd46588a9 自动信号参数名和默认值调整--0003 2019-12-19 16:43:56 +08:00
fan
143f35a222 进路物理区段列表连续高亮 2019-12-19 16:21:00 +08:00
fan
fbbee9324a 延续保护预览 2019-12-19 14:05:16 +08:00
fan
e300164580 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
2019-12-19 10:12:54 +08:00
fan
524df9c5e9 进路-延续保护调整 2019-12-19 10:08:12 +08:00
zyy
511701b116 调整数据显示字段,调整创建站台区段属性设置 2019-12-19 10:00:29 +08:00
zyy
1e1f9a598d 修改高级数据字段显示 2019-12-18 17:52:50 +08:00
zyy
0bb46ab432 高级数据调整顺序 2019-12-18 13:21:07 +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
zyy
436db38200 调整区段字段保存获取 2019-12-18 11:17:57 +08:00
zyy
24fd0890dd 调整进路保存 2019-12-17 14:34:09 +08:00
fan
13f608a2ff 高级高亮调整 2019-12-13 14:46:38 +08:00
fan
8f6a7c1253 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-13 14:19:49 +08:00
fan
fc3ab4cc21 站台屏蔽门调整 2019-12-13 14:19:38 +08:00
joylink_cuiweidong
eb3b803462 信号机所属集中站数据筛选
进路所属联锁站数据筛选
2019-12-13 14:02:15 +08:00
joylink_cuiweidong
b2b9c5819b 车站增加: 是否连锁站
区段删除关联站台字段
2019-12-13 13:19:09 +08:00
fan
4af61e8615 drawWay参数调整 2019-12-12 16:10:44 +08:00
fan
811a430ec1 Revert "drawWay参数调整"
This reverts commit 54be69b
2019-12-12 16:07:32 +08:00
fan
54be69b2e6 drawWay参数调整 2019-12-12 15:58:19 +08:00
fan
cc014d4ccc 自动折返设置优先级 2019-12-11 18:25:03 +08:00
fan
eafb83a886 自动折返调整 2019-12-11 14:10:51 +08:00
fan
5fdbbe9295 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-11 13:57:06 +08:00
fan
cd15b3737c 自动折返,进路调整 2019-12-11 13:56:46 +08:00
joylink_cuiweidong
a358b9cdd6 代码调整 2019-12-11 09:42:33 +08:00
joylink_cuiweidong
d5eef0c022 信号机接近区段页面调整 2019-12-10 18:11:11 +08:00
joylink_cuiweidong
b6e6e72d17 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-10 18:02:08 +08:00
joylink_cuiweidong
98c7e1105f 自动信号接口修改 2019-12-10 18:01:52 +08:00
fan
0bde17887f 高级延续保护调整 2019-12-10 17:55:43 +08:00
fan
6afb5f35a8 高级延续保护调整 2019-12-10 16:50:38 +08:00
fan
2c6f19b270 合并代码 2019-12-10 10:20:32 +08:00
fan
45e4aaca8b 延续保护调整 2019-12-10 10:18:25 +08:00
joylink_cuiweidong
6d26e8e217 进路添加是否先锁闭字段 2019-12-09 18:54:11 +08:00
zyy
dc381e2a63 desc: 新增屏蔽门绘制以及紧急停车按钮生成流程 2019-12-06 18:03:13 +08:00
fan
5ca78f0ba7 调整绘图相关-(信号机调整,草稿地图列表接口调整) 2019-12-03 13:36:02 +08:00
zyy
11b327984e 新增新版地图绘制文件 2019-11-29 12:51:58 +08:00