Commit Graph

12212 Commits

Author SHA1 Message Date
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
dong
b3083b8dc8 代码调整 2022-09-01 13:54:10 +08:00
fan
7f5f1e7851 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-01 13:38:29 +08:00
fan
4694f0455c 实训提示 2022-09-01 13:38:11 +08:00
dong
dcded847e9 代码调整 2022-09-01 13:23:02 +08:00
dong
0b69add8bf 代码调整 2022-09-01 12:05:22 +08:00
fan
6b6d8ac871 地图预览大屏等切实训设计预览倒是实训步骤判断错误调整 2022-08-31 17:54:57 +08:00
fan
5fa020edcd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-08-31 17:03:23 +08:00
fan
e935e29001 实训调整 2022-08-31 17:03:10 +08:00
dong
0162aa45a9 代码调整 2022-08-31 15:35:59 +08:00
dong
4f99b40a2b 代码调整 2022-08-31 14:49:01 +08:00
dong
fca267fde1 代码调整 2022-08-31 14:34:24 +08:00
dong
e2c9fa3c3e 代码调整 2022-08-31 14:20:36 +08:00
dong
19a87a79db 代码调整 2022-08-31 11:22:58 +08:00
joylink_cuiweidong
abec73d06c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-08-31 10:56:00 +08:00
joylink_cuiweidong
646c2fb5d6 代码调整 2022-08-31 10:55:45 +08:00
fan
a1dd644078 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-08-31 10:36:04 +08:00
fan
4fe380c003 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
 Conflicts:
	src/views/designPlatform/trainingDesign.vue
2022-08-31 10:35:34 +08:00
dong
f72527f177 实训设计界面功能 2022-08-31 10:35:34 +08:00
fan
5adc99158b 实训调整 2022-08-31 10:34:18 +08:00
dong
8161162b45 代码调整 2022-08-30 18:09:09 +08:00
joylink_cuiweidong
271e798cb0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-08-30 17:58:18 +08:00
joylink_cuiweidong
a2eed75f00 代码调整 2022-08-30 17:58:07 +08:00
dong
182610098b 代码调整 2022-08-30 17:36:02 +08:00
joylink_cuiweidong
b5922b2f65 代码调整 2022-08-30 17:28:47 +08:00
joylink_cuiweidong
f38c129319 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-08-30 16:54:00 +08:00
joylink_cuiweidong
68314b3b08 代码调整 2022-08-30 16:53:37 +08:00
fan
656e7a13aa 占线板排列进路指令调整 2022-08-30 16:25:34 +08:00
fan
4310f07a9b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-08-30 16:09:29 +08:00
fan
5ad7c1f8a1 实训调整 2022-08-30 16:09:17 +08:00
joylink_cuiweidong
74cedff597 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-08-30 15:43:30 +08:00
joylink_cuiweidong
1a92dbf183 实训 打分 代码调整 2022-08-30 15:43:21 +08:00
joylink_cuiweidong
3d40f79501 代码调整 2022-08-30 15:42:28 +08:00
fan
edc15a02ba 实训调整 2022-08-30 15:38:26 +08:00