Commit Graph

7452 Commits

Author SHA1 Message Date
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
joylink_cuiweidong
7460428838 会话代码调整 2020-09-25 17:15:25 +08:00
zyy
fa6f9d00f9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-25 16:08:07 +08:00
zyy
4362038f13 调整综合监控元素绘制 2020-09-25 16:07:53 +08:00
joylink_cuiweidong
c1e1409119 宁波一号线 实训操作定义调整 2020-09-25 16:03:43 +08:00
joylink_cuiweidong
0f188a6dab Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-25 15:23:39 +08:00
joylink_cuiweidong
69e935f559 宁波线进路 实训定义代码调整 2020-09-25 15:23:23 +08:00
zyy
bcdf1524cd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-25 15:23:06 +08:00
zyy
55910a826b 调整会话 2020-09-25 15:22:54 +08:00
joylink_cuiweidong
dd9ffdeb52 删除不必要的文件 2020-09-25 14:48:09 +08:00
joylink_cuiweidong
4dfb904133 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-25 14:47:13 +08:00
joylink_cuiweidong
2386f424d4 竞赛 理论考试 代码调整 2020-09-25 14:46:57 +08:00
zyy
a0adc641b2 增加iconfont图标导入,调整逻辑 2020-09-25 13:58:41 +08:00
zyy
7fb7c0a819 调整代码 2020-09-24 19:04:33 +08:00
zyy
88ec572564 调整车站值班员按钮 2020-09-24 18:34:25 +08:00
zyy
8a28526fe1 调整样式 2020-09-24 17:55:06 +08:00
zyy
a5b954c017 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-24 17:26:12 +08:00
zyy
aa34210cae 调整会话框流程 2020-09-24 17:25:52 +08:00