zyy
|
1c04b8d215
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-25 18:45:53 +08:00 |
|
zyy
|
74f0b12e3c
|
修改运行图显示，调整进路列表展示
|
2019-12-25 18:45:48 +08:00 |
|
joylink_cuiweidong
|
8b27475499
|
站台修改对应的车站时，同时修改所属集中站
|
2019-12-25 17:33:57 +08:00 |
|
fan
|
df7f13d411
|
延续保护区段预览详情合并rowspan
|
2019-12-25 10:58:58 +08:00 |
|
fan
|
432b268675
|
延续保护区段，进路物理区段，信号机接近区段激活状态下，点击已选中的区段删除列表中的该区段
|
2019-12-25 10:31:42 +08:00 |
|
fan
|
7328b7adb6
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2019-12-25 09:19:54 +08:00 |
|
fan
|
9331180684
|
调整：信号机接近区段中信号机选中变为黄色
|
2019-12-25 09:18:28 +08:00 |
|
fan
|
fc4518b5a0
|
调整：延续保护区段和信号机接近区段可选逻辑区段
|
2019-12-25 08:58:50 +08:00 |
|
fan
|
d1cc62cd99
|
信号机接近区段信号机change，检索后台数据
|
2019-12-24 18:24:37 +08:00 |
|
fan
|
6d82f466a6
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-24 14:28:29 +08:00 |
|
fan
|
c31a9aff46
|
增加：进路始终端信号机为黄色
|
2019-12-24 14:26:07 +08:00 |
|
zyy
|
da217251c8
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-24 13:53:48 +08:00 |
|
zyy
|
a39078990f
|
设置进路记忆最后一个关联站台，及解锁时间
|
2019-12-24 13:53:37 +08:00 |
|
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 |
|
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
|
26d06cae27
|
调整运行图导入判断，删除进路数据字段
|
2019-12-23 13:24:00 +08:00 |
|
fan
|
4677be1b32
|
修复：增加选中type类型
|
2019-12-23 09:44:03 +08:00 |
|
fan
|
35dceb2950
|
修复：增加非空校验
|
2019-12-23 09:31:04 +08:00 |
|
fan
|
d9bf1af2d9
|
修复：绘图高级绘图切换高亮显示问题
|
2019-12-23 09:23:29 +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 |
|
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 |
|