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 |
|
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
|
4ed2b9b371
|
修改继电器动画选择设备复位
|
2019-12-13 09:31:59 +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 |
|