|
|
fa3a17c63e
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-19 17:02:30 +08:00 |
|
|
|
3742523aee
|
实现<强扳道岔>操作；进路正常解锁道岔时，添加<尝试解锁联动道岔和计轴关联道岔>逻辑
|
2021-01-19 17:01:34 +08:00 |
|
|
|
d6a5120ccb
|
去掉<进路关联屏蔽门开门时关闭始端信号机>的逻辑
|
2021-01-19 14:34:17 +08:00 |
|
|
|
a60106dedc
|
屏蔽门关门去掉对信号机状态的检查
|
2021-01-19 13:32:25 +08:00 |
|
|
|
f0b8778bfb
|
去掉进路办理时对非CBTC进路的延续保护锁闭状态检查；添加<取消设置>操作；添加<传输信号机>绘图数据
|
2021-01-19 11:19:24 +08:00 |
|
|
|
25e16b83ea
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-19 10:37:07 +08:00 |
|
|
|
c2e1bca38c
|
ATS出库和折返进路触发问题修改
|
2021-01-19 10:36:48 +08:00 |
|
|
|
3b99e3f5ea
|
恢复并修改<进路经过的站台轨所属的站台的屏蔽门未关闭时，关闭信号机>为非CBTC级别下检查
|
2021-01-18 17:24:06 +08:00 |
|
|
|
ad529992af
|
信号机添加<所属车站>绘图属性；交出控制权添加<控制权所属校验>
|
2021-01-18 16:22:19 +08:00 |
|
|
|
35409a3901
|
进路封锁操作，取消<进路锁闭的区段不处理>的逻辑
|
2021-01-18 13:38:37 +08:00 |
|
|
|
426ae9f775
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-15 18:40:11 +08:00 |
|
|
|
843e2c94a5
|
联锁生成逻辑在生成侧防时，进路道岔生成bug修改
仿真（西门子）联锁逻辑完善，和调试
|
2021-01-15 18:39:57 +08:00 |
|
DU
|
1f82cf3deb
|
应答器逻辑补充
|
2021-01-15 17:06:58 +08:00 |
|
|
|
cfe95ad538
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-15 13:00:09 +08:00 |
|
DU
|
d399df63de
|
岔心校验bug
|
2021-01-15 11:11:24 +08:00 |
|
|
|
d65a01fcd9
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-15 11:04:42 +08:00 |
|
DU
|
413a025023
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-01-15 10:40:56 +08:00 |
|
DU
|
6b03677e54
|
岔心 应答器数据对象，应答器逻辑未完
|
2021-01-15 10:39:46 +08:00 |
|
|
|
45c349dff8
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-15 09:59:27 +08:00 |
|
|
|
1567647be2
|
微信支付
|
2021-01-15 09:59:01 +08:00 |
|
|
|
f29fadfbc6
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-14 19:07:51 +08:00 |
|
|
|
eeeec1db01
|
联锁侧防数据生成、保存、仿真构建流程调试修改
联锁进路控制添加侧防逻辑（延续保护侧防逻辑还没有加），触发区段使用逻辑区段
联锁进路信号机添加 "级别" 概念和逻辑
|
2021-01-14 19:07:32 +08:00 |
|
|
|
8eb906de23
|
联锁侧防数据生成、保存、仿真构建
|
2021-01-13 18:42:17 +08:00 |
|
DU
|
13f5dd8142
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-01-13 10:41:49 +08:00 |
|
DU
|
8f4d4cd9ea
|
地图草稿添加岔心 应答器；
点赞数据推送修db改
|
2021-01-13 10:41:26 +08:00 |
|
|
|
ca313ad48c
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-12 23:53:15 +08:00 |
|
|
|
edcdca23c5
|
添加侧防生成逻辑
|
2021-01-12 23:52:58 +08:00 |
|
|
|
0faa785f90
|
创建考试时的权限校验逻辑修改
|
2021-01-12 20:47:35 +08:00 |
|
DU
|
02078eb039
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-01-12 18:52:03 +08:00 |
|
DU
|
37c0cee2ae
|
考试创建同规则删除
|
2021-01-12 18:51:53 +08:00 |
|
|
|
4c23708d14
|
添加考试的权限校验
|
2021-01-12 18:12:50 +08:00 |
|
|
|
62739021be
|
仿真权限校验bug修改
|
2021-01-12 16:12:38 +08:00 |
|
|
|
73e2c91939
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-12 14:58:16 +08:00 |
|
|
|
2e77fd784c
|
仿真修改权限校验逻辑
|
2021-01-12 14:58:08 +08:00 |
|
DU
|
5a04c4df6d
|
贵装备数据 表间迁移
|
2021-01-12 14:13:38 +08:00 |
|
DU
|
ca4caa64f9
|
单位增加关联项目code
|
2021-01-12 14:02:32 +08:00 |
|
DU
|
e0c23c1e2c
|
删除考试代码bug
|
2021-01-12 13:34:10 +08:00 |
|
DU
|
15d4702873
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-01-12 11:45:03 +08:00 |
|
DU
|
015adfcc95
|
教学相关修改
|
2021-01-12 11:44:35 +08:00 |
|
|
|
92a2d39318
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-11 20:09:59 +08:00 |
|
|
|
b6c1672542
|
列车移动曲线计算兼容逻辑区段限速
|
2021-01-11 20:09:52 +08:00 |
|
DU
|
ec6cb89ce0
|
教学bug
|
2021-01-11 20:02:12 +08:00 |
|
DU
|
d72beb1e93
|
Merge remote-tracking branch 'origin/test' into test1
|
2021-01-11 17:37:49 +08:00 |
|
DU
|
d0284659d8
|
课程考试关联班级修改
|
2021-01-11 17:32:24 +08:00 |
|
DU
|
a584304f21
|
Revert "Revert "删除表sql""
This reverts commit eaa5d94b
|
2021-01-11 17:32:01 +08:00 |
|
DU
|
d0907a8d06
|
Revert "Revert "默认课程考试不分是否所属单位始终展示""
This reverts commit 537d2a68
|
2021-01-11 17:31:48 +08:00 |
|
DU
|
88c79ab763
|
Revert "Revert "单位部门成员数据管理关联课程考试""
This reverts commit f9a541f4
|
2021-01-11 17:31:28 +08:00 |
|
|
|
4f950543dd
|
用戶连接司机视角后发送一次列车完整hmi数据，否则第一次进司机视角列车状态显示不正确
|
2021-01-11 16:37:42 +08:00 |
|
|
|
2618913522
|
修改<从发布地图新建草稿没有复制目的地码数据>bug
|
2021-01-11 11:27:28 +08:00 |
|
|
|
f5f8df1e28
|
苏电院初始化时关闭响铃
|
2021-01-10 20:35:40 +08:00 |
|
