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 |
|
joylink_cuiweidong
|
998fcf7146
|
代码提交
|
2019-11-19 17:57:13 +08:00 |
|
joylink_cuiweidong
|
bb296a7238
|
代码调整
|
2019-11-19 17:55:27 +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
|
fb81b69471
|
右键菜单显示代码调整
|
2019-11-19 17:19:44 +08:00 |
|
joylink_cuiweidong
|
4a7e0285a8
|
Merge remote-tracking branch 'remotes/origin/test'
# Conflicts:
# src/jmap/theme/fuzhou_01/menus/statusDownTrainDetail.vue
# src/jmap/theme/fuzhou_01/menus/statusUpTrainDetail.vue
|
2019-11-19 17:08:57 +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 |
|
zyy
|
9759950df0
|
desc: 增加区段实际长度
|
2019-11-18 15:22:16 +08:00 |
|
joylink_cuiweidong
|
98b32d1eae
|
代码修改
|
2019-11-18 15:07:22 +08:00 |
|
ival
|
ee6237be6b
|
关闭新执行流程
|
2019-11-18 14:48:53 +08:00 |
|
ival
|
aee164fb4f
|
修改大小写
|
2019-11-18 14:47:19 +08:00 |
|
ival
|
a80b010bfa
|
修改大小写
|
2019-11-18 14:46:57 +08:00 |
|
ival
|
3cffd163ad
|
增加文件
|
2019-11-18 14:45:23 +08:00 |
|