zyy
|
1317b182c5
|
调整权限生成延迟问题
|
2019-11-25 11:19:52 +08:00 |
|
zyy
|
93094cf623
|
desc: 屏蔽获取不到list 报错问题
|
2019-11-25 11:01:57 +08:00 |
|
zyy
|
811e919236
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-11-25 10:44:55 +08:00 |
|
zyy
|
1d82ce738f
|
desc: 修改考试规则定义，调整更新商品更新样式
|
2019-11-25 10:44:48 +08:00 |
|
joylink_cuiweidong
|
e9009c0198
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-11-25 10:31:14 +08:00 |
|
joylink_cuiweidong
|
e2aedd9fe0
|
代码调整
|
2019-11-25 10:31:03 +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 |
|
zyy
|
1719292036
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-20 10:51:21 +08:00 |
|
zyy
|
9c24d43a7c
|
修改代码
|
2019-11-20 10:51:02 +08:00 |
|
ival
|
6b23ca6f0d
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-20 10:39:58 +08:00 |
|
ival
|
0c6d17647a
|
修改代码
|
2019-11-20 10:39:46 +08:00 |
|
joylink_cuiweidong
|
c264b61f65
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-20 10:39:14 +08:00 |
|
joylink_cuiweidong
|
58d151f9ea
|
代码调整
|
2019-11-20 10:39:00 +08:00 |
|
ival
|
898135a61b
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-19 18:35:49 +08:00 |
|
ival
|
cd6e2ea224
|
修改代码
|
2019-11-19 18:35:31 +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 |
|
joylink_cuiweidong
|
096a848024
|
代码调整
|
2019-11-19 17:48:33 +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
|
bd2744f567
|
代码调整
|
2019-11-19 17:42:36 +08:00 |
|
joylink_cuiweidong
|
13a5df8571
|
代码调整
|
2019-11-19 17:06:13 +08:00 |
|
ival
|
d3ddfeadc8
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-19 16:41:37 +08:00 |
|
ival
|
09af7d91b4
|
修改代码
|
2019-11-19 16:41:21 +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
|
d08d673781
|
修改带小写
|
2019-11-19 13:13:08 +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 |
|
ival
|
fb71e4cbe8
|
修改订阅问题
|
2019-11-19 10:08:57 +08:00 |
|
joylink_cuiweidong
|
577b31baeb
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-19 09:12:45 +08:00 |
|
ival
|
307081aee4
|
修改代码
|
2019-11-19 08:59:06 +08:00 |
|
ival
|
4efa730d1c
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-18 18:47:17 +08:00 |
|
ival
|
f26275e03c
|
修改代码
|
2019-11-18 18:47:02 +08:00 |
|
joylink_cuiweidong
|
133899b699
|
综合演练房间样式调整
|
2019-11-18 17:11:40 +08:00 |
|
joylink_cuiweidong
|
f68cb84648
|
代码调整
|
2019-11-18 15:42:05 +08:00 |
|
zyy
|
5a9099aa35
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-18 15:22:23 +08:00 |
|