Commit Graph

1396 Commits

Author SHA1 Message Date
joylink_cuiweidong
4b7683248c 代码调整 2019-12-02 11:12:45 +08:00
joylink_cuiweidong
52816d6397 删除link相关字段 2019-12-02 09:49:44 +08:00
fan
e8cfe647b5 调整区段关联关系 2019-11-29 18:49:16 +08:00
fan
35fceeec08 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-11-29 18:33:09 +08:00
fan
0afb9666fc 添加区段关联关系 2019-11-29 18:32:34 +08:00
joylink_cuiweidong
9a6647f256 新建区段代码调整 2019-11-29 18:16:21 +08:00
joylink_cuiweidong
c203ede054 区段添加代码调整 2019-11-29 18:06:47 +08:00
zyy
103e8c9c49 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-11-29 17:53:12 +08:00
zyy
fb17f2eb61 desc: 修改区段创建 2019-11-29 17:53:01 +08:00
joylink_cuiweidong
d0f9bd4d65 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-11-29 17:47:00 +08:00
joylink_cuiweidong
8bc69347e7 实训平台创建试卷代码调整 2019-11-29 17:46:14 +08:00
fan
15eed0ddf1 删除 2019-11-29 17:01:51 +08:00
fan
476615957f Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-11-29 17:00:31 +08:00
fan
16fc5d7aa3 区段调整 2019-11-29 17:00:06 +08:00
zyy
44046f8776 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-11-29 16:32:30 +08:00
zyy
0f9ce4c521 desc: 修改权限 2019-11-29 16:32:24 +08:00
joylink_cuiweidong
46713bf074 删除页面link设置 2019-11-29 13:27:17 +08:00
joylink_cuiweidong
34272d7644 新版地图绘制调整 2019-11-29 13:10:18 +08:00
zyy
11b327984e 新增新版地图绘制文件 2019-11-29 12:51:58 +08:00
joylink_cuiweidong
f410a7be67 代码调整 2019-11-28 11:27:37 +08:00
lVAL
e66ddd1b84 修改代码 2019-11-26 10:01:55 +08:00
lVAL
5852ca6ebf 修改代码 2019-11-26 09:44:37 +08:00
lVAL
899f4a4216 修改跳转bug 2019-11-25 18:21:56 +08:00
lVAL
a5bb60cf68 删除跳转页面中无用的subSystem参数 2019-11-25 18:12:34 +08:00
zyy
1317b182c5 调整权限生成延迟问题 2019-11-25 11:19:52 +08:00
zyy
1d82ce738f desc: 修改考试规则定义,调整更新商品更新样式 2019-11-25 10:44:48 +08:00
zyy
0880801c1f desc: 增加检测地图名称唯一性 2019-11-22 16:50:30 +08:00
zyy
44f9da4383 desc: 调整绘图进路数据,调整权限修改逻辑,调整设置link中心点BUG 2019-11-22 15:28:02 +08:00
joylink_cuiweidong
5ac012fc79 运行图代码调整 2019-11-21 09:34:55 +08:00
zyy
fa3d0cb099 desc: 调整代码书写逻辑 2019-11-20 16:31:41 +08:00
ival
0c6d17647a 修改代码 2019-11-20 10:39:46 +08:00
zyy
32dbcee7d0 调整绘图宽度 2019-11-19 18:01:49 +08:00
zyy
ff50a2c4f5 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-19 17:48:43 +08:00
zyy
f3798aa2c9 desc: 增加屏蔽门list 2019-11-19 17:48:32 +08:00
joylink_cuiweidong
5fca43650b Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/scripts/plugin/CommandHandler.js
2019-11-19 17:44:18 +08:00
joylink_cuiweidong
13a5df8571 代码调整 2019-11-19 17:06:13 +08:00
zyy
6ab6f83ae8 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-19 16:39:35 +08:00
zyy
00877ac164 修改代码 调整绘图逻辑 2019-11-19 16:39:24 +08:00
joylink_cuiweidong
0c3c893a31 剧本bug调整 2019-11-19 15:34:45 +08:00
joylink_cuiweidong
fde3e4dcd6 快速入口进入的,销毁房间问题修改 2019-11-19 14:02:52 +08:00
joylink_cuiweidong
7a18bde484 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-19 13:53:54 +08:00
ival
d50ee414ae 修改代码 2019-11-19 13:52:55 +08:00
joylink_cuiweidong
fce7f5403a Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-19 13:38:15 +08:00
ival
ed7acb5abe 修改目录大小写 2019-11-19 13:11:52 +08:00
joylink_cuiweidong
1877931ebb Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-19 13:04:25 +08:00
zyy
ec711c2a7f Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-19 13:00:47 +08:00
zyy
4144621be8 desc: 修改代码 2019-11-19 13:00:36 +08:00
ival
966dc20c3d Merge branch 'test' of https://git.qcloud.com/joylink/jl-nclient into test 2019-11-19 11:01:54 +08:00
ival
0186f25a2b Merge branch 'dev' into test
# Conflicts:
#	src/api/jlmap3d/load3ddata.js
#	src/jlmap3d/jl3ddrive/moveupdate/DrivingConnect.js
2019-11-19 11:00:13 +08:00
ival
306d8b305f 修改代码 2019-11-19 10:54:52 +08:00