fan
|
d842be60ce
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-24 13:52:22 +08:00 |
|
fan
|
f7ff7f7f81
|
增加：信号机接近区段红色高亮
|
2019-12-24 13:52:06 +08:00 |
|
joylink_cuiweidong
|
be784efb43
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-24 10:49:39 +08:00 |
|
joylink_cuiweidong
|
f25787da62
|
进路列表数据展示调整
|
2019-12-24 10:49:28 +08:00 |
|
fan
|
5fe33a32ec
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-24 09:31:39 +08:00 |
|
fan
|
77be22e9e9
|
调整：进路列表信号机展示由uniqueName变更为name
|
2019-12-24 09:31:25 +08:00 |
|
zyy
|
c1f41b4299
|
修改信号机构建关系逻辑，修改创建逻辑区段偏移量数据逻辑
|
2019-12-23 17:14:38 +08:00 |
|
zyy
|
72c4bd0bd0
|
调整信号机接近区段点击事件
|
2019-12-23 16:23:56 +08:00 |
|
fan
|
ea97fc21b9
|
修复：选择进路延续保护区段选中逻辑区段替换为其父区段
|
2019-12-23 15:21:09 +08:00 |
|
zyy
|
d4cf4af2df
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-23 14:50:06 +08:00 |
|
zyy
|
a31e358b41
|
desc: 修改宁波一号线运行图导入数据修改
|
2019-12-23 14:49:57 +08:00 |
|
fan
|
907881eb7a
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-23 13:32:58 +08:00 |
|
fan
|
663d43c5d2
|
修复：调整延时解锁创建校验规则（仅当延续保护线路存在时，进行解锁区段解锁时间校验，否则直接放弃创建或删除延续保护）
|
2019-12-23 13:32:11 +08:00 |
|
zyy
|
e46915e686
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-23 13:24:09 +08:00 |
|
zyy
|
26d06cae27
|
调整运行图导入判断，删除进路数据字段
|
2019-12-23 13:24:00 +08:00 |
|
joylink_cuiweidong
|
4ab635e553
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-23 10:54:07 +08:00 |
|
joylink_cuiweidong
|
6d959b816b
|
修改imagecontrol 为 resource
|
2019-12-23 10:53:25 +08:00 |
|
zyy
|
d62b023d52
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-23 10:36:40 +08:00 |
|
zyy
|
6e7ad61b4a
|
调整新版地图，旧版地图在公共地图显示流程
|
2019-12-23 10:36:32 +08:00 |
|
fan
|
065a3ba72e
|
修复：调整左右关联区段list数据为计轴区段和道岔区段
|
2019-12-23 10:15:45 +08:00 |
|
fan
|
4677be1b32
|
修复：增加选中type类型
|
2019-12-23 09:44:03 +08:00 |
|
fan
|
35dceb2950
|
修复：增加非空校验
|
2019-12-23 09:31:04 +08:00 |
|
fan
|
32d188cdfc
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-23 09:23:58 +08:00 |
|
fan
|
d9bf1af2d9
|
修复：绘图高级绘图切换高亮显示问题
|
2019-12-23 09:23:29 +08:00 |
|
zyy
|
0826c93362
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-23 09:15:31 +08:00 |
|
zyy
|
6ec990a1b2
|
解析宁波一号线运行图
|
2019-12-23 09:15:25 +08:00 |
|
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 |
|
zyy
|
4f5fe2c9bb
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-20 10:54:35 +08:00 |
|
zyy
|
73da545e67
|
调整信号机偏移量设置
|
2019-12-20 10:54:29 +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
|
6ce29006e5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-19 16:21:15 +08:00 |
|
fan
|
143f35a222
|
进路物理区段列表连续高亮
|
2019-12-19 16:21:00 +08:00 |
|
joylink_cuiweidong
|
882bb44fb2
|
根据设备code高亮 地图对应的设备
|
2019-12-19 15:52:36 +08:00 |
|
fan
|
30fc3132d3
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-19 14:05:30 +08:00 |
|
fan
|
fbbee9324a
|
延续保护预览
|
2019-12-19 14:05:16 +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
|
3abc93cbb8
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-19 13:12:43 +08:00 |
|
zyy
|
c0c5d620cd
|
调整站台紧急停车创建逻辑
|
2019-12-19 13:12:34 +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 |
|