fan
|
48b165e11c
|
国赛权限调整
|
2020-12-30 15:30:24 +08:00 |
|
lVAL
|
5e73352856
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-30 15:15:11 +08:00 |
|
lVAL
|
b315e03a3e
|
修改“修改运行图名称失败”的bug
|
2020-12-30 15:14:56 +08:00 |
|
fan
|
5860ec4cea
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-30 14:07:44 +08:00 |
|
fan
|
8154ace58b
|
ibp调整
|
2020-12-30 14:07:21 +08:00 |
|
lVAL
|
87261fdc67
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-30 13:25:35 +08:00 |
|
lVAL
|
79779e2a86
|
优化代码报错，以及修改保存iscs的数据的lineCode为mapId
|
2020-12-30 13:25:20 +08:00 |
|
fan
|
82797b16bb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-30 11:15:34 +08:00 |
|
fan
|
730b673da2
|
泰雷兹屏蔽门
|
2020-12-30 11:15:05 +08:00 |
|
lVAL
|
75fccbbd01
|
修改 iscs 数据获取来源
|
2020-12-30 10:47:25 +08:00 |
|
lVAL
|
07a1403be8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-30 10:09:24 +08:00 |
|
lVAL
|
a5a1a9f63e
|
调整iscs 修改lineCode 为 mapId
|
2020-12-30 10:09:05 +08:00 |
|
joylink_cuiweidong
|
7d42eace0a
|
发布iscs 代码调整
|
2020-12-30 09:32:19 +08:00 |
|
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
|
d795e92485
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-29 18:37:51 +08:00 |
|
joylink_cuiweidong
|
1499c69a80
|
bug[23,22,17] 修改
|
2020-12-29 18:37:33 +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
|
56a47f48f9
|
Merge branch 'test'
|
2020-12-29 16:14:16 +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 |
|
fan
|
62f4695c50
|
Merge remote-tracking branch 'origin/test'
|
2020-12-29 10:08:38 +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 |
|