fan
|
6980bb099f
|
调整公共绘图元素显示条件
|
2020-03-10 10:21:33 +08:00 |
|
fan
|
91531c7521
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-10 10:08:40 +08:00 |
|
fan
|
f6a43ed6aa
|
宁波一调整道岔正反操为联动操作
|
2020-03-10 10:08:28 +08:00 |
|
fan
|
a4e5bf3d81
|
现地行调显示区分
|
2020-03-10 09:49:05 +08:00 |
|
program-walker
|
827a287e8a
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-09 20:26:53 +08:00 |
|
joylink_cuiweidong
|
259f688ef5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-09 19:42:29 +08:00 |
|
joylink_cuiweidong
|
6c39080e7c
|
成都一号线 列车小三角添加
|
2020-03-09 19:41:51 +08:00 |
|
fan
|
70e15f5329
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-09 18:48:33 +08:00 |
|
fan
|
75218e87ce
|
自动折返按钮调整
|
2020-03-09 18:47:50 +08:00 |
|
fan
|
2a61f97663
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-09 18:39:30 +08:00 |
|
fan
|
d45950fa68
|
自动折返调整
|
2020-03-09 18:35:01 +08:00 |
|
fan
|
96a9c73c29
|
列车位置调整
|
2020-03-09 18:25:25 +08:00 |
|
fan
|
1148ea5ad8
|
Merge branches 'dev' and 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-09 17:38:28 +08:00 |
|
fan
|
7f4e6fb13c
|
初始化按计划行车状态and其他调整
|
2020-03-09 17:38:15 +08:00 |
|
zyy
|
e59fe1cae5
|
Merge branch 'dev' into test
|
2020-03-09 17:05:43 +08:00 |
|
zyy
|
751a8e792c
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/jmapNew/config/skinCode/haerbin_01.js
|
2020-03-09 17:03:08 +08:00 |
|
zyy
|
103afa9f05
|
调整哈尔滨线路道岔显示问题
|
2020-03-09 17:02:13 +08:00 |
|
fan
|
2b971cdf12
|
初始化按计划行车状态and其他调整
|
2020-03-09 14:23:44 +08:00 |
|
fan
|
815e4446d4
|
哈尔滨列车调整
|
2020-03-09 09:58:49 +08:00 |
|
sunleking
|
a87d551751
|
修改三维仿真停车点
|
2020-03-08 23:10:57 +08:00 |
|
sunleking
|
a64e2e0880
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-03-08 19:41:03 +08:00 |
|
sunleking
|
674674bf86
|
修改三维仿真通信结构优化代码
|
2020-03-08 19:40:46 +08:00 |
|
|
|
1f881fc204
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-08 13:37:33 +08:00 |
|
zyy
|
482df0de33
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-07 19:12:45 +08:00 |
|
zyy
|
6acbf78688
|
哈尔滨站台状态调整
|
2020-03-07 19:12:19 +08:00 |
|
joylink_fanyuhong
|
26a5c0bf41
|
哈尔滨车调整
|
2020-03-07 18:57:01 +08:00 |
|
joylink_fanyuhong
|
357265d905
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-07 18:32:59 +08:00 |
|
joylink_fanyuhong
|
2ca260d502
|
哈尔滨创建计划车
|
2020-03-07 18:32:51 +08:00 |
|
zyy
|
4eff0fc013
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# src/jmapNew/shape/Station/index.js
|
2020-03-07 11:08:57 +08:00 |
|
zyy
|
a1416b9a23
|
调整哈尔滨线路扣车状态
|
2020-03-07 11:05:38 +08:00 |
|
joylink_cuiweidong
|
157a505e72
|
代码调整
|
2020-03-06 21:31:07 +08:00 |
|
joylink_cuiweidong
|
f3d152bdfc
|
代码调整
|
2020-03-06 21:26:58 +08:00 |
|
joylink_cuiweidong
|
e1fccdeb2a
|
代码调整
|
2020-03-06 20:57:24 +08:00 |
|
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 |
|
joylink_fanyuhong
|
14e054b0ab
|
代码调整
|
2020-03-06 20:35:53 +08:00 |
|
joylink_fanyuhong
|
709b9ece31
|
代码调整
|
2020-03-06 19:18:18 +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_fanyuhong
|
c5701cd835
|
成都一显示调整
|
2020-03-06 18:53:55 +08:00 |
|
joylink_fanyuhong
|
e9749daddb
|
进路调整，绘图相关调整
|
2020-03-06 18:25:05 +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 |
|
