Commit Graph

510 Commits

Author SHA1 Message Date
joylink_cuiweidong
34db1f439f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/utils/baseUrl.js
2020-11-13 10:23:25 +08:00
fan
0f6af4d835 动态列车list数据处理调整 2020-11-10 18:18:48 +08:00
zyy
e897673742 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-06 10:51:12 +08:00
zyy
e792597fd8 调整场景显示 2020-11-06 10:50:58 +08:00
fan
a212984e3d 添加仿真场景加载消息 2020-11-05 17:50:35 +08:00
zyy
5c6ce655d6 增加了报警声音 2020-11-03 13:21:56 +08:00
zyy
6eefe21444 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-03 10:30:43 +08:00
zyy
333c8b2c86 调整福州综合监控故障设置 2020-11-03 10:30:26 +08:00
fan
96ecadce56 实训问题调整 2020-11-02 16:32:08 +08:00
fan
7425506054 报警状态调整 2020-10-30 14:15:00 +08:00
fan
a6fab35450 添加计划车调整 2020-10-29 16:22:19 +08:00
fan
1e745419a5 调整线路报警 2020-10-29 14:42:10 +08:00
joylink_cuiweidong
3003a5eb2a 代码调整 2020-10-28 13:05:13 +08:00
joylink_cuiweidong
3d0acacdd8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-28 10:08:34 +08:00
joylink_cuiweidong
437a6600cd 删除无用的接口 2020-10-28 10:08:18 +08:00
fan
9dc3a4528d merge 2020-10-28 10:00:48 +08:00
fan
2509d11baf 代码调整 2020-10-28 10:00:04 +08:00
joylink_cuiweidong
509d43c834 竞赛 运营统计数据弹窗 初始化问题调整 2020-10-28 09:45:04 +08:00
fan
3bd70345e5 merge 2020-10-27 18:44:14 +08:00
fan
76bbc56825 哈尔滨报警 2020-10-27 18:43:04 +08:00
zyy
aebf120bd8 调整状态删除无用接口 2020-10-27 18:04:19 +08:00
zyy
e9e0d39bfc 调整状态多余代码 2020-10-27 16:51:57 +08:00
joylink_cuiweidong
3ac4945d71 代码调整 2020-10-26 18:41:10 +08:00
fan
e2dbbb5f0b 删除旧版仿真 2020-10-23 18:05:55 +08:00
fan
a952ebeafe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-23 15:13:32 +08:00
fan
2e0c08089c 理论题导入调整&&福州一新版调整&&国赛添加取消限速操作 2020-10-23 15:13:18 +08:00
joylink_cuiweidong
683f73c005 运行图 展示界面 车次号调整 2020-10-22 18:30:02 +08:00
zyy
415486c815 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 13:03:40 +08:00
zyy
8053b51e24 增加iscs事件弹窗 2020-10-22 13:03:26 +08:00
fan
94e626ce49 理论题调整 2020-10-22 09:45:33 +08:00
joylink_cuiweidong
0af48e7887 竞赛 实操 自动播放代码调整 2020-10-20 11:06:41 +08:00
lVAL
dc7a5ab749 增加运行图编辑的功能 2020-10-19 18:39:19 +08:00
zyy
f28262bb72 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-14 19:10:10 +08:00
zyy
4b9a98c35a 调整综合监控流程 2020-10-14 19:09:53 +08:00
lVAL
0010d78570 增加澳大利亚运行图编辑功能 2020-10-14 18:50:03 +08:00
joylink_cuiweidong
936d01fdd1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-12 16:00:12 +08:00
joylink_cuiweidong
cee2b90048 竞赛 场景代码调整 2020-10-12 15:59:28 +08:00
fan
4882234ccd 触发故障调整 2020-10-12 14:25:33 +08:00
fan
e2d27b49c7 方向杆问题调整 2020-10-10 17:58:14 +08:00
joylink_cuiweidong
cbdd8eb810 竞赛平台 运营统计数据提交代码调整 2020-10-09 19:46:54 +08:00
fan
0d31203b74 ibp盘状态处理&时间同步 2020-09-18 14:42:17 +08:00
fan
28e9bf2dae Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-17 15:37:01 +08:00
fan
588f77173a 行调大赛理论考试&福州Iscs 2020-09-17 15:36:46 +08:00
zyy
6eafb7883c 调整道岔绘制流程,ibp鼠标事件 2020-09-17 13:31:13 +08:00
fan
e5d83555af 添加大赛练习 2020-09-16 10:49:16 +08:00
fan
f98242374b 会话调整 2020-09-11 09:26:51 +08:00
fan
ff4072c6da 调整加载动画 2020-09-09 10:28:56 +08:00
zyy
eafc37ce7c 调整流程 2020-09-07 16:40:50 +08:00
zyy
074d4677fe 调整考试系统判断 2020-09-07 13:51:25 +08:00
fan
f33a793435 路由跳转loading 2020-09-07 09:06:28 +08:00