Commit Graph

6898 Commits

Author SHA1 Message Date
joylink_cuiweidong
73fe03432b 派班计划代码调整(更改排班计划预览接口) 2020-08-04 15:29:10 +08:00
fan
b5352ef82d 调整设备配置psdCode展示 2020-08-04 14:47:47 +08:00
fan
8ed963fddb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-08-04 14:18:05 +08:00
fan
fb64429ee8 调整综合仿真开始状态管理 2020-08-04 14:17:47 +08:00
joylink_cuiweidong
01701479fd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-04 14:02:54 +08:00
joylink_cuiweidong
af0068c972 地图绘制代码调整
剧本录制代码调整
2020-08-04 14:02:10 +08:00
fan
57aabfc973 还原over中switchcount 2020-08-04 14:01:43 +08:00
fan
d95595ca0a 关联登录设备循环检测异常是循环获取二位码 2020-08-04 13:42:57 +08:00
fan
a385aa72c9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-08-04 13:30:52 +08:00
fan
8096076be3 电子沙盘界面添加退出和消息监听 2020-08-04 13:30:42 +08:00
zyy
1392503b9f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-04 13:00:55 +08:00
zyy
3f0123a472 调整地图绘制区段修改逻辑 2020-08-04 13:00:42 +08:00
sunzhenyu
3543373604 删除console 2020-08-04 11:15:54 +08:00
sunzhenyu
4aa95a4bd6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-04 11:11:18 +08:00
sunzhenyu
36d19545f8 修改三维沙盘初始视角,修改车站按钮样式 2020-08-04 11:11:13 +08:00
joylink_cuiweidong
ba7a2b6e38 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-04 11:09:18 +08:00
joylink_cuiweidong
a4f727be0d 派班计划代码调整(新增排班计划预览) 2020-08-04 11:09:00 +08:00
zyy
402a4f48b8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-04 10:49:33 +08:00
zyy
a8cb84176e 调整大屏逻辑 2020-08-04 10:49:22 +08:00
fan
9a4591effd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-08-04 10:42:40 +08:00
fan
394fa0ec18 添加电子沙盘设备 2020-08-04 10:42:04 +08:00
joylink_cuiweidong
118e7a6bce 仿真聊天代码调整 2020-08-04 10:24:45 +08:00
fan
f645433696 调整运行图加载方式 2020-08-04 10:03:06 +08:00
fan
313a99260c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-08-04 09:40:39 +08:00
fan
6c02fe9b75 撤销调整运行图加载方式 2020-08-04 09:40:20 +08:00
joylink_cuiweidong
1413a6a636 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 19:22:12 +08:00
joylink_cuiweidong
da39b8a1b4 哈尔滨一号线 教研机 切换 通号 层级调整 2020-08-03 19:21:56 +08:00
zyy
bd8054bef8 删除注释 2020-08-03 19:01:16 +08:00
fan
0d6641cb85 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-08-03 19:00:51 +08:00
fan
f89d29ad59 调整司机角色在添加仿真成员是未过滤 2020-08-03 19:00:42 +08:00
zyy
86197114a1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 19:00:04 +08:00
zyy
9aee216961 调整哈尔滨操作判断 2020-08-03 18:59:48 +08:00
joylink_cuiweidong
75c594219e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 18:54:06 +08:00
joylink_cuiweidong
dbc017763a 宁波线控制权转移代码调整 2020-08-03 18:52:39 +08:00
fan
fc64c99c8a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-08-03 18:48:47 +08:00
fan
cb7b03adbe 加载运行图数据失败调整 2020-08-03 18:45:24 +08:00
zyy
4954e5e344 删除注释 2020-08-03 17:42:42 +08:00
zyy
584fbad941 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 17:30:17 +08:00
zyy
d98e933e79 调整地图绘制样式 2020-08-03 17:30:01 +08:00
joylink_cuiweidong
a554912c09 哈尔滨一号线教研机 行调切通号 按钮显示调整 2020-08-03 17:28:46 +08:00
joylink_cuiweidong
baf0fe4900 故障操作切换代码调整 2020-08-03 16:59:23 +08:00
fan
3c622b6fb5 调整仿真仿真状态 2020-08-03 16:55:05 +08:00
fan
82bfb02b97 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-08-03 16:20:23 +08:00
fan
f23a3a8112 同步按计划行车时间 2020-08-03 16:20:14 +08:00
zyy
0f03eee53f 调整宁波道岔状态 2020-08-03 15:56:56 +08:00
zyy
057071769f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 15:32:20 +08:00
zyy
8422889940 调整大屏列表逻辑 2020-08-03 15:31:53 +08:00
fan
42d850de66 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-08-03 15:27:26 +08:00
joylink_cuiweidong
753f7db809 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 15:27:20 +08:00
fan
8b5e94755c 加载运行图数据失表问题修复&添加新角色同步公共会话成员 2020-08-03 15:27:14 +08:00