2305 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
joylink_zhangsai	bc2451cc18	Merge remote-tracking branch 'origin/test2' into test2	2021-12-07 15:47:53 +08:00
joylink_zhangsai	2e09968362	修改ZC默认关联的区段筛选bug	2021-12-07 15:47:41 +08:00
xiazengbin	cae20aba53	车辆段加载route path 添加过滤	2021-12-07 15:26:50 +08:00
Jade	2433e7d813	车辆段逻辑	2021-12-07 11:27:48 +08:00
Jade	bac67b2ebf	Merge remote-tracking branch 'origin/test2' into test2	2021-12-07 09:46:03 +08:00
xiazengbin	09b0f92614	优化loadDepotInOutRoutePath	2021-12-07 09:43:15 +08:00
xiazengbin	578d1fd44a	优化loadDepotInOutRoutePath	2021-12-07 09:38:44 +08:00
Jade	a834811cab	Merge remote-tracking branch 'origin/test2' into test2	2021-12-07 09:24:25 +08:00
xiazengbin	b9a550a6a5	优化loadDepotInOutRoutePath	2021-12-07 09:12:32 +08:00
thesai	b9dbb891ce	Merge remote-tracking branch 'origin/test' into test	2021-12-06 21:17:19 +08:00
xiazengbin	76876c6818	Merge remote-tracking branch 'origin/test2' into test2-xzb	2021-12-06 18:18:45 +08:00
xiazengbin	eb56128954	SimulationBuilder.build中实现加载车辆段route path	2021-12-06 18:06:01 +08:00
Jade	7254a02356	车辆段逻辑	2021-12-06 16:15:12 +08:00
joylink_zhangsai	dbc3a62b7f	Merge branch 'dev' into test2	2021-12-06 16:00:15 +08:00
joylink_zhangsai	ac1e32082c	【线路的ZC只有一个】且【ZC没有设置关联区段】时，自动关联全线计轴区段（以前是物理区段）；修改【区段有ZC在工作】的判定为【所属计轴区段有ZC在工作】	2021-12-06 15:52:14 +08:00
joylink_zhangsai	f5c711da90	修改岔心所在计轴区段预复位成功后，预复位状态未清除的bug	2021-12-06 13:22:48 +08:00
joylink_zhangsai	2258062e9a	列车经过【ARB】【进路锁闭】的区段之后，取消进路锁闭	2021-12-06 10:31:53 +08:00
Jade	05e0eedb34	列车加载到车辆段	2021-12-03 17:58:56 +08:00
joylink_zhangsai	d27df770d6	Merge remote-tracking branch 'origin/test' into dev	2021-12-02 13:00:20 +08:00
joylink_zhangsai	09d423a3f4	重启令解实训，背景给车站设置站控；列车经过【ARB】【进路锁闭】的区段之后，取消进路锁闭	2021-12-02 12:59:54 +08:00
Jade	be7e4f7a83	门选零位不给牵引力	2021-12-02 10:25:07 +08:00
joylink_zhangsai	a7acb9929d	Merge remote-tracking branch 'origin/test' into dev	2021-12-01 18:29:49 +08:00
joylink_zhangsai	b054137647	生成实训时，用所属集中站过滤车辆段区段	2021-12-01 18:29:33 +08:00
Jade	2db15a49a4	岔心计轴故障逻辑	2021-12-01 18:28:10 +08:00
joylink_zhangsai	6fafb601d8	修改生成实训时，过滤车辆段区段的逻辑；区段状态增加remain	2021-12-01 14:09:44 +08:00
joylink_zhangsai	00ac703598	ci增加更新道岔预复位状态逻辑（因道岔计轴区段计轴故障预复位恢复后道岔的预复位状态没有清除掉）；增加【进路内区段有占用时，强解进路区段，延时解锁】；进路联锁条件不满足而延时解锁的道岔失表判定条件修改	2021-12-01 13:07:32 +08:00
joylink_zhangsai	5ea4b7af3e	项目域名管理接口修改；生成区段实训时，如果所属计轴区段属于车辆段，跳过	2021-11-30 16:28:53 +08:00
Jade	a5f30e905d	区段 岔心	2021-11-30 14:29:01 +08:00
Jade	d916dc162e	计轴受扰 岔心状态	2021-11-30 10:29:59 +08:00
Jade	63db1a8564	南京二 实训问题处理 岔心占用	2021-11-30 09:46:17 +08:00
joylink_zhangsai	a3d3f86518	Merge remote-tracking branch 'origin/test' into dev	2021-11-29 17:30:50 +08:00
joylink_zhangsai	6c5da045f7	连锁重启操作交出车站控制权	2021-11-29 17:30:30 +08:00
joylink_zhangsai	9839992d0c	Merge branch 'master-huawei' into dev	2021-11-29 17:30:00 +08:00
Jade	8c59338df7	南京二 实训问题处理	2021-11-29 17:09:17 +08:00
Jade	dfcb558cf3	Merge remote-tracking branch 'origin/test' into test	2021-11-29 16:35:11 +08:00
Jade	4705b55aba	南京二 实训问题处理	2021-11-29 16:34:03 +08:00
joylink_zhangsai	aaf7582086	增加扬工院项目	2021-11-29 13:38:31 +08:00
thesai	3eea6a5851	Merge branch 'master-huawei' into test	2021-11-26 13:35:29 +08:00
thesai	fc6683c075	修改道岔故障（可恢复）枚举	2021-11-26 09:32:12 +08:00
thesai	bc2d84dfd0	Merge remote-tracking branch 'origin/test' into test	2021-11-26 09:25:58 +08:00
thesai	b7ea3007da	修改可恢复失表故障为1次恢复	2021-11-26 09:25:46 +08:00
Jade	cbd092b3c6	南京二 实训问题处理 岔心	2021-11-25 17:47:41 +08:00
thesai	b97969ab47	Merge remote-tracking branch 'origin/test' into test	2021-11-25 17:19:50 +08:00
thesai	53726f14fc	补全DeviceFault的注解	2021-11-25 17:19:40 +08:00
Jade	a9dfb2424a	南京二 实训问题处理	2021-11-25 14:53:57 +08:00
Jade	18533b2fbc	南京二 实训问题处理 - 替代信号机	2021-11-25 14:28:38 +08:00
thesai	5ac9c9ca41	Merge remote-tracking branch 'origin/test' into master-huawei	2021-11-25 12:10:47 +08:00
thesai	f7cb5fca15	仿真存储数据结构修改、补全	2021-11-25 10:06:00 +08:00
thesai	39ab1f9c0b	南京操作	2021-11-25 10:05:29 +08:00
Jade	68ebd521d8	南京二 实训问题处理	2021-11-24 10:46:07 +08:00