Commit Graph

10461 Commits

Author SHA1 Message Date
fan
63b1c572d6 iscs调整 2021-09-03 14:46:22 +08:00
fan
b9c03b591d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-02 16:48:02 +08:00
fan
ac67ca762a 添加中航锐创(实验室登录) 2021-09-02 16:47:48 +08:00
joylink_cuiweidong
284e051ef7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-01 10:56:33 +08:00
joylink_cuiweidong
197f560437 地图绘制 区段绘制 添加 向左延伸方式 2021-09-01 10:56:04 +08:00
fan
012f2ee8d9 删除操作 设置默认发车轨 2021-09-01 10:03:16 +08:00
fan
91be7c3a83 atr调整 2021-09-01 10:01:42 +08:00
fan
5bc819af6d 关闭南京二新版入口 2021-08-31 10:31:01 +08:00
fan
5e81b002e1 西安三添加操作 设置默认发车轨 (问题调整) 2021-08-31 09:53:58 +08:00
fan
33b2c3cb43 西安三添加操作 设置默认发车轨 2021-08-31 09:28:34 +08:00
fan
99e4db9529 西安问题调整BUG125 道岔定位失表,反位表示时道岔故障灯不红闪 2021-08-30 15:45:53 +08:00
fan
0ce7e458b7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-30 15:20:32 +08:00
fan
24a887e7e8 南京二号线调整=》atr 2021-08-30 15:20:15 +08:00
sunzhenyu
babbbc68cf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-27 18:06:17 +08:00
sunzhenyu
bdb734a5e4 修改三维课程编辑界面逻辑,增加三维驾驶设备柜 2021-08-27 18:06:08 +08:00
joylink_cuiweidong
88c327698f 地图绘制 添加 信号机设备里 信号机型号(signalModel) 字段
更改 进路编辑里 信号是否开放绿灯字段 为 信号显示(aspect) 字段
2021-08-27 10:17:13 +08:00
zyy
455e102696 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-25 11:09:58 +08:00
zyy
178e2aa4a9 调整运行图加载优化 2021-08-25 11:09:38 +08:00
fan
d6659506f7 西安三号线 通信车占用=》粉光带故障 2021-08-24 16:55:24 +08:00
fan
8182e2966c 添加线路配置routeDefaultCheckConflict=》进路默认开启冲突检测 2021-08-24 15:06:11 +08:00
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
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