fan
|
26f59a4e4e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-23 18:36:47 +08:00 |
|
fan
|
9c07e3968d
|
代码调整
|
2020-04-23 18:35:27 +08:00 |
|
joylink_cuiweidong
|
203a24a6d0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-23 17:13:33 +08:00 |
|
joylink_cuiweidong
|
cdae58efbe
|
新版地图绘制 删除地图页面跳转问题
综合演练仿真 聊天 发送语音消息
|
2020-04-23 17:13:11 +08:00 |
|
zyy
|
98ce2d5890
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-23 17:12:06 +08:00 |
|
zyy
|
4d288556b0
|
调整绘图界面，调整实训平台鼠标隐藏bug
|
2020-04-23 17:11:51 +08:00 |
|
fan
|
747c56cac1
|
西安二运行图显示name不包含方向
|
2020-04-23 15:43:47 +08:00 |
|
fan
|
3c4682249c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-23 15:19:45 +08:00 |
|
fan
|
ca4dc2e2cf
|
撤销拦截错误，仅拦截500
|
2020-04-23 15:18:33 +08:00 |
|
joylink_cuiweidong
|
72f78751ce
|
综合演练仿真 聊天 创建对话，以及对话切换
|
2020-04-23 14:41:52 +08:00 |
|
fan
|
9dcb650a48
|
西安二运行图导入
|
2020-04-23 14:17:43 +08:00 |
|
fan
|
880e837285
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-23 13:37:59 +08:00 |
|
fan
|
5f526a4497
|
西安二号线运行图导入调整
|
2020-04-23 13:36:34 +08:00 |
|
zyy
|
56f713a02b
|
调整报错提示信息
|
2020-04-23 10:29:41 +08:00 |
|
zyy
|
61c385f570
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-23 10:06:58 +08:00 |
|
zyy
|
0e166416ba
|
调整catch 监听
|
2020-04-23 10:06:46 +08:00 |
|
fan
|
1e03ee1a3b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-23 10:05:15 +08:00 |
|
fan
|
97a9ae9f5c
|
接口报错调整
|
2020-04-23 10:03:07 +08:00 |
|
zyy
|
c5673fa6cb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-23 09:38:12 +08:00 |
|
zyy
|
e5206c8589
|
调整西安一号线运行图导入
|
2020-04-23 09:37:46 +08:00 |
|
fan
|
69574ccb0d
|
接口报错调整
|
2020-04-23 09:34:54 +08:00 |
|
zyy
|
306e9f4954
|
调整区段绘图显隐问题
|
2020-04-22 18:53:20 +08:00 |
|
zyy
|
d2eee7fca8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-22 18:37:23 +08:00 |
|
zyy
|
8882f716e4
|
调整运行图导入
|
2020-04-22 18:37:09 +08:00 |
|
fan
|
43378ad6f6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-22 18:26:26 +08:00 |
|
fan
|
06b9fda264
|
西安一三按计划折返
|
2020-04-22 18:24:28 +08:00 |
|
joylink_cuiweidong
|
511d5e48d4
|
综合演练仿真 聊天 socket 订阅
|
2020-04-22 18:17:27 +08:00 |
|
zyy
|
33e105ce88
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-22 18:02:58 +08:00 |
|
zyy
|
415d762294
|
调整地图绘制区段显隐关系
|
2020-04-22 18:02:43 +08:00 |
|
fan
|
a5f56bae2d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-22 17:26:46 +08:00 |
|
fan
|
1afcd2ec4a
|
仅哈尔滨线路显示客流量视图
|
2020-04-22 17:24:45 +08:00 |
|
joylink_cuiweidong
|
d9c7874a65
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-22 17:21:54 +08:00 |
|
joylink_cuiweidong
|
1a393e41b6
|
代码调整
|
2020-04-22 17:21:36 +08:00 |
|
fan
|
b898042b96
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-22 17:13:37 +08:00 |
|
fan
|
8c122f93d4
|
运行图加载调整&绘图设备道岔故障&佛山区段颜色
|
2020-04-22 17:12:29 +08:00 |
|
zyy
|
967e77042b
|
调整西安一号线导入时间格式化
|
2020-04-22 17:08:11 +08:00 |
|
zyy
|
45e10ef066
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-22 16:42:09 +08:00 |
|
zyy
|
00936b36ac
|
调整地图绘制区段关系显隐
|
2020-04-22 16:41:55 +08:00 |
|
joylink_cuiweidong
|
9523f6e4cc
|
新版地图 绘图 公里标显示 代码调整
|
2020-04-22 16:17:35 +08:00 |
|
joylink_cuiweidong
|
a0589d52dd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-22 15:34:08 +08:00 |
|
joylink_cuiweidong
|
f9ca0138c8
|
综合演练仿真添加聊天窗口调整(未完成)
|
2020-04-22 15:33:31 +08:00 |
|
fan
|
c3ca6de6d8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-22 14:32:00 +08:00 |
|
fan
|
e51824dc80
|
紧急停车位置调整&绘图站间分隔&车站批量调整
|
2020-04-22 14:30:37 +08:00 |
|
zyy
|
6d8d27a931
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-22 13:57:36 +08:00 |
|
zyy
|
7baea26e4d
|
拦截错误并提示
|
2020-04-22 13:57:19 +08:00 |
|
sunzhenyu
|
10949ddfbb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-22 13:23:09 +08:00 |
|
sunzhenyu
|
1cd2fd370b
|
复原三维沙盘行车逻辑
|
2020-04-22 13:22:54 +08:00 |
|
joylink_cuiweidong
|
d436041233
|
代码调整
|
2020-04-22 11:31:09 +08:00 |
|
fan
|
adfe7f0f05
|
派班工作站&运行图加载调整
|
2020-04-22 09:42:46 +08:00 |
|
fan
|
05c857aeb6
|
西安二号线运行图导入过滤TBKE&TWQN
|
2020-04-22 09:07:58 +08:00 |
|