Commit Graph

1073 Commits

Author SHA1 Message Date
0bc894d2b9 Merge remote-tracking branch 'origin/test' into master-huawei 2020-12-30 09:18:32 +08:00
8161216321 Merge remote-tracking branch 'origin/test' into test 2020-12-30 09:17:37 +08:00
1745fcd5e0 修改邮件发送问题 2020-12-30 09:17:22 +08:00
DU
070dd06805 Merge remote-tracking branch 'origin/test' into test 2020-12-30 09:04:24 +08:00
2e2d58d992 Merge remote-tracking branch 'origin/test' into master-huawei 2020-12-29 18:39:20 +08:00
3d7fd9a5c2 抽象仿真,重构 2020-12-29 18:34:10 +08:00
07252b5fea 修改小程序access_token获取 2020-12-29 18:30:50 +08:00
DU
c9c4c20da9 修改运行图绘制bug 2020-12-29 18:19:59 +08:00
d50431919c ISCS复制接口修改 2020-12-29 17:08:43 +08:00
78e222b297 实训生成bug修改 2020-12-29 13:59:18 +08:00
a5326da09c Merge remote-tracking branch 'origin/test' into test 2020-12-29 10:31:40 +08:00
3b811d1d40 发布的ibp、iscs数据管理;ibp紧急停车bug修改 2020-12-29 10:31:24 +08:00
b4c3e458f0 Merge remote-tracking branch 'origin/test' into test 2020-12-28 14:33:56 +08:00
34fc686f4d 仿真列车出库时间调整为提前5分钟
列车折返进路办理添加是否存在冲突出库计划判断
2020-12-28 14:33:35 +08:00
7a45660493 Merge remote-tracking branch 'origin/test' into test 2020-12-28 13:58:20 +08:00
2fb256cf0e ibp紧急停车按钮逻辑 2020-12-28 13:58:00 +08:00
DU
a8e2e0afaf 宁波三-两运行图导入修改;
指令定义分页查询增加仿真角色条件
2020-12-25 14:27:30 +08:00
f8abb9eddc 代码格式化 2020-12-25 09:01:43 +08:00
db657689bf Merge remote-tracking branch 'origin/test' into test 2020-12-24 18:46:16 +08:00
9360fd5020 实训生成后原有课程恢复 2020-12-24 18:45:57 +08:00
DU
34f6cb7deb 宁波三运行图导入-工作日+双休日 (待测) 2020-12-24 18:28:55 +08:00
DU
8f748e6323 用户交路定义增加生成通用路径, 2020-12-23 19:04:01 +08:00
DU
ea7eb75078 运行图检查错误提示修改 2020-12-23 16:01:10 +08:00
DU
660a42ffe0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test 2020-12-23 15:12:17 +08:00
DU
cc5fd83f60 运行图生成防止时间跨过次日凌晨2点 2020-12-23 15:11:05 +08:00
c61ac54e2b Merge remote-tracking branch 'origin/test' into test 2020-12-23 09:13:32 +08:00
aab1348b33 商品更新bug修改 2020-12-22 18:19:43 +08:00
DU
0c343028b2 添加清空运行图车次数据 2020-12-22 16:31:14 +08:00
DU
284aeadb67 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test 2020-12-22 15:11:48 +08:00
DU
a56448403d 平移单个服务计划 2020-12-22 15:11:35 +08:00
6c5713bfda 删除<RM模式下触发EB不生效>逻辑 2020-12-22 14:21:07 +08:00
ac22b5c8c7 列车添加<控制杆拉到快速制动位可以缓解信号EB>逻辑 2020-12-22 14:13:21 +08:00
52d0218305 留言板管理增加编辑功能 2020-12-22 13:47:37 +08:00
01b39f4129 运行至前方站步骤参数修改 2020-12-22 13:25:52 +08:00
730e245985 Merge remote-tracking branch 'origin/test' into test 2020-12-22 13:21:24 +08:00
da35d772bd zc故障不停车bug修改;运行至前方站指令流程修改 2020-12-22 13:20:46 +08:00
DU
1a7deb1c0c 仿真操作异常添加提示 2020-12-22 10:55:21 +08:00
fbd2d01e07 Merge remote-tracking branch 'origin/test' into test 2020-12-21 22:27:02 +08:00
794d8a0a0a 联锁机故障取消逻辑调整(哈尔滨) 2020-12-21 22:24:56 +08:00
3dd75b34c2 Merge remote-tracking branch 'origin/test' into test 2020-12-21 22:15:26 +08:00
e3cee9cfbe 联锁机故障(哈尔滨) 2020-12-21 22:14:43 +08:00
57809890c8 办理过的进路不再办理 2020-12-21 19:01:02 +08:00
7e9ec11e76 Merge remote-tracking branch 'origin/test' into test 2020-12-21 18:41:57 +08:00
e7114802cb Merge remote-tracking branch 'origin/test' into test 2020-12-21 17:59:56 +08:00
5ea8b122eb ATS进路排列逻辑,已经或正在排列的进路不再重复排列 2020-12-21 17:59:42 +08:00
daf2d16cb7 仿真背景增加字段 2020-12-21 16:55:03 +08:00
DU
4353dd014e 导入运行图异常断言bug修复 2020-12-21 13:04:35 +08:00
DU
301ed565d1 个人停站时间数据判重逻辑修改 2020-12-21 09:16:18 +08:00
ab8fa3c3c0 修改华为正式数据库路径配置 2020-12-20 10:55:09 +08:00
c36f7ab639 调整查询进路路径计算逻辑
修改列车站台控制逻辑兼容无出站信号机站台
修改其他发现bug
2020-12-19 22:29:44 +08:00