joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
10,491 Commits 20 Branches 0 Tags 448 MiB
25a9f51dab
Commit Graph

10238 Commits

Author SHA1 Message Date
fan
510c29081b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-20 09:44:10 +08:00
fan
46c62a5182 南京二号线 调整 2021-08-20 09:43:58 +08:00
sunzhenyu
128f00772d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-19 09:39:30 +08:00
sunzhenyu
5cc6aeb092 修改三维驾驶按钮runlevel影响 2021-08-19 09:39:20 +08:00
joylink_cuiweidong
7999dedba1 代码调整 2021-08-18 18:16:56 +08:00
joylink_cuiweidong
e0c073034a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-18 17:37:08 +08:00
joylink_cuiweidong
900ae7ca9f 仿真添加暂停/开始按钮，暂时只管理员可见 2021-08-18 17:36:04 +08:00
fan
5ca6867294 南京二号线道岔区段延时解锁 闪烁逻辑调整 2021-08-18 16:58:49 +08:00
fan
51cfa55f08 南京二号线道岔区段延时解锁 闪烁不同步调整 2021-08-18 16:15:50 +08:00
joylink_cuiweidong
f65e84b5a4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-17 17:48:58 +08:00
joylink_cuiweidong
9f1f985e3d 仿真发生异常，去掉初始化，由用户自行初始化 2021-08-17 17:48:30 +08:00
fan
e07a8ab95f 南京二号线限速值显示调整 2021-08-17 17:43:51 +08:00
fan
d5c79b2ae1 南京二号线操作调整 2021-08-17 16:58:35 +08:00
fan
a4dea11f3b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-17 14:14:37 +08:00
fan
7a71a573f5 南京二号线操作调整 2021-08-17 14:14:22 +08:00
joylink_cuiweidong
1ccf237b6d 西安一号线 运行图导入 添加trackName字段 2021-08-16 14:59:34 +08:00
sunzhenyu
448edcf4b7 修改三维课程中跳跃 2021-08-12 18:03:45 +08:00
sunzhenyu
ddcfcaa465 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-12 17:50:24 +08:00
sunzhenyu
b1e951a2bb 三维课程修改大铁停车场相关内容 2021-08-12 17:50:15 +08:00
fan
2cd974565e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-12 13:39:10 +08:00
fan
56fa301651 添加故障处理 回库操作 2021-08-12 13:38:59 +08:00
sunzhenyu
1674ac32ed Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-12 10:03:47 +08:00
sunzhenyu
7ba34c4f3f 修改三维驾驶列车位置初始化 2021-08-12 10:01:40 +08:00
fan
951eac98d4 南京二 调整 故障模式不弹出 进路操作弹框 2021-08-11 14:39:43 +08:00
fan
9e2c7f67a1 南京二 调整PSL 出现多个的问题 2021-08-11 09:08:29 +08:00
fan
8fb2e6eb66 南京二 故障名称调整 2021-08-10 15:47:00 +08:00
fan
b64065fb5b 西安三 仿真问题反馈表 109 2021-08-09 17:09:11 +08:00
fan
fdf781951b BUG356 南京11站：无法跨联锁区排列进路 2021-08-09 16:42:18 +08:00
fan
0bc72ed589 南京二号线 传输信号机控制权判断调整 2021-08-09 15:21:15 +08:00
fan
e81585b706 南京二号线调整 2021-08-09 09:59:41 +08:00
fan
38f7a7b83e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-06 17:47:37 +08:00
fan
a01ffd71d0 接收登出消息根据token 判断是否登出 2021-08-06 17:47:13 +08:00
sunzhenyu
744544d2a6 修改三维驾驶tms界面逻辑，修改三维课程成绩考试模块 2021-08-06 16:36:33 +08:00
sunzhenyu
bc47132b21 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-06 10:28:59 +08:00
sunzhenyu
69ef5440f7 修改综合演练中数字沙盘显示 2021-08-06 10:28:40 +08:00
fan
486c3afd8c 调整应答器 IB 保存数据 signalCode 2021-08-06 10:24:28 +08:00
fan
8ed470fffa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-05 18:26:18 +08:00
fan
cb128f6f21 超限区段数据 调整 2021-08-05 18:25:58 +08:00
fan
8d0edf3e52 关联超限区段 显示调整 2021-08-05 18:25:43 +08:00
fan
9e6cb0788d IB 应答器 放开关联信号机 2021-08-05 18:25:30 +08:00
fan
fd7df04cc5 站控和强制站控显示调整 2021-08-05 18:25:18 +08:00
fan
693a60d72c 关联超限区段调整 2021-08-05 18:25:01 +08:00
fan
91c31ea155 设置联锁自动触发 灰显调整 2021-08-05 18:24:47 +08:00
fan
c321020325 超限区段 rules 调整 2021-08-05 18:24:34 +08:00
fan
b55f0cc583 进路关联超限区段 2021-08-05 18:24:21 +08:00
fan
88ab2d31f3 Merge remote-tracking branch 'origin/test_conflictRoute' into test 2021-08-05 18:22:16 +08:00
fan
ed42c57f36 添加超限区段调整 2021-08-05 18:17:29 +08:00
fan
5656e77cb2 添加超限区段 2021-08-05 18:17:14 +08:00
sunzhenyu
2f4026f320 修改三维课程界面 2021-08-04 18:14:00 +08:00
fan
69e0e54c6c 保存延续保护和进路 2021-08-03 14:58:13 +08:00
walker-sheng
4b5ff657c9 Merge branch 'test' into test_conflictRoute 
# Conflicts:
#	src/jmapNew/theme/components/menus/dialog/routeHandControl.vue
 2021-08-03 14:33:47 +08:00
fan
c79fc46135 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-03 10:37:33 +08:00
fan
3a7c571c6f 西安三号线延续保护显示调整 2021-08-03 10:37:18 +08:00
sunzhenyu
dd64abb10f 修改三维驾驶和沙盘信号机贴图读取 2021-08-02 11:08:31 +08:00
sunzhenyu
b7819fb259 修改综合演练换车 2021-08-02 10:40:25 +08:00
sunzhenyu
4ad7f3d9d2 修改三维注释 2021-07-30 19:04:16 +08:00
sunzhenyu
049c6f174b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-30 19:02:18 +08:00
sunzhenyu
a31a6288f7 修改三维驾驶面板逻辑 2021-07-30 19:02:10 +08:00
fan
b8d2df5cd8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-30 18:07:57 +08:00
fan
23ed027def 西安三现地问题： 站控转换和实际不一样 2021-07-30 18:07:44 +08:00
sunzhenyu
87f94e2dbe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-30 17:00:11 +08:00
sunzhenyu
bec9e1d8c9 修改三维驾驶面板逻辑 2021-07-30 17:00:05 +08:00
fan
7fc996fe7e 修改PSL的关闭且紧缩图片 2021-07-30 09:45:35 +08:00
fan
50ed4fcae4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-29 17:48:40 +08:00
fan
a1d9b80104 西安三行调问题 74 对于可选的进路应显示出反位保护或定位保护 2021-07-29 17:48:16 +08:00
joylink_cuiweidong
5deb4cc9ab 代码调整 2021-07-29 14:06:25 +08:00
joylink_cuiweidong
62977147c5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-29 11:09:01 +08:00
joylink_cuiweidong
ab96efb1c6 地图绘制 现地配置 增加 可切换显示的车站 字段 2021-07-29 11:08:36 +08:00
sunzhenyu
7b55ce33b8 修改三维驾驶界面 2021-07-29 09:36:57 +08:00
sunzhenyu
a98fa35a45 三维驾驶界面修改 2021-07-28 17:57:42 +08:00
sunzhenyu
4c5c312fb5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-28 17:07:21 +08:00
sunzhenyu
994df74123 升级threejs版本，修改vr参数 2021-07-28 17:07:13 +08:00
fan
11700cb81f 西安三现地问题调整 33 & 39 2021-07-28 10:26:36 +08:00
fan
335e38d1cc 调整计轴故障=》红光带故障 2021-07-28 09:47:59 +08:00
fan
ec0d69c553 调整屏蔽门开关逻辑 2021-07-28 09:39:26 +08:00
fan
90c7335964 调整宁波一号线信号机显示问题 2021-07-27 14:56:28 +08:00
fan
2272d58403 修改列车详细信息显示位置问题 2021-07-27 10:20:35 +08:00
fan
585c3719eb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-26 18:03:15 +08:00
fan
041c94dbb9 添加列车故障 突然EB 2021-07-26 18:02:57 +08:00
sunzhenyu
5d08ecb813 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-26 16:11:20 +08:00
sunzhenyu
da1bc67b5e 修改三维课程控制逻辑，修改三维驾驶界面大小，优化操作 2021-07-26 16:11:15 +08:00
fan
0337658b38 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-26 10:58:33 +08:00
fan
752459c44d 西安三现地问题 24 没有折返标识 2021-07-26 10:57:52 +08:00
joylink_cuiweidong
fd53f8643b 西安三号线问题 菜单下方时间显示有误 修改 2021-07-26 10:49:18 +08:00
fan
1f9482e3da 西安三问题84 正线所有信号机黄灯位显示与实际不符，黄灯位应在上位 2021-07-23 17:47:50 +08:00
joylink_cuiweidong
45e121179b 冲突检测 代码调整 2021-07-22 18:16:05 +08:00
joylink_cuiweidong
234b09863c 冲突检测 代码调整 2021-07-22 17:28:17 +08:00
joylink_cuiweidong
ede14de20b 添加冲突检查状态 图形标识 2021-07-22 16:36:18 +08:00
joylink_cuiweidong
6e45e2c168 代码调整 2021-07-22 14:56:27 +08:00
joylink_cuiweidong
a6e37fc667 去掉断点 2021-07-21 18:02:13 +08:00
joylink_cuiweidong
dfab1da1c6 冲突检测 代码调整 
冲突进路办理确认代码调整
 2021-07-21 17:53:14 +08:00
joylink_cuiweidong
ae28541ae1 西安三 进路交Ats控 冲突检测代码调整 2021-07-20 18:06:22 +08:00
fan
38dbebe6a6 调整西安三设置联锁自动进路条件 2021-07-20 17:58:27 +08:00
fan
c9ce97534a 进路添加批量操作 2021-07-20 13:48:21 +08:00
fan
d0d9d9cc7a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-19 13:20:18 +08:00
fan
cdfe2a9a65 添加联锁配置项 =》 进路联锁不包含站台扣车 routeInterlockDoNotIncludeStandHoldTrain 2021-07-19 13:19:56 +08:00
yuan
c248d1070b 站台故障增加'无关闭锁紧信号', 互锁解除后屏蔽门显示红色 2021-07-16 17:35:46 +08:00
sunzhenyu
91a0d2a574 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-16 14:57:23 +08:00
sunzhenyu
57ea368814 修复三维课程编辑逻辑 2021-07-16 14:57:18 +08:00
fan
2523801dbe 删除列车缺少参数调整 2021-07-16 14:36:18 +08:00