Commit Graph

12006 Commits

Author SHA1 Message Date
dong
e5174d7796 代码调整 2022-09-19 16:35:57 +08:00
joylink_cuiweidong
402eb691d1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-09-19 16:04:21 +08:00
joylink_cuiweidong
806b237ae7 代码调整 2022-09-19 16:04:07 +08:00
dong
62904d9056 添加设置调度台数据界面 2022-09-19 15:39:55 +08:00
dong
f2f5a964ec 代码调整 2022-09-19 15:07:09 +08:00
fan
13406673f0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-19 14:30:12 +08:00
fan
2716f015db 实训调整 2022-09-19 14:29:58 +08:00
dong
d65e004529 代码调整 2022-09-19 14:03:02 +08:00
dong
847c388fae Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-09-19 13:23:30 +08:00
dong
4b9ae158a5 实训设计添加车务终端管理、路票、薄册 2022-09-19 13:23:07 +08:00
fan
07cf9f0ca7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-19 11:08:30 +08:00
fan
a05e429d96 代码调整 2022-09-19 11:08:13 +08:00
dong
bddde1e239 实训设计添加调度台和车务终端 2022-09-19 11:01:45 +08:00
fan
d8c4a1278c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-16 14:59:47 +08:00
fan
028e533ba2 实训调整 2022-09-16 14:59:34 +08:00
Yuan
d506294b40 Merge branch 'yly' into test 2022-09-16 14:28:40 +08:00
Yuan
d32825769e PIS数据 2022-09-16 14:28:24 +08:00
dong
956bf7e7fd 代码调整 2022-09-15 18:12:51 +08:00
Yuan
e5ccd6d525 resolve conflict 2022-09-15 18:08:32 +08:00
Yuan
8fed7739e3 WIP: PIS 2022-09-15 18:03:49 +08:00
fan
ea99a2ed09 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-15 17:48:07 +08:00
fan
e766d714b7 实训调整 2022-09-15 17:43:11 +08:00
dong
ff2536c90d 实训草稿发布轨迹 2022-09-15 17:34:09 +08:00
dong
e8c23acab7 代码调整 2022-09-15 14:23:58 +08:00
fan
63f4505ed9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-15 13:30:26 +08:00
fan
78e065ec7a 宁波三号线列车显示调整 2022-09-15 13:29:52 +08:00
dong
abf01b7945 代码调整 2022-09-15 13:15:17 +08:00
fan
2eca40ba41 用户密码重置和忘记密码调整 2022-09-15 13:05:11 +08:00
dong
01ef134ad3 代码调整 2022-09-15 11:30:06 +08:00
joylink_cuiweidong
0ccc33e64e 实训录制 评分 代码调整 2022-09-15 10:55:23 +08:00
dong
507e01ebe8 代码调整 2022-09-15 09:56:51 +08:00
dong
6adcfd9f9b 代码调整 2022-09-14 18:31:20 +08:00
Yuan
afabcfbf3b 时间处理 2022-09-14 18:17:28 +08:00
Yuan
0026faedfe Merge branch 'yly' into test 2022-09-14 17:21:54 +08:00
Yuan
bad5568564 PIS界面 2022-09-14 17:21:32 +08:00
fan
aef684e320 实训调整 2022-09-14 16:44:44 +08:00
fan
82857e9808 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-14 13:28:18 +08:00
fan
ea8277adb7 实训调整 2022-09-14 13:28:06 +08:00
fan
d1f0d5e27f 武汉项目调整 2022-09-14 13:26:59 +08:00
dong
a33c796bbc 代码调整 2022-09-14 11:09:25 +08:00
joylink_cuiweidong
af30f5d08c 代码调整 2022-09-13 17:56:59 +08:00
fan
6fc5bd1441 实训场景调整 2022-09-13 17:33:46 +08:00
fan
d504639e15 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-13 17:06:59 +08:00
fan
af06707a16 实训场景调整 2022-09-13 17:06:36 +08:00
joylink_cuiweidong
96411d34b7 代码调整 2022-09-13 17:04:08 +08:00
joylink_cuiweidong
289f02ac0f 教学系统 课程 现地 切换实训 地图显示代码调整 2022-09-13 13:35:14 +08:00
dong
83736869c3 代码调整 2022-09-09 14:35:46 +08:00
Yuan
8bf8b0b742 Merge branch 'yly' into test 2022-09-09 13:47:46 +08:00
Yuan
f00756f2c2 由公里标批量计算区段实际长度 2022-09-09 13:47:26 +08:00
fan
e42537a8e4 实训调整 2022-09-09 13:06:12 +08:00