Commit Graph

512 Commits

Author SHA1 Message Date
joylink_cuiweidong
cdb56ef33b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/api/competition.js
2020-10-28 15:56:23 +08:00
joylink_cuiweidong
2cdcdae4d9 剧本导入 场景导入代码调整 2020-10-28 15:53:45 +08:00
lVAL
7fe5e4992b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/api/rpTools.js
#	src/views/planMonitor/editToolAUS/tool/index.vue
2020-10-28 15:04:51 +08:00
lVAL
5f48a7743e 增加AUS线路编辑功能,以及调整增加运行图组后的接口 2020-10-28 15:01:14 +08:00
zyy
316249fbd6 调整多余配置路径 2020-10-28 13:51:26 +08:00
joylink_cuiweidong
3003a5eb2a 代码调整 2020-10-28 13:05:13 +08:00
joylink_cuiweidong
433e839e75 Merge remote-tracking branch 'remotes/origin/master' into test 2020-10-28 10:36:18 +08:00
zyy
791e02aaf7 调整接口删除多余配置 2020-10-28 10:22:46 +08:00
joylink_cuiweidong
437a6600cd 删除无用的接口 2020-10-28 10:08:18 +08:00
zyy
7882c1ed7f 删除多余接口 2020-10-27 18:42:18 +08:00
zyy
285f2e2807 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-27 18:04:35 +08:00
zyy
aebf120bd8 调整状态删除无用接口 2020-10-27 18:04:19 +08:00
joylink_cuiweidong
d9415d81be Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-27 17:59:32 +08:00
joylink_cuiweidong
9b988f318f 草稿剧本 导入导出功能添加
竞赛场景导出功能添加
2020-10-27 17:57:59 +08:00
lVAL
b55e6e6d76 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/utils/baseUrl.js
2020-10-27 16:33:17 +08:00
lVAL
7e438dbf1f 增加运行图导出功能 2020-10-27 16:31:58 +08:00
joylink_cuiweidong
405915c56f 接口文件整理 2020-10-27 16:23:37 +08:00
fan
66aaa9f201 理论题管理调整 2020-10-27 12:14:17 +08:00
fan
0a6852fb27 理论题管理调整 2020-10-27 10:43:55 +08:00
fan
2e0c08089c 理论题导入调整&&福州一新版调整&&国赛添加取消限速操作 2020-10-23 15:13:18 +08:00
lVAL
08e3d6aa90 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 16:34:27 +08:00
lVAL
77d83cfaf7 增加,AUSTool施工区域编辑功能 2020-10-22 16:34:15 +08:00
joylink_cuiweidong
6c32b53fb4 Merge remote-tracking branch 'remotes/origin/test_runplan' into test
# Conflicts:
#	src/router/index_Common.js
2020-10-22 13:49:35 +08:00
lVAL
ba6e29943b 增加修改折返时间的功能 2020-10-22 11:13:29 +08:00
lVAL
457dd7381a 修改AUSTool 2020-10-22 10:28:38 +08:00
lVAL
c1050d16ab 修改AUSTool 功能 2020-10-21 18:36:52 +08:00
joylink_cuiweidong
14f54eeb85 运行图代码调整 2020-10-21 16:12:19 +08:00
joylink_cuiweidong
cc196d9696 运行图添加 修改计划号 和 修改任务车次号 2020-10-21 14:03:25 +08:00
joylink_cuiweidong
ab4f13d5f0 运行图代码调整 2020-10-20 20:25:45 +08:00
fan
06a06a26d9 merge 2020-10-20 16:49:35 +08:00
fan
ceef20681f 理论题调整&设备管理调整&聊天室问题调整 2020-10-20 16:48:28 +08:00
lVAL
d3ea1cd22e 增加AUSTool绘制区域功能 2020-10-20 15:38:26 +08:00
lVAL
bdeb030276 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-20 11:13:03 +08:00
lVAL
ef7a30fe3c 修改AUS运行图编辑工具 2020-10-20 11:12:48 +08:00
joylink_cuiweidong
0af48e7887 竞赛 实操 自动播放代码调整 2020-10-20 11:06:41 +08:00
zyy
f161c32156 增加license验证 2020-10-16 19:06:24 +08:00
lVAL
541a1cabe4 增加绘图新建功能 2020-10-16 13:07:31 +08:00
fan
54cde2a1da Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-15 18:33:47 +08:00
fan
63ad2d4e48 添加公司单位管理 2020-10-15 18:33:36 +08:00
lVAL
c2b87acfe3 增加AUS运行图编辑工具代码 2020-10-15 16:05:55 +08:00
lVAL
d68824b79a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-14 18:50:17 +08:00
lVAL
0010d78570 增加澳大利亚运行图编辑功能 2020-10-14 18:50:03 +08:00
joylink_cuiweidong
17a18eb328 竞赛 实操 场景调整 2020-10-14 17:10:25 +08:00
sunzhenyu
c38a0acf91 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-12 18:59:46 +08:00
sunzhenyu
41b3c668bf 修改三维车站列车渲染bug,修改/cbtc/static路径 2020-10-12 18:59:37 +08:00
fan
4882234ccd 触发故障调整 2020-10-12 14:25:33 +08:00
fan
e2d27b49c7 方向杆问题调整 2020-10-10 17:58:14 +08:00
joylink_cuiweidong
545dbe8e3c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-09 19:47:12 +08:00
joylink_cuiweidong
cbdd8eb810 竞赛平台 运营统计数据提交代码调整 2020-10-09 19:46:54 +08:00
fan
5fec834c3f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-09 17:27:57 +08:00