Commit Graph

10781 Commits

Author SHA1 Message Date
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
ec7caeae92 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-10 15:47:10 +08:00
fan
8fb2e6eb66 南京二 故障名称调整 2021-08-10 15:47:00 +08:00
sunzhenyu
230de24156 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-10 14:31:45 +08:00
sunzhenyu
cb8f134353 修改三维设备屏蔽门模型 2021-08-10 14:31:37 +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
ed8a3e8554 调整服务器地址 2021-08-05 18:23:28 +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
4cf49ccd5d 新测试分支服务地址 2021-08-03 14:41:57 +08:00
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