Commit Graph

5060 Commits

Author SHA1 Message Date
sunzhenyu
3bf766cbe1 test 2020-06-01 12:45:22 +08:00
sunzhenyu
6ea1c7250d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-01 12:30:44 +08:00
sunzhenyu
e7224548b8 修改旧数据三维通信bug,cctv三维逻辑修改 2020-06-01 12:29:30 +08:00
joylink_cuiweidong
d46a2cb784 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-01 11:33:37 +08:00
joylink_cuiweidong
ee9714a705 综合演练仿真聊天代码调整 2020-06-01 11:33:22 +08:00
fan
ab9bf51298 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-01 11:32:30 +08:00
fan
0e4b16182b 调整裁判系统0分显示 2020-06-01 11:32:21 +08:00
joylink_cuiweidong
3012601bf6 综合演练仿真 聊天代码调整 2020-06-01 11:28:04 +08:00
joylink_cuiweidong
46d5e09f7b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-01 11:22:08 +08:00
joylink_cuiweidong
799227f8c4 仿真页面刷新 时间代码调整 2020-06-01 11:21:10 +08:00
fan
119af19522 调整二次按计划行车报错 2020-06-01 10:57:19 +08:00
fan
c2c543503d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-01 10:32:13 +08:00
fan
76990e129e iscs调整 2020-06-01 10:32:02 +08:00
zyy
14e8dfe547 调整道岔组件 2020-06-01 10:27:34 +08:00
zyy
6705d59a26 增加竞赛平台裁判查看理论结果页面 2020-06-01 10:11:09 +08:00
zyy
64ac5beec9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-29 18:26:27 +08:00
zyy
106d217e63 调整导入运行图判断 2020-05-29 18:26:12 +08:00
fan
c395fcbcff Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-29 18:25:01 +08:00
fan
fb40db0ad8 裁判搜索条件调整 2020-05-29 18:24:51 +08:00
joylink_cuiweidong
ba23dbe2b7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-29 18:16:43 +08:00
joylink_cuiweidong
8b23874ea5 综合演练仿真聊天代码调整 2020-05-29 18:15:51 +08:00
zyy
8b3f4de3b7 调整裁判修改分数 2020-05-29 17:58:50 +08:00
fan
0d27ba3d6f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-29 17:55:33 +08:00
fan
eff6615407 西安一三号线道岔失表表示灯状态&裁判分数展示调整 2020-05-29 17:55:22 +08:00
zyy
007802267a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-29 17:50:02 +08:00
zyy
29f027077d 调整考试结果页面接口对接 2020-05-29 17:49:26 +08:00
fan
68675f7759 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-29 17:32:29 +08:00
fan
303632ad20 西安一三号线道岔失表表示灯状态 2020-05-29 17:32:20 +08:00
joylink_cuiweidong
9477a7ddc2 综合演练仿真聊天代码调整 2020-05-29 17:28:40 +08:00
fan
a4924383fa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-29 16:58:11 +08:00
fan
31dd88b426 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-29 16:57:31 +08:00
fan
95e4f4c938 西安一三号线道岔失表调整&iscs调整 2020-05-29 16:57:21 +08:00
joylink_cuiweidong
42cd8a3aec Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-29 16:56:23 +08:00
joylink_cuiweidong
933db5fb50 综合演练 仿真聊天 代码调整 2020-05-29 16:56:02 +08:00
zyy
243a5763bc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-29 16:55:53 +08:00
zyy
16ebf3e013 调整竞赛结果流程,列车放大流程 2020-05-29 16:55:25 +08:00
joylink_cuiweidong
6fe1a0c22b 新版地图绘图 高级数据交路代码调整 2020-05-29 16:23:38 +08:00
joylink_cuiweidong
2fd42c22f9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-29 14:05:03 +08:00
joylink_cuiweidong
7449b6b2a3 综合演练 仿真聊天代码调整 2020-05-29 14:03:43 +08:00
fan
e0b5f1d249 提示调整 2020-05-29 13:02:44 +08:00
fan
2abe815c87 理论考试缓存调整 2020-05-29 11:18:44 +08:00
fan
f21751fcd3 哈尔滨title调整&理论考试缓存调整 2020-05-29 11:08:38 +08:00
fan
e5467af549 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-29 09:20:10 +08:00
fan
97f2b84741 调整小交路颜色 2020-05-29 09:19:59 +08:00
joylink_cuiweidong
edcefeab07 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-29 09:17:16 +08:00
joylink_cuiweidong
8c99f4a3ce 西安一/三号线的侧边栏 代码调整 2020-05-29 09:16:35 +08:00
zyy
3aeb6f85bd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-28 18:48:50 +08:00
zyy
88be776582 调整样式 2020-05-28 18:48:28 +08:00
joylink_cuiweidong
cf6dadf46b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-28 18:39:11 +08:00
joylink_cuiweidong
65569da4cd 西安一/三号线的侧边栏 代码调整 2020-05-28 18:38:49 +08:00