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
|
bfe6c5a537
|
调整线路配置项流程，对接字段
|
2019-12-20 14:02:11 +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
|
05a4ca76dc
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-12-19 10:13:55 +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
|
c295f97819
|
调整车站显示坐标，信号机批量操作，调整逻辑代码
|
2019-12-18 16:20:30 +08:00 |
|
joylink_cuiweidong
|
38c2bc4c55
|
zc控制代码调整
|
2019-12-18 15:34:51 +08:00 |
|
joylink_cuiweidong
|
d994ed3d7e
|
代码调整
|
2019-12-18 15:00:53 +08:00 |
|
joylink_cuiweidong
|
2bbfa5e860
|
代码调整
|
2019-12-18 14:50:34 +08:00 |
|
joylink_cuiweidong
|
19606ffd98
|
权限代码调整
|
2019-12-18 13:29:52 +08:00 |
|
zyy
|
26de4ee6a4
|
Merge branch 'dev' into test
|
2019-12-18 13:25:59 +08:00 |
|
zyy
|
0bb46ab432
|
高级数据调整顺序
|
2019-12-18 13:21:07 +08:00 |
|
zyy
|
0d3ba9d138
|
Merge branch 'dev' into test
|
2019-12-18 13:07:54 +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
|
0a8b0e3264
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-18 11:18:08 +08:00 |
|
zyy
|
436db38200
|
调整区段字段保存获取
|
2019-12-18 11:17:57 +08:00 |
|
joylink_cuiweidong
|
cf03ac1e3d
|
综合演练的分发按钮去掉
所有的转增按钮去掉
|
2019-12-18 11:16:35 +08:00 |
|
joylink_cuiweidong
|
8d44dd0b19
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-12-18 10:20:44 +08:00 |
|
joylink_cuiweidong
|
d196383a06
|
批量设置集中站 数据过滤
|
2019-12-18 10:18:55 +08:00 |
|
zyy
|
97dc97d8db
|
Merge branch 'dev' into test
|
2019-12-18 10:14:33 +08:00 |
|
joylink_cuiweidong
|
9c54da44f3
|
站台创建关联集中站
|
2019-12-18 10:01:58 +08:00 |
|
joylink_cuiweidong
|
e3fb06591c
|
代码修改
|
2019-12-17 19:22:07 +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
|
97202631ea
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-17 17:27:54 +08:00 |
|
fan
|
88eeaff1e2
|
区段站台问题调整
|
2019-12-17 17:27:35 +08:00 |
|
zyy
|
ea4de2d11d
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-17 17:09:13 +08:00 |
|
zyy
|
88b1d10430
|
调整生成道岔 区段修改字段
|
2019-12-17 17:09:04 +08:00 |
|
fan
|
6195338947
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-17 16:41:40 +08:00 |
|
fan
|
3723c8696e
|
区段关系校验
|
2019-12-17 16:41:18 +08:00 |
|
joylink_cuiweidong
|
cd549d57fc
|
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 16:24:24 +08:00 |
|
joylink_cuiweidong
|
b8448aaff8
|
道岔设置集中站过滤
区段设置集中站过滤
车站设置集中站和管理车站列表代码调整
|
2019-12-17 16:22:07 +08:00 |
|
zyy
|
b05d71667e
|
调整列车创建
|
2019-12-17 15:37:11 +08:00 |
|
zyy
|
fce5242e06
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-17 14:34:18 +08:00 |
|
zyy
|
24fd0890dd
|
调整进路保存
|
2019-12-17 14:34:09 +08:00 |
|
fan
|
c501445800
|
折线偏移量调整
|
2019-12-17 14:26:56 +08:00 |
|
fan
|
e419fd9241
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-17 10:31:24 +08:00 |
|
fan
|
4cecc2d630
|
逻辑区段增加偏移量参数
|
2019-12-17 10:31:12 +08:00 |
|
zyy
|
0bb01b4e4c
|
调整信号机字段
|
2019-12-17 10:30:27 +08:00 |
|
fan
|
a1be3cf879
|
逻辑区段增加偏移量参数
|
2019-12-17 10:26:38 +08:00 |
|
zyy
|
c0e953ceeb
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/views/newMap/newMapdraft/mapoperate/signal/index.vue
# src/views/newMap/newMapdraft/mapoperate/stationstand.vue
|
2019-12-17 09:16:55 +08:00 |
|
zyy
|
9fe6c9739d
|
调整代码
|
2019-12-17 09:13:57 +08:00 |
|
fan
|
5dc6f88beb
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-12-16 19:24:08 +08:00 |
|
fan
|
1877b05cce
|
信号机方向属性调整
|
2019-12-16 18:17:43 +08:00 |
|
fan
|
28c57c1228
|
站台方向属性调整
|
2019-12-16 14:51:30 +08:00 |
|
fan
|
c79465b31a
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-16 10:57:53 +08:00 |
|
fan
|
7d2d6fb580
|
站台方向属性调整
|
2019-12-16 10:57:40 +08:00 |
|
zyy
|
de30f91aed
|
修改代码
|
2019-12-13 18:50:01 +08:00 |
|
joylink_cuiweidong
|
61ee6415cf
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-12-13 18:31:23 +08:00 |
|
zyy
|
a6e8f1376f
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/views/newMap/newMapdraft/mapoperate/section.vue
|
2019-12-13 18:01:48 +08:00 |
|
zyy
|
70ae531eff
|
增加信号机构建偏移量关联关系逻辑， 调整车次窗批量修改
|
2019-12-13 18:00:12 +08:00 |
|
fan
|
b2c9e34a25
|
站台方向属性初始值调整
|
2019-12-13 17:53:34 +08:00 |
|
fan
|
62300d327f
|
站台方向属性调整
|
2019-12-13 17:51:00 +08:00 |
|
fan
|
852ac4e601
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/views/newMap/newMapdraft/mapoperate/section.vue
|
2019-12-13 17:12:10 +08:00 |
|
fan
|
ea3217891a
|
逻辑区段偏移量
|
2019-12-13 17:06:17 +08:00 |
|
fan
|
bd1cbf4e40
|
站台调整
|
2019-12-13 16:28:34 +08:00 |
|
joylink_cuiweidong
|
36c1b6ceec
|
车站添加副标题
|
2019-12-13 16:13:10 +08:00 |
|
sunzhenyu
|
23400034c1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2019-12-13 15:57:51 +08:00 |
|
sunzhenyu
|
e8cc316e82
|
增加继电器部件显示
|
2019-12-13 15:57:38 +08:00 |
|
joylink_cuiweidong
|
284f7bcc7b
|
区段删除站台轨对应站台编码
|
2019-12-13 15:24:51 +08:00 |
|
joylink_cuiweidong
|
6715c48642
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-13 14:58:39 +08:00 |
|
joylink_cuiweidong
|
9123dc050a
|
车站添加车站编号
|
2019-12-13 14:58:28 +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
|
0a2e5567a2
|
代码调整
|
2019-12-13 13:23:07 +08:00 |
|
joylink_cuiweidong
|
b2b9c5819b
|
车站增加: 是否连锁站
区段删除关联站台字段
|
2019-12-13 13:19:09 +08:00 |
|
fan
|
083e70dc02
|
站台屏蔽门调整
|
2019-12-13 13:10:11 +08:00 |
|
zyy
|
a0899720b6
|
Merge branch 'dev' into test
|
2019-12-13 10:19:44 +08:00 |
|
sunzhenyu
|
c89401b58a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2019-12-13 09:14:37 +08:00 |
|
sunzhenyu
|
a9a62b924f
|
添加继电器界面动画，修改继电器显示模式
|
2019-12-13 09:14:28 +08:00 |
|
zyy
|
2f639cce5e
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-12 18:15:32 +08:00 |
|
zyy
|
7ef051733a
|
调整缩放，站台显示，坐标
|
2019-12-12 18:15:25 +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
|
0ef09ed480
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-12 15:58:39 +08:00 |
|
fan
|
54be69b2e6
|
drawWay参数调整
|
2019-12-12 15:58:19 +08:00 |
|
zyy
|
7c9d9c6373
|
调整站台显示样式问题，修改代码
|
2019-12-12 15:31:01 +08:00 |
|
fan
|
9a342caad7
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-12 12:23:36 +08:00 |
|
fan
|
80109bb349
|
区段新建台调整
|
2019-12-12 12:23:25 +08:00 |
|
joylink_cuiweidong
|
eec32fea2a
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-12 10:41:32 +08:00 |
|
joylink_cuiweidong
|
df31cb9138
|
代码调整
|
2019-12-12 10:40:54 +08:00 |
|
zyy
|
e7505d65eb
|
Merge branch 'dev' into test
|
2019-12-12 10:05:51 +08:00 |
|
zyy
|
6fb6ae9867
|
调整站台，屏蔽门默认样式
|
2019-12-12 10:05:28 +08:00 |
|
fan
|
6e50f1eddf
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-11 18:25:22 +08:00 |
|
fan
|
cc014d4ccc
|
自动折返设置优先级
|
2019-12-11 18:25:03 +08:00 |
|
zyy
|
23aec2d206
|
Merge branch 'dev' into test
|
2019-12-11 17:23:03 +08:00 |
|
zyy
|
159a2b4890
|
调整点击道岔计轴显示道岔区段
|
2019-12-11 17:22:01 +08:00 |
|
zyy
|
206496609d
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-11 17:07:39 +08:00 |
|
zyy
|
b2dd3d7285
|
调整站台生成逻辑，调整uid检测方式
|
2019-12-11 17:07:29 +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 |
|
sunzhenyu
|
57db66b6c2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2019-12-11 10:47:32 +08:00 |
|
sunzhenyu
|
5992e1a0ae
|
修改三维模块名称，升级threejs版本
|
2019-12-11 10:47:24 +08:00 |
|
joylink_cuiweidong
|
a358b9cdd6
|
代码调整
|
2019-12-11 09:42:33 +08:00 |
|
zyy
|
9e50f2eacf
|
Merge branch 'dev' into test
|
2019-12-11 09:08:28 +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
|
214a74a55a
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-10 17:56:08 +08:00 |
|
fan
|
0bde17887f
|
高级延续保护调整
|
2019-12-10 17:55:43 +08:00 |
|
joylink_cuiweidong
|
f6e0221b88
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-10 17:11:54 +08:00 |
|
joylink_cuiweidong
|
424ec26538
|
用户权限统计代码调整
|
2019-12-10 17:11:14 +08:00 |
|
zyy
|
914af945c8
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-10 16:57:37 +08:00 |
|
zyy
|
9aec1ef099
|
调整拖拽逻辑
|
2019-12-10 16:57:31 +08:00 |
|
fan
|
b6719793c9
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-10 16:50:50 +08:00 |
|