Commit Graph

3339 Commits

Author SHA1 Message Date
b2be6c27db Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-12-13 18:21:36 +08:00
3f974416da 增加新注册接口 2022-12-13 18:21:21 +08:00
weizhihong
2a93d7fa6a 【生成实训中增加subtype属性】 2022-12-13 15:51:54 +08:00
weizhihong
0189a4a7fa 【实训操作属性增加subType】 2022-12-13 15:48:53 +08:00
d609881904 增加仿真监控接口;修改向仿真中添加用户的逻辑 2022-12-13 14:51:46 +08:00
tiger_zhou
5fa3d6706b 权限同步调整 2022-12-13 14:41:34 +08:00
94d914e8d7 Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-12-13 10:24:04 +08:00
04f7327dec 修改线路功能是否综合演练字段名 2022-12-13 10:23:46 +08:00
006af3bb39 修改扫码绑定组织管理员接口 2022-12-12 18:13:28 +08:00
d36618012f 修改考试数据处理逻辑 2022-12-12 17:53:50 +08:00
weizhihong
9a8e43c1f2 【实训元素定位】 2022-12-12 17:37:39 +08:00
tiger_zhou
a9aa76685e 权限同步调整 2022-12-12 16:51:29 +08:00
weizhihong
12a7cb5d4d Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2 2022-12-12 16:14:45 +08:00
weizhihong
2021702a7d 【实训设备、定位、属性值】 2022-12-12 16:14:36 +08:00
tiger_zhou
aacec609a8 权限同步调整 2022-12-12 15:54:09 +08:00
weizhihong
30ef80efa4 【实训定位问题】 2022-12-12 13:39:55 +08:00
63620317e7 Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-12-12 11:11:43 +08:00
ec7f0d79e7 修改ISCS同步屏蔽门状态逻辑以兼容无屏蔽门的情况 2022-12-12 11:11:32 +08:00
weizhihong
8060290049 【实训增加client字段,增加人工控背景】 2022-12-12 10:58:55 +08:00
xzb
b9dddbc5cf iscs v2 2022-12-12 10:26:42 +08:00
xzb
896dde1898 iscs v2 2022-12-12 10:21:22 +08:00
xzb
4a1a90fb76 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-12-12 10:02:04 +08:00
xzb
1cb123cc96 iscs v2 2022-12-12 10:01:37 +08:00
weizhihong
ebabaf133d 【实训定位修改】 2022-12-09 18:22:15 +08:00
b4a7bef3f6 Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-12-09 18:04:48 +08:00
e81fa4548d 解除对Org.projectCode的使用 2022-12-09 18:04:38 +08:00
tiger_zhou
d6fbd17c55 教学考试调整 2022-12-09 17:33:30 +08:00
weizhihong
68f31787e4 【生成实训的背景、设备、属性获取】 2022-12-09 17:26:41 +08:00
xzb
a1c9d21e02 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-12-09 15:15:43 +08:00
xzb
54a85c3040 iscs v2 2022-12-09 15:15:18 +08:00
tiger_zhou
e1404f92c7 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-12-09 15:13:06 +08:00
tiger_zhou
f345ccae07 教学考试调整 2022-12-09 15:12:38 +08:00
xzb
4a95a12fee iscs v2 2022-12-09 13:18:30 +08:00
xzb
89d20afa7f iscs v2 2022-12-09 13:08:41 +08:00
xzb
812058e0d4 iscs v2 2022-12-09 10:01:59 +08:00
xzb
8663b12acc Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-12-08 17:49:29 +08:00
xzb
11b070112e iscs v2 2022-12-08 17:48:28 +08:00
xzb
6632908b24 iscs v2 2022-12-08 17:41:10 +08:00
xzb
d1376b7ec2 iscs v2 2022-12-08 17:33:17 +08:00
xzb
8e3aa9ebb2 iscs v2 2022-12-08 17:32:33 +08:00
xzb
a303d773cf iscs v2 2022-12-08 17:31:20 +08:00
xzb
e42741d3f3 iscs v2 2022-12-08 17:00:49 +08:00
weizhihong
4a82fe3ccf 【实训设备筛选修改】 2022-12-08 16:31:02 +08:00
7ef02b4ce4 Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-12-08 16:21:13 +08:00
e875d1160d 组织接口准备换新;项目设备查询接口修改 2022-12-08 16:12:58 +08:00
xzb
c601eae73f Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-12-08 15:44:09 +08:00
xzb
71e2b20935 iscs v2 2022-12-08 15:43:44 +08:00
weizhihong
4be71db66a Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2 2022-12-08 15:33:09 +08:00
weizhihong
d5ff5dc681 【实训生成设备筛选】 2022-12-08 15:33:02 +08:00
xzb
a3deb1b327 iscs v2 2022-12-08 15:22:54 +08:00