Commit Graph

7584 Commits

Author SHA1 Message Date
fan
330ae450f9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-16 11:25:19 +08:00
fan
ed6651cc4c 触发故障菜单 2020-10-16 11:25:07 +08:00
zyy
297bb88d91 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-16 11:07:59 +08:00
zyy
a5d3b9b008 调整综合监控流程 2020-10-16 11:07:44 +08:00
joylink_cuiweidong
f25c52b36d 竞赛实操结果页面代码调整 2020-10-16 10:57:33 +08:00
lVAL
4aec3917de 修改页面 Plan为Add 计划为Plan 2020-10-16 10:54:47 +08:00
joylink_cuiweidong
f9356747b6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-16 10:52:08 +08:00
joylink_cuiweidong
dad592e155 竞赛实操结果页面代码调整 2020-10-16 10:51:45 +08:00
lVAL
56482db23f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-16 10:50:24 +08:00
lVAL
bbe9ca1e28 修改运行图操作 2020-10-16 10:50:07 +08:00
joylink_cuiweidong
edcb1a4ab7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-16 09:51:40 +08:00
joylink_cuiweidong
68dd6923e3 竞赛场景结束页面代码调整 2020-10-16 09:51:22 +08:00
lVAL
4bff618aee 增加AUS运行图平移的功能 2020-10-16 09:21:00 +08:00
ival
891ff8362a AUS运行编辑功能完善 2020-10-15 22:57:06 +08:00
joylink_cuiweidong
5651075342 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-15 19:01:27 +08:00
joylink_cuiweidong
b55f8d00b5 竞赛代码调整 2020-10-15 19:01:09 +08:00
lVAL
4e6d4e6a73 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/router/index_Common.js
修改冲突
2020-10-15 18:55:07 +08:00
lVAL
df1fcc8f82 修改代码 2020-10-15 18:53:45 +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
joylink_cuiweidong
09eb9e2a00 竞赛 实操结果弹窗代码调整 2020-10-15 18:21:02 +08:00
joylink_cuiweidong
dbfbf19c0f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-15 17:47:36 +08:00
joylink_cuiweidong
653c01cec2 竞赛结果弹窗代码调整 2020-10-15 17:47:13 +08:00
zyy
26b0b146de 调整页面逻辑 2020-10-15 17:06:55 +08:00
zyy
c000d35911 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-15 17:02:46 +08:00
zyy
83f696cb25 调整综合监控页面展示 2020-10-15 17:02:34 +08:00
sunzhenyu
9b3ce6f8b7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-15 16:34:07 +08:00
sunzhenyu
8cc2d0ce30 修改三维vr重面模型,修改vr通号车站停车对齐车门,修改三维驾驶车厢内相机位置 2020-10-15 16:33:22 +08:00
lVAL
fe93ecebe2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-15 16:06:06 +08:00
lVAL
c2b87acfe3 增加AUS运行图编辑工具代码 2020-10-15 16:05:55 +08:00
lVAL
80fb7641ae 增加AUS运行图工具的代码 2020-10-15 16:05:30 +08:00
joylink_cuiweidong
cd55c5b269 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-15 15:39:50 +08:00
joylink_cuiweidong
45932bb10a 代码调整 2020-10-15 15:39:33 +08:00
zyy
89958942de Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-15 15:28:36 +08:00
zyy
114516abb8 调整综合监控 2020-10-15 15:28:23 +08:00
fan
41f70aadd8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-15 14:18:11 +08:00
fan
a0ac1a58e7 方向杆调整数据 2020-10-15 14:17:55 +08:00
zyy
78dd2f3d26 调整综合监控开关状态 2020-10-15 10:30:30 +08:00
zyy
3770b4a153 保存状态 2020-10-15 09:38:36 +08:00
zyy
f28262bb72 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-14 19:10:10 +08:00
zyy
4b9a98c35a 调整综合监控流程 2020-10-14 19:09:53 +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
126a413819 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-14 18:10:48 +08:00
joylink_cuiweidong
f91dd07cab 竞赛 场景代码调整 2020-10-14 18:10:32 +08:00
sunzhenyu
a18fe74ab5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-14 18:04:16 +08:00
sunzhenyu
105b738416 修复三维cctv中列车和屏蔽门渲染顺序bug 2020-10-14 18:04:09 +08:00
joylink_cuiweidong
17a18eb328 竞赛 实操 场景调整 2020-10-14 17:10:25 +08:00
joylink_cuiweidong
96dfec83eb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-14 16:20:08 +08:00
joylink_cuiweidong
f02a55724b 代码调整 2020-10-14 16:19:52 +08:00