Commit Graph

1932 Commits

Author SHA1 Message Date
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
joylink_cuiweidong
ab96efb1c6 地图绘制 现地配置 增加 可切换显示的车站 字段 2021-07-29 11:08:36 +08:00
fan
041c94dbb9 添加列车故障 突然EB 2021-07-26 18:02:57 +08:00
joylink_cuiweidong
6e45e2c168 代码调整 2021-07-22 14:56:27 +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
2523801dbe 删除列车缺少参数调整 2021-07-16 14:36:18 +08:00
yuan
a641b51505 xa3-修改列车识别号bugfix 2021-07-09 10:30:51 +08:00
fan
acba981209 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-08 15:48:21 +08:00
fan
af3f6fcbc8 TS强转站控密码为12,仿真系统为123456 2021-07-08 15:48:03 +08:00
yuan
cd3eb07730 PSL增加锁紧指示灯 2021-07-08 14:08:33 +08:00
yuan
67fe7b6774 xa3_头码车识别号校验修改 2021-07-08 11:15:04 +08:00
joylink_cuiweidong
52005bb913 删除计划车bug修改(bug335) 2021-07-06 09:51:08 +08:00
joylink_cuiweidong
a39996e457 福州一号线 运行图 加线抽线
去除 西安三 运行图 加线抽线
2021-07-02 16:45:51 +08:00
joylink_cuiweidong
4e2b07829c 西安三号线 运行图 加线抽线功能 添加 2021-07-02 13:44:21 +08:00
joylink_cuiweidong
49812887fc Merge branch 'test' into test_cx
# Conflicts:
#	src/jmapNew/theme/xian_01/menus/menuBar.vue
2021-07-01 10:34:28 +08:00
yuan
29730c2803 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_jhc 2021-07-01 10:15:55 +08:00
joylink_cuiweidong
87095b4f4e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/store/modules/runplan.js
2021-07-01 10:09:23 +08:00
joylink_cuiweidong
c7e75739c3 西安三加线逻辑调整 2021-07-01 10:06:35 +08:00
fan
5954a01554 西安三号线添加设头码车车次编号限制 2021-06-30 16:33:35 +08:00
fan
ae59cdac36 西安三设置头码车时不根据车次号搜索列车信息 2021-06-30 16:11:16 +08:00
fan
9a352c50fa 调整折返策略回显 2021-06-30 15:28:59 +08:00
fan
3992310427 修改折返默认值 2021-06-29 15:07:11 +08:00
fan
6cee614d56 更换折返方式枚举 2021-06-29 14:03:58 +08:00
fan
faf5383c5f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-29 13:54:04 +08:00
fan
53041725ac 更换折返方式枚举 2021-06-29 13:53:39 +08:00
joylink_cuiweidong
835e638a31 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-29 10:33:32 +08:00
joylink_cuiweidong
94102b6c98 第三方登陆代码调整 2021-06-29 10:33:09 +08:00
fan
cae193b929 Bug327 西安三:道岔计轴区段无法设置ARB橙光带故障 2021-06-29 10:23:36 +08:00
fan
e0f672cb7d 西安三列车故障处理添加连挂操作 2021-06-28 15:28:33 +08:00
fan
1c2037f9e4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-28 14:55:30 +08:00
fan
e6f479379b 列车限速区间选择5-65 2021-06-28 14:55:18 +08:00
yuan
7514ff3270 bugfix-xa3-048 修改列车识别号字段显示错误 2021-06-28 10:40:35 +08:00
yuan
0c219aff71 抽线 2021-06-25 15:34:51 +08:00
yuan
51a0ebd5fe 抽线 2021-06-25 15:34:35 +08:00
joylink_cuiweidong
a6d01035dd 成都三,福州一实训 说明修改 2021-06-22 10:14:39 +08:00
joylink_cuiweidong
14da4cbc2b 成都三号线 实训说明调整 2021-06-21 16:49:13 +08:00
joylink_cuiweidong
22af8c1af7 西安二号线 宁波三号线 实训说明修改 2021-06-21 14:13:00 +08:00