fan
|
65475abf6f
|
进路赋值前清除延续保护表单
|
2019-12-26 14:06:42 +08:00 |
|
joylink_cuiweidong
|
8e82ceab27
|
权限打包页面接口调整（/api/lesson）
|
2019-12-26 13:12:23 +08:00 |
|
fan
|
d327e50a44
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-26 11:04:57 +08:00 |
|
fan
|
8431ff8cc4
|
增加非空校验
|
2019-12-26 11:04:21 +08:00 |
|
zyy
|
8d5fce7250
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-26 11:02:00 +08:00 |
|
zyy
|
6e3424e355
|
调整实训平台新旧地图显示逻辑
|
2019-12-26 11:01:54 +08:00 |
|
fan
|
6ff30c5b63
|
增加非空校验
|
2019-12-26 10:47:40 +08:00 |
|
fan
|
d79d2af32c
|
区段赋值时清除逻辑区段code列表
|
2019-12-26 10:44:08 +08:00 |
|
joylink_cuiweidong
|
4a30ced825
|
创建课程时，所属产品变为产品类型
|
2019-12-25 19:40:49 +08:00 |
|
joylink_cuiweidong
|
b70daac9bf
|
定制-产品名称改为产品类型
展示页面产品名称改为产品类型
|
2019-12-25 19:28:03 +08:00 |
|
joylink_cuiweidong
|
cb1ca75eb7
|
用户仿真统计
新增-产品名称改为产品类型
前端维护一个产品类型枚举
|
2019-12-25 18:56:25 +08:00 |
|
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 |
|
zyy
|
f23da9be42
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/views/newMap/newMapdraft/mapoperate/section/logicBlock.vue
|
2019-12-25 09:13:29 +08:00 |
|
zyy
|
741fccf609
|
删除多余字段
|
2019-12-25 09:12:22 +08:00 |
|
fan
|
fc4518b5a0
|
调整：延续保护区段和信号机接近区段可选逻辑区段
|
2019-12-25 08:58:50 +08:00 |
|
fan
|
d1cc62cd99
|
信号机接近区段信号机change，检索后台数据
|
2019-12-24 18:24:37 +08:00 |
|
fan
|
52eddbaa3d
|
调整logicSectionCodeList赋值增加校验
|
2019-12-24 18:05:56 +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
|
db44fe8d62
|
分页获取用户权限接口，前端添加昵称字段
|
2019-12-24 11:23:55 +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 |
|
joylink_cuiweidong
|
b7d5edfb31
|
轮播页面调整
|
2019-12-24 09:09:30 +08:00 |
|
zyy
|
c1f41b4299
|
修改信号机构建关系逻辑，修改创建逻辑区段偏移量数据逻辑
|
2019-12-23 17:14:38 +08:00 |
|
zyy
|
72c4bd0bd0
|
调整信号机接近区段点击事件
|
2019-12-23 16:23:56 +08:00 |
|
zyy
|
7073fb2a0c
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-23 16:01:16 +08:00 |
|
zyy
|
0f2b7f18fe
|
增加宁波一号线运行图目的码导入
|
2019-12-23 16:01:09 +08:00 |
|
fan
|
ea97fc21b9
|
修复：选择进路延续保护区段选中逻辑区段替换为其父区段
|
2019-12-23 15:21:09 +08:00 |
|
fan
|
f469c129ae
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-23 14:51:09 +08:00 |
|
fan
|
4e7e0a256b
|
修复：调整table数据处理时满足条件后未跳出循环导致的相关问题
|
2019-12-23 14:50:44 +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 |
|