joylink_fanyuhong
|
03ce32b977
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-06 11:27:07 +08:00 |
|
joylink_fanyuhong
|
56a5d0f018
|
调整显示条件
|
2020-03-06 11:26:52 +08:00 |
|
zyy
|
6d0849f5b3
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/jmapNew/utils/parser.js
|
2020-03-06 10:23:14 +08:00 |
|
zyy
|
a1f752fe59
|
调整地图绘制矩形框保存字段
|
2020-03-06 10:21:41 +08:00 |
|
joylink_fanyuhong
|
8c53f0fe5d
|
配置调整
|
2020-03-06 10:20:04 +08:00 |
|
joylink_fanyuhong
|
50ef8c5474
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-06 10:05:31 +08:00 |
|
joylink_fanyuhong
|
217864dbd4
|
站台功能按钮
|
2020-03-06 10:05:21 +08:00 |
|
joylink_cuiweidong
|
02a2336731
|
宁波一号线行调操作调整
|
2020-03-05 20:36:27 +08:00 |
|
joylink_fanyuhong
|
67aef69fe5
|
获取数据时替换列车code位groupNumber
|
2020-03-05 18:24:06 +08:00 |
|
joylink_fanyuhong
|
9200cb99f7
|
站台增加功能按钮，未完
|
2020-03-05 18:17:47 +08:00 |
|
joylink_fanyuhong
|
c9e8827c3a
|
合并代码
|
2020-03-05 16:43:53 +08:00 |
|
joylink_fanyuhong
|
8d58125e1f
|
自动进路和引导总锁
|
2020-03-05 16:39:49 +08:00 |
|
joylink_cuiweidong
|
420c97f88e
|
宁波一号线信号机站台操作代码调整（行调）
|
2020-03-05 16:28:08 +08:00 |
|
zyy
|
30c672026f
|
增加矩形包围框
|
2020-03-05 15:48:51 +08:00 |
|
zyy
|
2df1803ca5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-05 14:33:20 +08:00 |
|
zyy
|
3510548b7b
|
调整集中站指示灯状态，绘图显示
|
2020-03-05 14:33:08 +08:00 |
|
joylink_cuiweidong
|
dc12bd3f88
|
成都一号线 信号机 信号自动通过 代码调整
自动通过模式，自动触发模式 状态参数调整
|
2020-03-05 13:40:50 +08:00 |
|
zyy
|
7ff7deae48
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-05 12:21:42 +08:00 |
|
zyy
|
8e7fc5104a
|
调整lc模块保存，自动折返绘图状态配置，流程完善
|
2020-03-05 12:21:28 +08:00 |
|
joylink_cuiweidong
|
8d022403c3
|
北京一号现地道岔 单锁解封操作代码调整
|
2020-03-05 09:53:42 +08:00 |
|
zyy
|
5ef8a595e8
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-04 20:59:30 +08:00 |
|
zyy
|
af5c108610
|
创建自动折返模块
|
2020-03-04 20:59:16 +08:00 |
|
joylink_cuiweidong
|
e6eb7994fb
|
北京一号线 现地道岔操作代码调整
|
2020-03-04 19:53:50 +08:00 |
|
zyy
|
6101a0d28a
|
删除多于设置状态信息
|
2020-03-04 18:04:43 +08:00 |
|
zyy
|
3a5804c578
|
调整宁波一号线道岔，区段封锁 单锁状态，调整zc模块与站台的关系
|
2020-03-04 18:03:50 +08:00 |
|
zyy
|
3a5d7af0ff
|
删除多于注释状态
|
2020-03-04 14:19:29 +08:00 |
|
zyy
|
d342c249ab
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-04 14:15:17 +08:00 |
|
zyy
|
467a9cf982
|
调整宁波线路现地操作
|
2020-03-04 14:14:59 +08:00 |
|
joylink_cuiweidong
|
78939de116
|
成都三号线 行调信号机站台代码调整
|
2020-03-04 11:29:57 +08:00 |
|
joylink_cuiweidong
|
33d711cf49
|
北京一号线 信号机站台代码调整
|
2020-03-04 09:17:06 +08:00 |
|
joylink_cuiweidong
|
9c1c48b968
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-03 21:01:44 +08:00 |
|
joylink_cuiweidong
|
d4f3f42cdf
|
成都一号线 信号机代码调整
|
2020-03-03 21:00:10 +08:00 |
|
joylink_fanyuhong
|
78c3af254f
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-03 18:47:44 +08:00 |
|
joylink_fanyuhong
|
09278e4b1e
|
排序操作
|
2020-03-03 18:47:32 +08:00 |
|
zyy
|
af960cc011
|
调整状态
|
2020-03-03 18:09:05 +08:00 |
|
joylink_cuiweidong
|
88a4b01802
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-03 18:01:43 +08:00 |
|
joylink_cuiweidong
|
231c6fda52
|
代码调整
|
2020-03-03 17:54:08 +08:00 |
|
zyy
|
c90a37f10d
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-03 17:53:04 +08:00 |
|
zyy
|
aa80b8e74f
|
调整宁波一信号机现地操作
|
2020-03-03 17:52:37 +08:00 |
|
joylink_fanyuhong
|
28db37a54f
|
成都三现地操作调整
|
2020-03-03 17:34:50 +08:00 |
|
joylink_fanyuhong
|
09c0637c93
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-03 14:24:33 +08:00 |
|
joylink_fanyuhong
|
e60fde1a5a
|
地图排序
|
2020-03-03 14:24:25 +08:00 |
|
joylink_cuiweidong
|
030470eec4
|
代码调整
|
2020-03-03 14:09:27 +08:00 |
|
zyy
|
ef0af739a9
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-03 12:57:41 +08:00 |
|
zyy
|
8729905299
|
调整临时限速绘图逻辑，调整宁波线车次窗流程操作
|
2020-03-03 12:57:26 +08:00 |
|
joylink_fanyuhong
|
a853439255
|
地图排序
|
2020-03-03 11:08:41 +08:00 |
|
joylink_fanyuhong
|
22d1262cd5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-03 09:46:58 +08:00 |
|
joylink_fanyuhong
|
ce2d67ed2c
|
车身计算包围框调整
|
2020-03-03 09:46:50 +08:00 |
|
zyy
|
79734147e8
|
调整错误信息返回
|
2020-03-02 21:49:19 +08:00 |
|
zyy
|
6a306af8c4
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-02 19:42:29 +08:00 |
|