|
|
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 |
|
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 |
|
