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 |
|
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 |
|
sunzhenyu
|
daff5faaa5
|
整理注释继电器代码
|
2019-12-13 17:53:22 +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
|
bd1f12bd79
|
暂时将继电器放入白名单
|
2019-12-13 16:09:43 +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
|
72ca4c37f9
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-13 15:23:34 +08:00 |
|
zyy
|
3df3e162bd
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-13 15:11:10 +08:00 |
|
zyy
|
c287f8d13b
|
desc: 调整绘图右键包围框起点
|
2019-12-13 15:11:01 +08:00 |
|