Commit Graph

7442 Commits

Author SHA1 Message Date
lVAL
b34e347ab1 修改代码 2020-10-23 09:21:42 +08:00
lVAL
6489d67e67 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-23 09:03:14 +08:00
lVAL
b49c1c29d1 修改运行时间校验错误的问题 2020-10-23 09:03:05 +08:00
zyy
f9d38a4efc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 18:33:51 +08:00
zyy
1163d9def9 调整新建地图流程 2020-10-22 18:33:28 +08:00
joylink_cuiweidong
f8e1c29642 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 18:30:51 +08:00
joylink_cuiweidong
683f73c005 运行图 展示界面 车次号调整 2020-10-22 18:30:02 +08:00
lVAL
fdeaabb699 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 18:20:40 +08:00
lVAL
439e9194c6 修改AUSTool功能 2020-10-22 18:20:29 +08:00
joylink_cuiweidong
50620f9447 代码调整 2020-10-22 17:34:49 +08:00
joylink_cuiweidong
9af669f708 运行图绘制代码调整 2020-10-22 17:30:56 +08:00
lVAL
a7011888b4 修改文件大小写 2020-10-22 16:49:58 +08:00
lVAL
5184721b62 删除错误带小写文件 2020-10-22 16:49:29 +08:00
fan
1fce4cb363 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 16:47:29 +08:00
fan
dc7cf80222 国赛皮肤调整 2020-10-22 16:47:18 +08:00
joylink_cuiweidong
3d3fc84041 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 16:39:55 +08:00
joylink_cuiweidong
751ebe5a16 竞赛线路 列车样式调整 2020-10-22 16:39:34 +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
fan
90390462a2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 16:26:15 +08:00
fan
700a37d312 国赛皮肤调整&接触网调整 2020-10-22 16:26:03 +08:00
sunzhenyu
bd6fc3b077 修改三维设备点击道岔bug 2020-10-22 15:42:57 +08:00
sunzhenyu
9e93958224 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 15:22:53 +08:00
sunzhenyu
5e4f341ff9 修改三维cctv代码结构,剔除不必要代码,优化判断 2020-10-22 15:22:40 +08:00
joylink_cuiweidong
7352193df1 代码调整 2020-10-22 14:29:55 +08:00
fan
6ce8978b8b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 14:25:26 +08:00
joylink_cuiweidong
c89c2f2e11 代码调整 2020-10-22 14:22:21 +08:00
fan
c2f350a0c2 国赛皮肤调整 2020-10-22 14:07:18 +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
fan
80c3f726b3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 13:41:06 +08:00
fan
7613a38be1 国赛皮肤调整 2020-10-22 13:40:56 +08:00
joylink_cuiweidong
c7d99e7913 运行图编辑代码调整 2020-10-22 13:34:08 +08:00
zyy
415486c815 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 13:03:40 +08:00
zyy
8053b51e24 增加iscs事件弹窗 2020-10-22 13:03:26 +08:00
lVAL
ba6e29943b 增加修改折返时间的功能 2020-10-22 11:13:29 +08:00
lVAL
f749a9bfdb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 10:28:50 +08:00
lVAL
457dd7381a 修改AUSTool 2020-10-22 10:28:38 +08:00
joylink_cuiweidong
3d1c5dacd4 运行图 增加任务 添加了 起始终到车站的筛选 2020-10-22 09:53:29 +08:00
fan
883a6b88df Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 09:45:57 +08:00
fan
94e626ce49 理论题调整 2020-10-22 09:45:33 +08:00
joylink_cuiweidong
4eb69d03a6 运行图代码调整 2020-10-21 18:40:02 +08:00
lVAL
c1050d16ab 修改AUSTool 功能 2020-10-21 18:36:52 +08:00
joylink_cuiweidong
c684dd5149 运行图代码调整 2020-10-21 17:39:52 +08:00
joylink_cuiweidong
8fd587ac13 运行图代码调整 2020-10-21 17:19:47 +08:00
joylink_cuiweidong
14f54eeb85 运行图代码调整 2020-10-21 16:12:19 +08:00
joylink_cuiweidong
103c306313 运行图代码调整 2020-10-21 15:16:30 +08:00
joylink_cuiweidong
cc196d9696 运行图添加 修改计划号 和 修改任务车次号 2020-10-21 14:03:25 +08:00
joylink_cuiweidong
181a1491da 运行图代码调整 2020-10-21 11:07:10 +08:00
lVAL
599e092c57 提交代码 2020-10-21 09:17:28 +08:00
joylink_cuiweidong
ab4f13d5f0 运行图代码调整 2020-10-20 20:25:45 +08:00