Commit Graph

7119 Commits

Author SHA1 Message Date
fan
185b942a46 调整平台路径 2020-09-30 10:32:43 +08:00
lVAL
d331d4d2ca Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-30 09:54:38 +08:00
lVAL
1f14423567 修改 绘制card复制粘贴的bug 2020-09-30 09:54:26 +08:00
joylink_cuiweidong
97a58458b3 代码调整 2020-09-29 18:50:43 +08:00
joylink_cuiweidong
9f78bc530d 竞赛 会话代码调整 2020-09-29 18:44:04 +08:00
joylink_cuiweidong
773e61519d 调度电话代码调整 2020-09-29 17:46:42 +08:00
joylink_cuiweidong
e7cb90c1cb 调度电话代码调整 2020-09-29 15:57:50 +08:00
joylink_cuiweidong
a6458e1519 会话 全选车站代码调整 2020-09-29 13:30:12 +08:00
joylink_cuiweidong
a6bb1fb65a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-29 13:19:05 +08:00
joylink_cuiweidong
9141a6f92c 会话代码调整 3d挂载js路径修改 帮助文档路径修改 2020-09-29 13:18:31 +08:00
fan
f5a7b6220a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-29 09:40:51 +08:00
fan
3a99a68118 调整平台路径 2020-09-29 09:40:41 +08:00
joylink_cuiweidong
f39ee786b4 竞赛 场景代码调整 2020-09-29 09:31:29 +08:00
joylink_cuiweidong
dc930dae12 代码调整 2020-09-28 21:00:14 +08:00
joylink_cuiweidong
27d4c66c8c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-28 20:54:59 +08:00
joylink_cuiweidong
ca84d29af9 场景代码调整 2020-09-28 20:54:34 +08:00
program-walker
6019050258 修改Jenkins正式打包发布 2020-09-28 18:27:57 +08:00
program-walker
c89fb915f5 修改Jenkins打包部署 2020-09-28 17:57:53 +08:00
program-walker
2f051be6e9 修改Jenkins打包部署 2020-09-28 17:54:54 +08:00
fan
82c2502cc6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-28 16:32:47 +08:00
fan
4eab63d1f3 调整打包路径 2020-09-28 16:32:33 +08:00
joylink_cuiweidong
acc2a706ad Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-28 14:03:22 +08:00
joylink_cuiweidong
bca528df88 竞赛 理论考试代码调整 / 竞赛 场景更新代码调整 2020-09-28 14:02:04 +08:00
lVAL
1f20911475 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-28 13:16:19 +08:00
lVAL
d5c9706311 增加绘制园以及修改圆的最小半径值 2020-09-28 13:15:54 +08:00
fan
d087505fea Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-28 09:42:34 +08:00
fan
abc2ef4e62 问题数据兼容调整 2020-09-28 09:42:20 +08:00
lVAL
00d4976f66 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-27 16:12:35 +08:00
lVAL
0e47dfcff1 适配图片APF 2020-09-27 16:12:25 +08:00
zyy
9d2836cf64 调整层级 2020-09-27 15:40:23 +08:00
zyy
bae0a26c64 调整层级 2020-09-27 14:45:15 +08:00
zyy
e4d673cdb0 调整层级 2020-09-27 14:44:59 +08:00
lVAL
e6074f491b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-27 14:29:45 +08:00
lVAL
7375020995 修改鼠标事件处理 2020-09-27 14:29:32 +08:00
zyy
18f370f36f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-27 13:41:41 +08:00
zyy
118f95efc4 调整ibp 触摸板 2020-09-27 13:41:25 +08:00
joylink_cuiweidong
c5fbc578db 竞赛 场景管理 创建的创建和查询接口代码调整 2020-09-27 11:22:48 +08:00
joylink_cuiweidong
47328af26b 代码调整 2020-09-25 19:03:58 +08:00
joylink_cuiweidong
7e05e83bc2 配置文件调整 2020-09-25 18:58:23 +08:00
zyy
9c3158c080 Merge branch 'test'
# Conflicts:
#	src/views/newMap/chatView/chatBox.vue
2020-09-25 18:47:03 +08:00
zyy
13f4cccaae Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-25 18:42:26 +08:00
zyy
f8d3b70021 调整会话流程 2020-09-25 18:41:59 +08:00
lVAL
993e7eccb7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-25 18:32:28 +08:00
lVAL
0a03c6b9ef 解决parseComponent找不到的问题,修改vue-template-compiler版本2.6.11为2.6.12 2020-09-25 18:31:31 +08:00
fan
7a37e5cf5e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-25 18:20:07 +08:00
fan
a5c36b4fca 成员管理问题调整 2020-09-25 18:19:49 +08:00
sunzhenyu
99f7521952 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-25 18:11:38 +08:00
sunzhenyu
160d4f9d59 增加三维列车救援vr下操纵杆控制触发动画,增加三维编辑器区段平整功能 2020-09-25 18:09:13 +08:00
joylink_cuiweidong
2c27c5a62c 会话代码调整 2020-09-25 17:33:18 +08:00
joylink_cuiweidong
bc10b0cbb2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-25 17:15:40 +08:00