Commit Graph

466 Commits

Author SHA1 Message Date
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
joylink_cuiweidong
b42ffaa00f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-01 18:27:56 +08:00
joylink_cuiweidong
de8263e062 剧本编制代码优化调整 2020-09-01 18:27:36 +08:00
zyy
a3489f0942 调整区段显示及优化 2020-09-01 18:09:25 +08:00
zyy
57cb96eb48 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/views/newMap/mapsystemNew/common/index.vue
2020-09-01 15:11:59 +08:00
zyy
5590e43bd5 调整代码 2020-09-01 15:10:35 +08:00
fan
d8c4bee674 考试加载进度条恢复 2020-08-31 14:14:45 +08:00
joylink_cuiweidong
8027bc90ae 宁波福州佛山默认不显示道岔区段的名称调整 2020-08-31 10:13:26 +08:00
fan
818010b18f 调度大赛调整 2020-08-28 17:57:42 +08:00
joylink_cuiweidong
3ffffffe8d 宁波一号线实训调整
剧本编制代码调整
2020-08-28 14:43:30 +08:00
zyy
ae9f9a962b 调整加载代码 2020-08-27 18:41:33 +08:00
zyy
47a9d56d3b 删除配置 2020-08-27 17:04:21 +08:00
fan
08a33ae6aa 项目登录虚拟ibp调整 2020-08-26 17:09:55 +08:00
zyy
6afae4e1bc 调整西安二号线排列进路操作 2020-08-24 16:00:00 +08:00
joylink_cuiweidong
c3675a0bd4 剧本仿真代码调整 2020-08-21 15:41:46 +08:00
joylink_cuiweidong
e699efc06f 剧本录制预览代码调整 2020-08-21 14:16:44 +08:00
joylink_cuiweidong
66587a17fb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-20 20:28:12 +08:00
joylink_cuiweidong
171353a4d3 仿真 剧本代码调整 2020-08-20 20:27:19 +08:00
fan
a44132056c 地图绘制添加防淹门 2020-08-20 13:17:58 +08:00
joylink_cuiweidong
c5a63cd1c1 代码调整 2020-08-17 19:11:59 +08:00
joylink_cuiweidong
cb916647c5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-17 18:48:46 +08:00
joylink_cuiweidong
c7bd321446 剧本录制代码调整 2020-08-17 18:47:38 +08:00
fan
19b4b48c3f merge 2020-08-17 18:16:31 +08:00
fan
6008dfc143 运行图调整 2020-08-17 18:12:51 +08:00
joylink_cuiweidong
c8ecd5bcb5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/views/newMap/displayNew/menuSchema.vue
2020-08-17 13:28:15 +08:00
joylink_cuiweidong
9080e14e2a 剧本预览编制代码调整 2020-08-17 13:21:27 +08:00
fan
44e05a0875 哈尔滨设备编辑运行图 2020-08-14 18:30:04 +08:00
zyy
3132b982fb 调整延时保护计时逻辑 2020-08-14 10:49:11 +08:00
joylink_cuiweidong
60b07ef132 剧本编制控制权转移代码还原 2020-08-13 10:46:26 +08:00
joylink_cuiweidong
8fd00b3493 剧本录制控制权转移代码调整 2020-08-12 17:34:37 +08:00
joylink_cuiweidong
1895dc42b0 西安三号线控制权转移代码调整 2020-08-07 17:13:12 +08:00
joylink_cuiweidong
e2a7f160cb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/jmapNew/shape/Station/index.js
2020-08-07 13:23:08 +08:00
joylink_cuiweidong
e08dcd9c8d 宁波一号线控制权转移代码调整
综合演练页面 后退退出房间
2020-08-07 13:17:09 +08:00
fan
cf503299fd 保留stations数据不清除 2020-08-07 10:29:18 +08:00
joylink_cuiweidong
abb0143988 控制权转移代码调整 2020-08-06 19:34:13 +08:00
fan
aea8dc7eca 清理多余状态 2020-08-05 15:12:40 +08:00