|
|
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 |
|
|
|
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 |
|
|
|
740cded8d8
|
修改教学管理功能及bug
|
2021-03-30 14:39:03 +08:00 |
|
|
|
13afe241fa
|
课程和考试的重名检测不过滤下架的数据
|
2021-03-30 13:22:54 +08:00 |
|
|
|
fccd063da8
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-30 13:05:39 +08:00 |
|
|
|
0333bb4a2d
|
评价规则bug修改
|
2021-03-30 13:05:25 +08:00 |
|
DU
|
e757d5c50e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-03-30 09:38:39 +08:00 |
|
DU
|
40e5ea3af8
|
默认运行等级 变成70~50km/h
|
2021-03-30 09:38:31 +08:00 |
|
|
|
e7099f59af
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-29 18:30:19 +08:00 |
|
|
|
a6485ca3e8
|
新仿真对象逻辑调整
新仿真逻辑——CI联锁系统逻辑开发
|
2021-03-29 18:30:08 +08:00 |
|
|
|
2b0cb91e55
|
小bug修改
|
2021-03-29 18:25:57 +08:00 |
|
|
|
a658bd7312
|
课程名修改添加同名校验；评价规则应用到sql修改
|
2021-03-29 18:19:23 +08:00 |
|
|
|
ad71bfb0df
|
修改教学管理课程删除后创建同名课程依然报错bug；修改创建试卷报错bug
|
2021-03-29 17:14:17 +08:00 |
|
|
|
038f3b3ecd
|
拷贝地图功能中，拷贝考试逻辑修改
|
2021-03-29 16:25:56 +08:00 |
|
|
|
d3c9626947
|
修改<将评价规则应用到><查询评价规则能应用到>接口bug
|
2021-03-29 15:53:55 +08:00 |
|
|
|
0ac681ed53
|
考试不和课程关联
|
2021-03-29 15:04:13 +08:00 |
|
|
|
1fa81de61f
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-26 18:43:04 +08:00 |
|
|
|
de57624817
|
考试改为不和课程关联
|
2021-03-26 18:42:52 +08:00 |
|
DU
|
1a4351a084
|
回库修改
|
2021-03-26 17:20:53 +08:00 |
|
|
|
d6fe4e75fb
|
Merge remote-tracking branch 'origin/temp' into test
|
2021-03-26 17:13:40 +08:00 |
|
|
|
40956d2c52
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-26 17:08:39 +08:00 |
|
|
|
5167575dde
|
暂时提交
|
2021-03-26 17:08:06 +08:00 |
|
DU
|
9752b2b21f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-03-26 16:44:29 +08:00 |
|
DU
|
d1b8fcea3d
|
删除文件
|
2021-03-26 16:44:21 +08:00 |
|
