joylink_cuiweidong
|
d28aa00c78
|
裁判系统 代码调整
|
2020-06-04 15:49:23 +08:00 |
|
joylink_cuiweidong
|
2ee3ecd2b0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-04 15:11:21 +08:00 |
|
joylink_cuiweidong
|
59487c992d
|
裁判系统代码调整
|
2020-06-04 15:10:54 +08:00 |
|
fan
|
7f08ae9e71
|
调整教学时切换题group为刷新的问题&自排全开全关=》自排单开单关
|
2020-06-04 14:21:19 +08:00 |
|
fan
|
d7c55ab346
|
调整实训考试本地缓存时间超出考试时间时剩余时间显示问题
|
2020-06-04 13:31:02 +08:00 |
|
fan
|
1d5210db45
|
调整课程新建时路由参数drawWay丢失的问题
|
2020-06-04 13:20:32 +08:00 |
|
fan
|
cc696b6d14
|
道岔故障报警灯闪烁
|
2020-06-04 11:32:49 +08:00 |
|
fan
|
70a3e96d64
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-04 11:17:58 +08:00 |
|
fan
|
5ad0464fcd
|
iscs调整
|
2020-06-04 11:17:43 +08:00 |
|
joylink_cuiweidong
|
0cf0caef1d
|
裁判系统代码调整
佛山左下角信息窗口调整
|
2020-06-04 11:12:55 +08:00 |
|
joylink_cuiweidong
|
aa5a00b401
|
竞赛裁判平台代码调整
|
2020-06-04 10:22:02 +08:00 |
|
fan
|
bf07ea8e0a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 18:36:05 +08:00 |
|
fan
|
ae53e208bb
|
实操竞赛结果调整
|
2020-06-03 18:35:43 +08:00 |
|
fan
|
f4d402322a
|
实操竞赛结果调整
|
2020-06-03 18:35:10 +08:00 |
|
sunzhenyu
|
afc9392bd6
|
merge
|
2020-06-03 18:33:22 +08:00 |
|
sunzhenyu
|
7562b932fe
|
修改驾驶按钮逻辑，三维cctv增加列车进出站
|
2020-06-03 18:32:46 +08:00 |
|
joylink_cuiweidong
|
efc8d80899
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 18:24:14 +08:00 |
|
joylink_cuiweidong
|
7946d9f6e7
|
仿真聊天代码调整
|
2020-06-03 18:23:48 +08:00 |
|
fan
|
44bb0f0f29
|
实操竞赛调整
|
2020-06-03 18:17:52 +08:00 |
|
fan
|
dbfb442ecf
|
控制权转换问题调整
|
2020-06-03 17:03:10 +08:00 |
|
fan
|
b1a00b3378
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 16:46:52 +08:00 |
|
fan
|
a46db80649
|
调整逻辑数据未初始化
|
2020-06-03 16:46:37 +08:00 |
|
joylink_cuiweidong
|
156a746a07
|
综合演练仿真聊天 请求会话成员代码调整 退出会话代码调整
|
2020-06-03 16:44:38 +08:00 |
|
joylink_cuiweidong
|
49c61f8c8d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 16:20:13 +08:00 |
|
joylink_cuiweidong
|
d8d896fc5f
|
综合演练结束仿真，其他成员不退出仿真 调整
|
2020-06-03 16:19:49 +08:00 |
|
fan
|
8fff683ace
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 16:18:55 +08:00 |
|
fan
|
046a09f8b5
|
调整实操竞赛&星期显示
|
2020-06-03 16:18:40 +08:00 |
|
zyy
|
b40011c975
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 15:44:53 +08:00 |
|
zyy
|
949b49183f
|
调整西安线路信号机操作
|
2020-06-03 15:44:37 +08:00 |
|
fan
|
6ac7b9b932
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 15:29:06 +08:00 |
|
fan
|
0f5185702b
|
合并代码
|
2020-06-03 15:28:57 +08:00 |
|
zyy
|
ce5318386e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 14:47:38 +08:00 |
|
zyy
|
31fab488c0
|
调整区段保存流程
|
2020-06-03 14:47:26 +08:00 |
|
fan
|
f6997d3bd9
|
合并代码
|
2020-06-03 14:30:14 +08:00 |
|
fan
|
8bf9f77e0b
|
西安三号线控制权调整&iscs调整
|
2020-06-03 14:27:54 +08:00 |
|
joylink_cuiweidong
|
9c2831bd3d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 13:31:27 +08:00 |
|
joylink_cuiweidong
|
b2f4138699
|
代码调整
|
2020-06-03 13:31:09 +08:00 |
|
zyy
|
a98495f43f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 13:19:11 +08:00 |
|
zyy
|
a57ae39ebf
|
调整区段修改逻辑
|
2020-06-03 13:18:52 +08:00 |
|
joylink_cuiweidong
|
00705cd006
|
综合演练仿真聊天 退出群聊代码调整
|
2020-06-03 11:20:46 +08:00 |
|
joylink_cuiweidong
|
3c6b950744
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 10:44:43 +08:00 |
|
joylink_cuiweidong
|
c3736a02c8
|
北京/佛山/哈尔滨 现地 左下角 聊天信息窗口遮盖问题处理
|
2020-06-03 10:43:41 +08:00 |
|
zyy
|
d592e381ab
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 10:12:50 +08:00 |
|
zyy
|
631fba04bb
|
调整道岔佛山线路显示， 综合监控元素添加
|
2020-06-03 10:12:36 +08:00 |
|
fan
|
750af027b3
|
西安一三调整控制模式转换（综合演练不适用）
|
2020-06-03 10:01:34 +08:00 |
|
fan
|
186fe3e35a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 09:13:45 +08:00 |
|
fan
|
f31cba56f3
|
哈尔滨虚拟信号机关闭调整
|
2020-06-03 09:13:20 +08:00 |
|
joylink_cuiweidong
|
7549203f97
|
综合演练仿真会话代码调整
|
2020-06-02 19:26:36 +08:00 |
|
joylink_cuiweidong
|
34016219dd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-02 18:30:38 +08:00 |
|
joylink_cuiweidong
|
4c38334d2c
|
西安三号线 按计划行车/添加列车 列车列表代码调整
|
2020-06-02 18:30:12 +08:00 |
|