Commit Graph

1847 Commits

Author SHA1 Message Date
ival
4a224b630f 增加首先显示 2019-08-14 14:52:21 +08:00
ival
6343a79f81 修改接口 2019-08-14 14:01:28 +08:00
ival
72c1f1d4ca 修改搜索 2019-08-14 13:48:06 +08:00
ival
c61a673513 修改添加 2019-08-14 13:42:35 +08:00
ival
ed05cb123e 修改类车添加功能 2019-08-14 13:38:28 +08:00
ival
576ac7eacb 修改导航配置 2019-08-14 10:36:55 +08:00
ival
c97dfd18c5 修改配置 2019-08-14 10:15:26 +08:00
ival
25479392ff 修改配置 2019-08-14 10:12:51 +08:00
ival
d8480207aa Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-14 09:35:52 +08:00
ival
78a805cd2f 修改皮肤skinStyle为skinCode 2019-08-14 09:35:38 +08:00
ival
4e88c02363 修改目录结构 2019-08-14 09:33:24 +08:00
zyy
9a4e982c08 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-13 18:43:40 +08:00
zyy
aa63be299b desc: 增加地图编辑 国际化 2019-08-13 18:43:34 +08:00
fan
8c799d7ee6 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-08-13 18:32:48 +08:00
fan
3a0202a1e9 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-08-13 18:27:09 +08:00
ival
e0d76d03c5 修改运行图右键菜单 2019-08-13 18:26:36 +08:00
ival
45417f0072 修改代码 2019-08-13 18:14:19 +08:00
fan
2ab09d664f Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-08-13 18:12:14 +08:00
fan
a3ecc1dfc6 调整:国际化 2019-08-13 18:11:58 +08:00
ival
b84f1fe553 运行图修改接口 2019-08-13 17:46:59 +08:00
ival
fc4cf549b2 切换系统语言 2019-08-13 17:33:46 +08:00
ival
db109f2a9e 调整地图进路相关的接口 2019-08-13 16:59:38 +08:00
sunzhenyu
49c3c19c83 Merge branch 'master' of git.cloud.tencent.com:joylink/jl-nclient 2019-08-13 16:23:52 +08:00
sunzhenyu
39002937e1 调整文件结构 2019-08-13 16:23:46 +08:00
zyy
c817cdea7a Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-13 15:54:32 +08:00
zyy
9049d793cc desc: 修改琏计划界面样式,修改界面交互 2019-08-13 15:54:26 +08:00
ival
cf66728bc7 修改切换route报错的问题 2019-08-13 13:34:39 +08:00
ival
346459e43a 修改配置 2019-08-13 11:15:39 +08:00
ival
d14d3b3221 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/i18n/langs/en/error.js
#	src/i18n/langs/en/global.js
#	src/i18n/langs/zh/error.js
#	src/i18n/langs/zh/global.js
2019-08-13 11:13:27 +08:00
ival
0eaa4dbe1f 修改国际化配置 2019-08-13 11:10:55 +08:00
sunzhenyu
8749644fa8 Merge branch 'master' of git.cloud.tencent.com:joylink/jl-nclient 2019-08-13 09:49:46 +08:00
jade
1cbafe9769 Merge remote-tracking branch 'origin/test' into test 2019-08-13 09:48:41 +08:00
fan
819c46789b Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-08-13 09:20:59 +08:00
fan
8725104c7b 调整:国际化 2019-08-13 09:20:49 +08:00
ival
61fe3c2b2d 调整回放界面布局 2019-08-13 09:09:10 +08:00
fan
e0b7994b80 Merge branch 'master_loading2' into dev
# Conflicts:
#	src/i18n/langs/en/tip.js
#	src/i18n/langs/zh/tip.js
2019-08-13 09:02:46 +08:00
ival
c5657e65e2 Merge remote-tracking branch 'remotes/origin/test' into dev 2019-08-13 08:55:37 +08:00
fan
e1c6d00a18 Merge branch 'master' into dev 2019-08-12 20:17:53 +08:00
fan
a04a46431d Merge branch 'master' into test 2019-08-12 20:15:32 +08:00
fan
e1bd3c8b22 剧本调整 2019-08-12 20:11:23 +08:00
joylink_cuiweidong
e105327af6 加载剧本调整 2019-08-12 20:04:53 +08:00
joylink_cuiweidong
45d0cb0a12 加载剧本列表数据显示修改 2019-08-12 19:30:50 +08:00
ival
5cd6150c16 修改required未定义的问题 2019-08-12 19:02:38 +08:00
fan
13d7e5df8b 调整:国际化 2019-08-12 18:54:32 +08:00
sunzhenyu
74527e79fe 修改三维view文件结构 2019-08-12 18:37:43 +08:00
ival
a779d6ad29 Merge remote-tracking branch 'remotes/origin/master' into test 2019-08-12 18:30:33 +08:00
ival
6785738122 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-12 18:22:29 +08:00
ival
dc0b5301e0 增加导出部分地图数据 2019-08-12 18:22:14 +08:00
joylink_cuiweidong
19d26919fc 处理录制剧本时地图不加载的问题 2019-08-12 17:35:55 +08:00
ival
bce66f2f22 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-12 15:39:44 +08:00