joylink_cuiweidong
|
bb204dd72a
|
列车 跳停 扣车 车门 状态代码调整
|
2020-03-06 20:47:39 +08:00 |
|
joylink_fanyuhong
|
3745815a5b
|
代码调整
(cherry picked from commit 14e054b)
|
2020-03-06 20:42:40 +08:00 |
|
joylink_fanyuhong
|
f685279c6d
|
代码调整
(cherry picked from commit 709b9ec)
|
2020-03-06 20:42:29 +08:00 |
|
joylink_fanyuhong
|
9d56738ddc
|
成都一显示调整
(cherry picked from commit c5701cd)
|
2020-03-06 20:42:17 +08:00 |
|
joylink_fanyuhong
|
7f53be45b1
|
进路调整，绘图相关调整
(cherry picked from commit e9749da)
|
2020-03-06 20:42:04 +08:00 |
|
zyy
|
b92b2ff786
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-06 19:02:34 +08:00 |
|
zyy
|
84c379410f
|
调整站台状态
|
2020-03-06 19:02:20 +08:00 |
|
joylink_cuiweidong
|
f8cadc33b8
|
自动折返绘图数据添加是否显示边框字段
|
2020-03-06 17:45:20 +08:00 |
|
zyy
|
2f96f68e46
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-06 16:16:20 +08:00 |
|
zyy
|
6c797c50e6
|
调整地图绘制，公共地图车站 ，站台显示逻辑判断
|
2020-03-06 16:16:04 +08:00 |
|
joylink_cuiweidong
|
4c02e416bc
|
成都一号线 列车所在区段位置代码调整（部分）
|
2020-03-06 15:27:31 +08:00 |
|
zyy
|
93be0b7ff6
|
调整车站引导总锁在地图绘制中不显示，增加字体的默认状态
|
2020-03-06 12:18:04 +08:00 |
|
zyy
|
a5543cb1b4
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-06 12:04:21 +08:00 |
|
zyy
|
b2a154a3a4
|
增加车站 站台 屏蔽门批量设置功能
|
2020-03-06 12:04:00 +08:00 |
|
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
|
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 |
|
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_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
|
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 |
|
zyy
|
4f1a72bb76
|
调整宁波菜单显示，错误提示
|
2020-03-02 19:42:10 +08:00 |
|
joylink_cuiweidong
|
9ae9688868
|
北京一号线 成都三号线 宁波一号线 站台跳停取消跳停代码调整
|
2020-03-02 19:07:28 +08:00 |
|
joylink_cuiweidong
|
9ce5cd4a34
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-02 17:19:06 +08:00 |
|
joylink_fanyuhong
|
81c81e5ac1
|
添加属性
|
2020-03-02 17:17:07 +08:00 |
|
joylink_cuiweidong
|
cd970436f9
|
北京一号线成都三号线站台操作代码调整
|
2020-03-02 17:16:59 +08:00 |
|
zyy
|
75d9f1b3bb
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-02 16:54:49 +08:00 |
|
zyy
|
915d1372e5
|
调整哈尔滨车站 显示
|
2020-03-02 16:54:36 +08:00 |
|
joylink_fanyuhong
|
af7488c27f
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/jmapNew/config/skinCode/ningbo_01.js
|
2020-03-02 16:32:33 +08:00 |
|
joylink_fanyuhong
|
82c418681d
|
列车调整
|
2020-03-02 16:29:09 +08:00 |
|
zyy
|
e46239c8b9
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/jmapNew/config/skinCode/ningbo_01.js
# src/store/modules/socket.js
|
2020-03-02 16:18:23 +08:00 |
|
zyy
|
79820a9725
|
调整宁波线显示数据，哈尔滨道岔逻辑判断显示
|
2020-03-02 16:16:17 +08:00 |
|
joylink_cuiweidong
|
c1e39574c8
|
成都三号线 站台操作代码调整
|
2020-03-02 15:37:02 +08:00 |
|
joylink_fanyuhong
|
c1c624dfff
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-02 14:47:08 +08:00 |
|
joylink_fanyuhong
|
692f30fd9f
|
运行图导入和列车调整
|
2020-03-02 14:46:59 +08:00 |
|
joylink_cuiweidong
|
ab89966902
|
北京一号线哈尔滨 站台操作代码调整
|
2020-03-02 09:21:29 +08:00 |
|
joylink_zyy
|
e7a247ab4d
|
调整哈尔滨曲线封锁绘图
|
2020-03-01 12:26:55 +08:00 |
|
joylink_zyy
|
2c09aa0e84
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-29 00:04:29 +08:00 |
|
joylink_zyy
|
446593fded
|
调整哈尔滨道岔显示问题
|
2020-02-29 00:04:24 +08:00 |
|
joylink_cuiweidong
|
167ca0e2a9
|
北京一号线信号机操作代码调整
|
2020-02-28 20:30:46 +08:00 |
|
joylink_cuiweidong
|
4ee98785c4
|
宁波一号线 成都三号线站台信号机操作代码调整
|
2020-02-28 18:50:03 +08:00 |
|
joylink_zyy
|
ff640adf39
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-28 18:10:26 +08:00 |
|
joylink_zyy
|
448523cf88
|
调整哈尔滨线路道岔显示问题
|
2020-02-28 18:10:20 +08:00 |
|
joylink_fanyuhong
|
d73f084fd5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-28 16:47:35 +08:00 |
|
joylink_fanyuhong
|
92f4f2f1ca
|
按计划行车接口报错提示
|
2020-02-28 16:47:26 +08:00 |
|
joylink_cuiweidong
|
d5ac3f37a2
|
成都三号线 信号机 操作代码调整
|
2020-02-28 15:50:20 +08:00 |
|
joylink_zyy
|
c32b986cea
|
调整区段颜色
|
2020-02-28 15:36:03 +08:00 |
|
joylink_zyy
|
a9d40c7af6
|
哈尔滨区段颜色
|
2020-02-28 15:30:40 +08:00 |
|
joylink_zyy
|
9887627fd8
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-28 15:20:31 +08:00 |
|
joylink_zyy
|
870a68a476
|
调整区段，道岔显示样式
|
2020-02-28 15:20:26 +08:00 |
|
joylink_cuiweidong
|
32b16077f3
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-28 13:10:48 +08:00 |
|
joylink_cuiweidong
|
7038ec12a8
|
哈尔滨线路信号机操作代码调整
|
2020-02-28 13:07:49 +08:00 |
|
joylink_fanyuhong
|
d5539a986b
|
按计划行车接口报错提示
(cherry picked from commit 1abad25)
|
2020-02-28 11:28:13 +08:00 |
|
joylink_cuiweidong
|
04878f54ba
|
哈尔滨线路 信号机操作代码调整
|
2020-02-28 10:41:36 +08:00 |
|
joylink_fanyuhong
|
b880101a46
|
运行图预览
|
2020-02-27 22:17:33 +08:00 |
|
joylink_fanyuhong
|
543b3c1259
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-27 22:10:08 +08:00 |
|
joylink_fanyuhong
|
41bc739eab
|
运行图预览
|
2020-02-27 22:09:51 +08:00 |
|
zyy
|
c7ece4aa60
|
调整速度
|
2020-02-27 21:37:58 +08:00 |
|
joylink_cuiweidong
|
4d4c10f2d5
|
哈尔滨线路 信号机操作代码调整
|
2020-02-27 20:37:35 +08:00 |
|
zyy
|
632a3275e4
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-27 18:22:11 +08:00 |
|
zyy
|
07330bf054
|
调整道岔，区段操作
|
2020-02-27 18:21:39 +08:00 |
|
joylink_cuiweidong
|
4dab35a61e
|
哈尔滨线路 右键操作 代码调整
|
2020-02-27 17:31:29 +08:00 |
|
zyy
|
4e6f107896
|
调整宁波一道岔操作
|
2020-02-27 15:44:51 +08:00 |
|