Commit Graph

12495 Commits

Author SHA1 Message Date
joylink_cuiweidong
b5c0c0051d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-09-07 11:18:19 +08:00
joylink_cuiweidong
29af1e57f5 代码调整 2022-09-07 11:18:04 +08:00
Yuan
dca92ed5cb Merge branch 'yly' into test 2022-09-07 10:52:42 +08:00
Yuan
a202e872fa format 2022-09-07 10:52:18 +08:00
fan
b1419ef839 pictureList 显示调整 2022-09-07 09:50:59 +08:00
fan
b09e2f003c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-07 09:37:49 +08:00
fan
aea62ada61 增加prdType 2022-09-07 09:37:37 +08:00
Yuan
c7419c7066 操作日志查询&&信息窗口 2022-09-06 16:52:07 +08:00
fan
31f95a02c1 实训调整 2022-09-06 15:43:43 +08:00
fan
9e22641b95 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-05 17:55:52 +08:00
fan
6e049fd3e1 代码调整 2022-09-05 17:55:39 +08:00
joylink_cuiweidong
27b664aad7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-09-05 17:28:16 +08:00
joylink_cuiweidong
4413c17327 大铁线路 分路不良 代码调整 2022-09-05 17:27:47 +08:00
Yuan
f24d39b0d5 Merge branch 'yly' into test 2022-09-05 17:25:25 +08:00
Yuan
f67a43b92a 站存车管理页面 2022-09-05 17:25:07 +08:00
Yuan
eca2b2898c 站存车管理页面 2022-09-05 17:25:02 +08:00
joylink_cuiweidong
4a128b5f89 代码调整 2022-09-05 16:40:46 +08:00
joylink_cuiweidong
cd3c6e586a 大铁线路 现地 上电解锁代码调整 2022-09-05 16:35:42 +08:00
fan
229528d1ff Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-05 15:48:10 +08:00
fan
9edc8a12ae 代码调整 2022-09-05 15:47:56 +08:00
fan
802cc70bfc 区段增加最大最小公里标 2022-09-05 15:47:14 +08:00
dong
4093d02a54 代码调整 2022-09-05 14:32:26 +08:00
dong
cb5179fafb 实训设计代码调整 2022-09-05 14:23:20 +08:00
fan
0c626140ce Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-05 14:03:11 +08:00
fan
acc83c30be 点灯&&分路不良 2022-09-05 14:02:53 +08:00
dong
f7881c85e2 代码调整 2022-09-05 11:08:46 +08:00
dong
08449dd954 代码调整 2022-09-05 10:42:31 +08:00
fan
0d6f5c13f9 实训调整 2022-09-02 17:19:25 +08:00
fan
e7360ce946 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-02 17:03:57 +08:00
fan
0851691587 实训调整 2022-09-02 17:03:43 +08:00
dong
bcbb3e860b 代码调整 2022-09-02 16:50:26 +08:00
fan
97065ca162 实训调整 2022-09-02 15:19:32 +08:00
fan
b0cfbb3f35 实训调整 2022-09-02 15:07:37 +08:00
fan
cb3edd42a4 实训调整 2022-09-02 14:36:16 +08:00
fan
ac6992c792 实训调整 2022-09-02 13:23:09 +08:00
fan
7aa2ffb953 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-02 10:28:41 +08:00
fan
aeeaac46e0 实训调整 2022-09-02 10:28:29 +08:00
joylink_cuiweidong
a99e6e44bd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-09-02 10:22:46 +08:00
joylink_cuiweidong
9ee9e9ecdc 大铁项目 调度命令文件迁移到对应线路 2022-09-02 10:22:28 +08:00
fan
f88500f4de 实训调整 2022-09-02 10:02:46 +08:00
fan
483536c721 实训调整 2022-09-02 10:00:44 +08:00
fan
d61b2fcbcd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-02 09:46:01 +08:00
fan
0b32f34af2 实训调整 2022-09-02 09:45:51 +08:00
dong
0c6c8f03ef 代码调整 2022-09-01 18:25:50 +08:00
fan
663e19e870 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-01 16:24:06 +08:00
fan
8946835dca 实训调整 2022-09-01 16:10:04 +08:00
fan
678dcc3043 红河财经CCTV调整 2022-09-01 16:09:49 +08:00
Yuan
d0a9fc3fed Merge branch 'yly' into test 2022-09-01 16:00:40 +08:00
Yuan
642d1fb72d 区域批量设置 地图显示 2022-09-01 16:00:11 +08:00
dong
77ce75c91b 代码调整 2022-09-01 15:39:59 +08:00