Commit Graph

425 Commits

Author SHA1 Message Date
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
fan
968d588914 撤销未完仿真状态管理 2020-08-05 13:23:45 +08:00
zyy
e852eb95db 调整流程 2020-08-05 13:14:30 +08:00
fan
9cc130e737 仿真状态处理暂存 2020-08-05 09:05:26 +08:00
fan
fb64429ee8 调整综合仿真开始状态管理 2020-08-04 14:17:47 +08:00
fan
57aabfc973 还原over中switchcount 2020-08-04 14:01:43 +08:00
fan
f645433696 调整运行图加载方式 2020-08-04 10:03:06 +08:00
fan
cb7b03adbe 加载运行图数据失败调整 2020-08-03 18:45:24 +08:00
fan
42d850de66 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-08-03 15:27:26 +08:00
fan
8b5e94755c 加载运行图数据失表问题修复&添加新角色同步公共会话成员 2020-08-03 15:27:14 +08:00
joylink_cuiweidong
f0d0c96f44 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 10:54:01 +08:00
joylink_cuiweidong
56b6c422f9 新版地图课程考试计时代码调整 2020-08-03 10:53:44 +08:00
fan
94f70eea65 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-08-03 10:02:24 +08:00
fan
d1a5669999 运行图预览初始化调整 2020-08-03 10:02:12 +08:00
zyy
b1fb2a12dc 调整样式 2020-08-03 09:53:34 +08:00
fan
517270b2f2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-07-31 18:57:46 +08:00
fan
3215bec260 运行图调整 2020-07-31 18:57:27 +08:00
zyy
fb9e8f0325 调整地图样式及加载逻辑 2020-07-31 18:49:35 +08:00
zyy
e2c32f2e68 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-31 16:22:43 +08:00
zyy
70114a0014 调整宁波线路操作 2020-07-31 16:22:29 +08:00
joylink_cuiweidong
ff912ff0f5 宁波一号线 运行图预览加点选 2020-07-31 16:03:32 +08:00
zyy
f1d72d0968 调整综合演练流程 2020-07-30 18:42:41 +08:00
zyy
e4c20b1bf8 调整老版地图绘制文件位置 2020-07-30 17:49:20 +08:00
fan
c15860b104 代码调整 2020-07-30 13:43:00 +08:00
fan
f13ba95407 宁波菜单回车快捷键(区段、信号机、车站)&设备登录综合演练不显示cctv视图设备视图三维视图&会话切换公共调整 2020-07-28 18:28:31 +08:00
fan
0ad13f9fe8 宁波菜单弹框回车快捷键 2020-07-28 16:28:55 +08:00
zyy
42d9906550 调整地图加载多余配置,增加宁波右键列车新指令 2020-07-27 18:04:47 +08:00
fan
a9233a082e 代码调整 2020-07-23 17:57:35 +08:00
joylink_cuiweidong
597822430e 剧本预览代码调整 2020-07-22 17:20:24 +08:00
zyy
ed9815393a 调整线路列车右键操作 2020-07-21 15:11:33 +08:00
joylink_cuiweidong
a5df03f7c7 退出登陆 断开socket连接 2020-07-16 13:22:33 +08:00
joylink_cuiweidong
28261153df Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 16:52:52 +08:00
joylink_cuiweidong
8d41a5d730 剧本发布暂时去掉了审核
socket断线重连代码调整
2020-07-14 16:51:22 +08:00
sunzhenyu
9352cac2b3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 15:03:38 +08:00
sunzhenyu
54a773aa84 修改录制三维驾驶托管模块 2020-07-14 15:03:31 +08:00
zyy
8fb216dbae 增加项目中设备管理页面 2020-07-14 13:27:00 +08:00
sunzhenyu
006fd8f0a3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 09:25:11 +08:00
sunzhenyu
f1cab6fba3 test 2020-07-14 09:24:58 +08:00
fan
0ca0153c60 旧地图综合演练调整 2020-07-13 14:34:56 +08:00
joylink_cuiweidong
57125367fc 剧本编制与剧本预览代码调整 2020-07-13 10:15:44 +08:00
joylink_cuiweidong
bf7ae6684e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 17:33:55 +08:00
joylink_cuiweidong
fe3ca3af2f 剧本编制代码调整 2020-07-10 17:33:37 +08:00