fan
|
63f1298252
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-29 18:40:02 +08:00 |
|
fan
|
cc71383210
|
苏电院 设备管理
|
2020-12-29 18:39:54 +08:00 |
|
joylink_cuiweidong
|
d749b41451
|
iscs 代码调整
|
2020-12-29 16:51:00 +08:00 |
|
joylink_cuiweidong
|
5c18a4fed5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-29 16:15:29 +08:00 |
|
joylink_cuiweidong
|
3329053207
|
仿真 综合演练 添加 联系方式
|
2020-12-29 16:15:10 +08:00 |
|
fan
|
0ea5ba18ab
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-29 16:13:44 +08:00 |
|
fan
|
9c729e36f2
|
调整服务端路径
|
2020-12-29 16:13:32 +08:00 |
|
sunzhenyu
|
b428536303
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-29 16:07:19 +08:00 |
|
sunzhenyu
|
447a255a35
|
修复三维车站客流上车人数无限制bug
|
2020-12-29 16:07:07 +08:00 |
|
joylink_cuiweidong
|
afef8f9e9f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-29 16:00:12 +08:00 |
|
joylink_cuiweidong
|
27eb820781
|
代码调整
|
2020-12-29 15:59:43 +08:00 |
|
fan
|
43429fb2cc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-29 15:56:44 +08:00 |
|
fan
|
9a6008f9f2
|
调整服务端路径
|
2020-12-29 15:56:29 +08:00 |
|
joylink_cuiweidong
|
575895afe1
|
ISCS 代码调整
|
2020-12-29 15:53:20 +08:00 |
|
joylink_cuiweidong
|
2c8632c362
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-29 15:20:35 +08:00 |
|
joylink_cuiweidong
|
637e766837
|
iscs 复制功能 添加
|
2020-12-29 15:20:01 +08:00 |
|
sunzhenyu
|
f45262c245
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-29 11:07:41 +08:00 |
|
sunzhenyu
|
512dd56afb
|
修改三维路径配置
|
2020-12-29 11:07:26 +08:00 |
|
fan
|
9a55afa779
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-29 11:04:17 +08:00 |
|
fan
|
72db8b3e94
|
紧急停车状态调整
|
2020-12-29 11:04:01 +08:00 |
|
joylink_cuiweidong
|
b2c53c5882
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-29 11:00:13 +08:00 |
|
joylink_cuiweidong
|
0bcdae70db
|
紧急停车代码调整
|
2020-12-29 10:59:55 +08:00 |
|
fan
|
855936a5db
|
调整功能按钮
|
2020-12-29 10:16:27 +08:00 |
|
sunzhenyu
|
ec1f215104
|
merge
|
2020-12-29 10:00:44 +08:00 |
|
sunzhenyu
|
0eedf1bd6b
|
merge
|
2020-12-29 10:00:29 +08:00 |
|
sunzhenyu
|
e857d580ac
|
修改客流车站模型
|
2020-12-29 09:59:43 +08:00 |
|
fan
|
8b2291e18b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-29 09:59:26 +08:00 |
|
fan
|
fda2e940a5
|
调整路径
|
2020-12-29 09:59:11 +08:00 |
|
lVAL
|
8297ebcf98
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-28 17:40:05 +08:00 |
|
lVAL
|
da1fa87021
|
修改代码
|
2020-12-28 17:39:47 +08:00 |
|
joylink_cuiweidong
|
6c3ebbe03e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-28 17:23:39 +08:00 |
|
joylink_cuiweidong
|
d7e2a42712
|
发布ibp盘 管理代码调整
|
2020-12-28 17:23:20 +08:00 |
|
lVAL
|
f97a98da21
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-28 16:59:57 +08:00 |
|
lVAL
|
44e42bf5e5
|
调整宁波3号线操作
|
2020-12-28 16:59:29 +08:00 |
|
fan
|
1d775c4529
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-28 16:41:56 +08:00 |
|
fan
|
b24e59bc9a
|
代码调整
|
2020-12-28 16:41:37 +08:00 |
|
joylink_cuiweidong
|
0b606fbc56
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-28 16:25:49 +08:00 |
|
joylink_cuiweidong
|
dbbd817aad
|
哈尔滨仿真线路里的交出控制功能逻辑问题 （bug12）代码调整
|
2020-12-28 16:25:29 +08:00 |
|
fan
|
908aa12c21
|
bug: 11 设置运行等级显示问题
|
2020-12-28 16:00:55 +08:00 |
|
fan
|
e9a0359b1f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-28 15:01:35 +08:00 |
|
fan
|
16206cd003
|
bug: 1 & 紧急停车调整 & bug: 10
|
2020-12-28 15:01:25 +08:00 |
|
joylink_cuiweidong
|
cdb3ab25c0
|
发布内容管理添加 发布ibp盘管理
|
2020-12-28 14:27:38 +08:00 |
|
joylink_cuiweidong
|
906e12d508
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-28 13:03:18 +08:00 |
|
joylink_cuiweidong
|
fc4d130675
|
宁波三号线 站台操作调整
|
2020-12-28 13:02:33 +08:00 |
|
fan
|
614f835701
|
成都一号线两个确认运行至前方站
|
2020-12-28 11:24:25 +08:00 |
|
fan
|
8028103feb
|
综合演练行调添加ISCS&ISCS列车时刻表&ISCS信号系统
|
2020-12-28 11:20:36 +08:00 |
|
fan
|
0401569ef7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-28 09:36:34 +08:00 |
|
fan
|
2c724cd7cd
|
ibp开门允许禁止问题调整
|
2020-12-28 09:35:56 +08:00 |
|
joylink_cuiweidong
|
940f01a89e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-25 18:07:15 +08:00 |
|
joylink_cuiweidong
|
418e8b86a4
|
宁波三号线 行调操作代码调整
|
2020-12-25 18:06:08 +08:00 |
|