Commit Graph

11066 Commits

Author SHA1 Message Date
fan
1e12edd90e 综合演练停车场显示调整 2021-09-29 13:19:29 +08:00
sunzhenyu
d23143a1cb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-29 13:18:31 +08:00
sunzhenyu
36fee6efda 其他三维相关内容分拆 2021-09-29 13:18:24 +08:00
fan
969a35eec1 列车初始化时 重新解析数据 以清除残留状态 2021-09-29 10:12:49 +08:00
fan
01732b6b9a 修正: 现地显示配置生成权限的时候未生成车站数据 2021-09-29 09:46:25 +08:00
fan
f1b3b9ab8f Merge remote-tracking branch 'origin/test'
# Conflicts:
#	src/scripts/ProjectConfig.js
2021-09-28 18:41:07 +08:00
fan
096e87803d 综合演练列车显示bug调整 2021-09-28 18:16:05 +08:00
fan
8aa97948b6 车辆段联锁工作站 增加初始化 2021-09-28 17:44:25 +08:00
fan
dc2ca8df5a BUG:初始化后切换角色导致列车显示 2021-09-28 15:12:54 +08:00
fan
86be83d612 综合演练车辆段切行调现地显示调整 2021-09-28 13:10:12 +08:00
fan
6786dd92f4 进路预览进路编辑增加 endButtonSignalCode 2021-09-28 11:26:30 +08:00
fan
aedf08b85f 排列进路问题调整 2021-09-28 10:01:48 +08:00
fan
15f5fdf664 综合演练切换车联段停车场后显示调整 2021-09-28 09:42:00 +08:00
fan
673d2e474c 添加信号机类型出段信号机 进段信号机 2021-09-27 16:43:57 +08:00
fan
4225f58d50 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-27 14:38:26 +08:00
fan
d34be1ce8b 修改预选模式 2021-09-27 14:38:11 +08:00
fan
6df79d9ca9 aspect W&B处理 2021-09-27 10:45:08 +08:00
sunzhenyu
64cbe4c857 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-27 10:24:24 +08:00
sunzhenyu
47ec0a8b7d 修改三维驾驶atp按钮,修改屏蔽门不开bug 2021-09-27 10:24:15 +08:00
fan
306bdb7cba 仿真结束清除SimulationUserList 2021-09-26 18:11:13 +08:00
fan
48ea31da91 导出地图取消必选和默认选中&删除调试日志 2021-09-26 17:55:08 +08:00
fan
0928d8cfa9 显示配置中添加信号机位置修正 2021-09-26 17:37:57 +08:00
fan
48d4a7129f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-26 16:02:20 +08:00
fan
c79329cee7 显示配置 select label 调整 2021-09-26 16:02:03 +08:00
sunzhenyu
d07a4029f0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-26 15:01:12 +08:00
sunzhenyu
db908d63a1 修改三維駕駛psl 2021-09-26 15:01:07 +08:00
fan
6ab1c03a24 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-26 14:37:20 +08:00
fan
461a9a9343 取消灯丝故障显示 2021-09-26 14:37:08 +08:00
sunzhenyu
589747ae92 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-26 14:27:44 +08:00
sunzhenyu
c73386766a 修改三维驾驶信息显示,剔除无用方法 2021-09-26 14:27:36 +08:00
fan
302b5db236 BUG396 哈尔滨:无法删除和步进列车 2021-09-26 13:51:34 +08:00
fan
e543b6e357 模型初始值添加 显示方向 showRight 2021-09-26 13:32:08 +08:00
fan
28da81ef1f 批量反向操作提示调整 2021-09-26 13:21:19 +08:00
fan
ab8ff51a0e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-26 13:07:31 +08:00
fan
b0e387edd6 故障枚举值修改 2021-09-26 13:07:16 +08:00
sunzhenyu
bf8631c521 修改三维驾驶消息加边框,按钮和后端同步,ato亮灯规则修改 2021-09-26 11:21:00 +08:00
sunzhenyu
7b5f4de1bd 修改三维驾驶亮灯 2021-09-26 09:52:54 +08:00
sunzhenyu
577828dd6f 三维驾驶按钮样式调整 2021-09-24 17:39:37 +08:00
sunzhenyu
8ff4f20e06 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-24 17:20:21 +08:00
sunzhenyu
41536232f6 增加三维驾驶psl 2021-09-24 17:20:15 +08:00
fan
18cf41f555 merge 2021-09-24 16:51:25 +08:00
fan
5c9cd85d52 显示配置调整 2021-09-24 16:49:57 +08:00
sunzhenyu
93ca66674c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-24 16:29:22 +08:00
sunzhenyu
5d01ca21b4 修改三维驾驶操作 2021-09-24 16:29:12 +08:00
fan
549079fbdb 增加批量反向操作(区段左右关联关系信号机运行方向反向), 信号机批量设置显示方向,新增信号机显示方向字段showRight 2021-09-24 15:05:50 +08:00
sunzhenyu
8e34f93a9d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-24 10:04:14 +08:00
sunzhenyu
f9ed9cca22 修改三维列车驾驶 2021-09-24 10:04:05 +08:00
fan
f5b2fcbacc 西安三道岔操作名称调整 2021-09-22 13:57:24 +08:00
fan
e0abfe2798 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-22 10:12:30 +08:00
fan
19a6663762 添加信号机型号 黄红白(列车兼调车信号机) 2021-09-22 10:12:15 +08:00