DU
|
80349d14c0
|
Revert "Revert "删除表sql""
语音识别改用百度接口
|
2021-04-12 11:02:42 +08:00 |
|
|
|
cc0a01aebb
|
Revert "Revert "改用华为语音识别服务""
This reverts commit bec904c7
|
2021-04-12 10:11:10 +08:00 |
|
|
|
249c8c1eb7
|
Merge remote-tracking branch 'origin/test' into test
|
2021-04-09 18:24:48 +08:00 |
|
|
|
5485c27c3b
|
泰雷兹操作调试
|
2021-04-09 18:24:39 +08:00 |
|
DU
|
b5e3e5d2e5
|
宁波三导入修改
|
2021-04-09 11:05:09 +08:00 |
|
DU
|
bf109450e5
|
运行图校验修改 宁波三导入备车变更车次回库外加一个服务车次
|
2021-04-09 10:23:00 +08:00 |
|
DU
|
6aee4ce7e9
|
运行图中间出库调整
|
2021-04-08 16:39:44 +08:00 |
|
DU
|
34b5be2c29
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-04-07 18:27:27 +08:00 |
|
DU
|
f242c3ca26
|
运行图出库首站/入库末站在环路上，校验增加出入库，编辑操作去掉出入库设置
|
2021-04-07 18:27:19 +08:00 |
|
|
|
6e06be24fe
|
Merge remote-tracking branch 'origin/test' into test
|
2021-04-07 17:59:31 +08:00 |
|
|
|
2a28c4f48e
|
转换轨列车不发车bug修改
|
2021-04-07 17:58:54 +08:00 |
|
DU
|
d0e68bf84e
|
校验修改
|
2021-04-06 19:40:38 +08:00 |
|
DU
|
c9c491848b
|
校验修改
|
2021-04-06 19:18:32 +08:00 |
|
DU
|
d81ec9f650
|
修改运行图校验
|
2021-04-06 18:46:56 +08:00 |
|
DU
|
34e1388120
|
运行图生成
|
2021-04-06 18:16:32 +08:00 |
|
DU
|
3cc7c1c548
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-04-06 18:14:32 +08:00 |
|
DU
|
1fa4451a2d
|
运行图校验
|
2021-04-06 18:14:20 +08:00 |
|
|
|
2bad6177d1
|
Merge remote-tracking branch 'origin/test' into test
|
2021-04-06 13:38:21 +08:00 |
|
|
|
59891464a1
|
更新地图版本时不再生成默认交路
|
2021-04-06 13:38:06 +08:00 |
|
|
|
9f2d67de6a
|
Merge remote-tracking branch 'origin/test' into test
|
2021-04-02 19:41:48 +08:00 |
|
|
|
6798b74964
|
侧防锁闭逻辑bug修改
新仿真逻辑——CI功能开发
|
2021-04-02 19:41:34 +08:00 |
|
|
|
8d3cfc90ba
|
移动授权计算bug修改
|
2021-04-02 18:54:47 +08:00 |
|
|
|
28f992fb7c
|
Merge remote-tracking branch 'origin/test' into test
|
2021-04-02 18:07:17 +08:00 |
|
|
|
9ef0bb210d
|
屏蔽门关门后，如果线路选择了自动调整运行，延时6秒发车
|
2021-04-02 18:07:04 +08:00 |
|
|
|
a166f3e4be
|
侧防锁闭逻辑问题修改
|
2021-04-02 17:07:03 +08:00 |
|
|
|
5965385be5
|
联锁进路信号机级别、重复封锁、开放进路后联锁条件检查等流程修改
|
2021-04-02 16:23:12 +08:00 |
|
|
|
2f0e64a231
|
Merge remote-tracking branch 'origin/test' into test
|
2021-04-02 16:19:41 +08:00 |
|
|
|
04a49c1f2d
|
补充真实设备的故障状态重置
|
2021-04-02 16:19:32 +08:00 |
|
|
|
6c247db987
|
三维课程数据接口bug修改
|
2021-04-02 15:34:56 +08:00 |
|
|
|
085383bb5f
|
三维课程数据接口bug修改
|
2021-04-02 15:32:19 +08:00 |
|
|
|
a936283c40
|
去掉不必要的sql
|
2021-04-02 15:28:56 +08:00 |
|
|
|
4f6e140a31
|
Merge remote-tracking branch 'origin/test' into test
|
2021-04-02 14:22:38 +08:00 |
|
|
|
277eb6e244
|
移动授权计算逻辑修改
|
2021-04-02 14:22:19 +08:00 |
|
|
|
a3465dc020
|
新仿真逻辑——CI联锁系统逻辑开发
|
2021-04-02 11:22:40 +08:00 |
|
|
|
7027712908
|
添加信号机新字段存储对象逻辑
|
2021-04-02 11:21:14 +08:00 |
|
|
|
d90288429d
|
Merge remote-tracking branch 'origin/test' into test
|
2021-04-02 11:18:03 +08:00 |
|
|
|
3fbe678a5d
|
进路侧防逻辑调整，添加侧防为信号机时，禁止信号机进路办理逻辑
|
2021-04-02 11:17:41 +08:00 |
|
|
|
47d5ad0bb0
|
修改因组织和项目改为一对多关系导致的bug
|
2021-04-02 10:51:49 +08:00 |
|
|
|
707d23e2cc
|
修改接口地址
|
2021-04-02 09:06:18 +08:00 |
|
|
|
376c4c6a54
|
Merge remote-tracking branch 'origin/test' into test
|
2021-04-02 08:53:35 +08:00 |
|
|
|
733c06b191
|
用户表添加org_id，导入的学生与组织永远关联；组织和项目改为一对多
|
2021-04-01 16:30:01 +08:00 |
|
|
|
1278ab42e1
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-31 18:07:19 +08:00 |
|
|
|
d52faf40e7
|
开发三维课程数据增删改查接口
|
2021-03-31 18:06:59 +08:00 |
|
|
|
14d168b88f
|
添加管理员查询组织树接口
|
2021-03-31 15:32:27 +08:00 |
|
|
|
0e2d9e339a
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-31 14:23:06 +08:00 |
|
|
|
9c62b15593
|
新仿真逻辑——CI联锁系统逻辑开发
|
2021-03-31 14:22:43 +08:00 |
|
|
|
d1c27dc910
|
打开的屏蔽门ma计算bug修改
|
2021-03-31 09:53:38 +08:00 |
|
|
|
ad506486c0
|
教学管理考试查询bug修改
|
2021-03-30 18:27:44 +08:00 |
|
|
|
06f9914f1a
|
修改课程查询接口
|
2021-03-30 15:24:35 +08:00 |
|
|
|
4793a5a21a
|
查询排课报错
|
2021-03-30 15:10:58 +08:00 |
|
