sunzhenyu
|
71850afd98
|
修改三维沙盘列车转向赋值错误导致的车厢错位
|
2020-08-05 17:11:02 +08:00 |
|
fan
|
d7fefc6447
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-05 15:12:51 +08:00 |
|
fan
|
aea8dc7eca
|
清理多余状态
|
2020-08-05 15:12:40 +08:00 |
|
zyy
|
33b9618b77
|
调整地图绘制类型显示
|
2020-08-05 14:28:55 +08:00 |
|
fan
|
968d588914
|
撤销未完仿真状态管理
|
2020-08-05 13:23:45 +08:00 |
|
fan
|
afe83ed12b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-05 13:18:15 +08:00 |
|
zyy
|
6123c3b67c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-05 13:17:24 +08:00 |
|
fan
|
d9e6258e1e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-05 13:17:16 +08:00 |
|
fan
|
2f5421605e
|
运行图加载设置最大宽高
|
2020-08-05 13:16:58 +08:00 |
|
zyy
|
130b4d3768
|
修改路径
|
2020-08-05 13:16:57 +08:00 |
|
zyy
|
1db980b000
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-05 13:14:48 +08:00 |
|
zyy
|
e852eb95db
|
调整流程
|
2020-08-05 13:14:30 +08:00 |
|
joylink_cuiweidong
|
4a8d6fabe3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-05 13:04:12 +08:00 |
|
joylink_cuiweidong
|
96f6d5030b
|
哈尔滨一号线 自动触发进路 绘图代码调整
|
2020-08-05 13:03:53 +08:00 |
|
fan
|
1314ae64b6
|
调整参数名=》 是否自动折返始端
|
2020-08-05 11:23:48 +08:00 |
|
fan
|
58521b0820
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-05 10:58:06 +08:00 |
|
fan
|
6214acf235
|
信号机添加参数routeEnd&融屏测试
|
2020-08-05 10:57:58 +08:00 |
|
zyy
|
d9866e8372
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-05 10:28:12 +08:00 |
|
zyy
|
8bdf189e9c
|
调整哈尔滨操作
|
2020-08-05 10:27:55 +08:00 |
|
fan
|
49bf6943aa
|
调整运行图预览按钮&删除无用console
|
2020-08-05 09:36:13 +08:00 |
|
fan
|
f1622afc0f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new
|
2020-08-05 09:05:41 +08:00 |
|
fan
|
9cc130e737
|
仿真状态处理暂存
|
2020-08-05 09:05:26 +08:00 |
|
joylink_cuiweidong
|
946d212bb9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-04 18:48:14 +08:00 |
|
joylink_cuiweidong
|
2f6d444cf9
|
运行图代码调整
|
2020-08-04 18:47:57 +08:00 |
|
zyy
|
ee7ca07731
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-04 17:31:20 +08:00 |
|
zyy
|
6dbac54d1f
|
调整地图绘制相关流程
|
2020-08-04 17:31:07 +08:00 |
|
joylink_cuiweidong
|
1f6fdb5341
|
派班计划代码调整
|
2020-08-04 16:27:23 +08:00 |
|
joylink_cuiweidong
|
e8c3cbfe3c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-04 15:29:24 +08:00 |
|
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 |
|