Commit Graph

3079 Commits

Author SHA1 Message Date
fan
7e02fa4f1c 行调显示配置自动生成添加车站 && 信号机recover隐藏箭头 2021-09-13 18:14:29 +08:00
fan
a9014d510d 注释systemGraphShape的引入导致的设备类覆盖问题 2021-09-13 13:52:18 +08:00
fan
a9aea1908e outFrame recover状态处理错误调整 2021-09-13 13:45:49 +08:00
fan
6b35126161 Revert "Revert "Revert "显示配置调整"""
This reverts commit 1f17ebc1
2021-09-13 09:56:19 +08:00
fan
2f703ebedb merge 2021-09-13 09:51:22 +08:00
fan
158e8a7d15 显示调整 2021-09-13 09:13:27 +08:00
fan
b130f4ce5b 显示调整 2021-09-13 09:06:50 +08:00
fan
b9e814b53f ISCS状态显示调整 2021-09-10 09:49:54 +08:00
fan
9bad0d61a7 Revert "显示配置调整"
This reverts commit 5e5474ae
2021-09-08 14:40:35 +08:00
fan
d7aec11a91 Revert "显示配置调整"
This reverts commit 8bf3d38f
2021-09-08 14:38:48 +08:00
fan
8bf3d38f95 显示配置调整 2021-09-08 10:30:04 +08:00
fan
abf36ad841 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-06 17:50:01 +08:00
fan
5e5474aee9 显示配置调整 2021-09-06 17:49:44 +08:00
zyy
98c365c448 删除大屏功能注释 2021-09-06 16:18:31 +08:00
zyy
4813ba4783 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-06 16:11:06 +08:00
zyy
ab01e5e99d 增加大屏预览缩放功能 2021-09-06 16:10:27 +08:00
fan
012f2ee8d9 删除操作 设置默认发车轨 2021-09-01 10:03:16 +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
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
46c62a5182 南京二号线 调整 2021-08-20 09:43:58 +08:00
fan
5ca6867294 南京二号线道岔区段延时解锁 闪烁逻辑调整 2021-08-18 16:58:49 +08:00
fan
51cfa55f08 南京二号线道岔区段延时解锁 闪烁不同步调整 2021-08-18 16:15:50 +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
fan
56fa301651 添加故障处理 回库操作 2021-08-12 13:38:59 +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
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
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
3a7c571c6f 西安三号线延续保护显示调整 2021-08-03 10:37:18 +08:00
fan
23ed027def 西安三现地问题: 站控转换和实际不一样 2021-07-30 18:07:44 +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