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 |
|
sunzhenyu
|
1602592404
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2019-12-19 09:40:35 +08:00 |
|
sunzhenyu
|
536cbb4e60
|
剔除三维无用静态模型，修改模型配置
|
2019-12-19 09:40: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
|
710f572e12
|
代码调整
|
2019-12-18 14:47:20 +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 |
|
zyy
|
d82c9eaf70
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-18 10:13:10 +08:00 |
|
zyy
|
9686f69c1f
|
删除多余代码
|
2019-12-18 10:12:57 +08:00 |
|
joylink_cuiweidong
|
9c54da44f3
|
站台创建关联集中站
|
2019-12-18 10:01:58 +08:00 |
|
zyy
|
ee4078e5c9
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-18 09:49:49 +08:00 |
|
zyy
|
399093bc72
|
调整站台计算坐标
|
2019-12-18 09:49:44 +08:00 |
|
joylink_cuiweidong
|
e3fb06591c
|
代码修改
|
2019-12-17 19:22:07 +08:00 |
|
sunzhenyu
|
0c85459ddc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2019-12-17 19:09:15 +08:00 |
|
sunzhenyu
|
04d1ab8d59
|
link轨道模型合并测试，司机驾驶非驾驶车辆没附加linkcodebug修改
|
2019-12-17 19:09:04 +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 |
|