Commit Graph

1546 Commits

Author SHA1 Message Date
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
cbde7f7e40 苏电院真实设备逻辑修改 2021-01-10 16:23:31 +08:00
f9a541f492 Revert "单位部门成员数据管理关联课程考试"
This reverts commit c6f0df8b
2021-01-09 20:16:18 +08:00
537d2a68f5 Revert "默认课程考试不分是否所属单位始终展示"
This reverts commit 5d65b4d5
2021-01-09 20:15:50 +08:00
eaa5d94be5 Revert "删除表sql"
This reverts commit 23e3820e
2021-01-09 20:15:22 +08:00
6caf775a8e Merge remote-tracking branch 'origin/test' into master-huawei 2021-01-09 19:51:21 +08:00
1d3409fb45 苏电院修改响铃时长 2021-01-09 19:47:54 +08:00
f49d344553 Merge remote-tracking branch 'origin/test' into test 2021-01-09 19:26:57 +08:00
88de80d11b 苏电院真实设备逻辑修改 2021-01-09 19:26:41 +08:00
DU
23e3820e00 删除表sql 2021-01-08 18:12:25 +08:00
DU
5d65b4d50d 默认课程考试不分是否所属单位始终展示 2021-01-08 18:09:47 +08:00
DU
c6f0df8b18 单位部门成员数据管理关联课程考试 2021-01-08 18:00:51 +08:00
fdd51383f4 Merge remote-tracking branch 'origin/test' into test 2021-01-08 15:32:06 +08:00
DU
8b64fde956 仿真会话bug修复 2021-01-07 19:33:01 +08:00
DU
61f2003f27 Merge remote-tracking branch 'origin/test' into test 2021-01-07 09:28:04 +08:00
DU
0ceee901a6 iscs加数据判断接口,车站实训生成背景更换,自动故障列车到达区段条件修改 2021-01-07 09:15:14 +08:00
39482d6b1d 苏电院屏蔽门调试 2021-01-05 17:47:55 +08:00
fa376fdfa3 Merge branch 'test' into restruct 2021-01-04 18:23:51 +08:00
c94ad846ce 仿真真实设备模拟逻辑开发 2021-01-04 18:22:14 +08:00