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 |
|
ival
|
dbd1193679
|
修改登录涟计划以及大屏等其他系统时，主系统也跳转的问题
|
2019-08-12 15:39:29 +08:00 |
|
zyy
|
e7d1f478be
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-12 15:19:33 +08:00 |
|
zyy
|
fcb6076d64
|
desc: 增加地图编辑国际化
|
2019-08-12 15:19:26 +08:00 |
|
jade
|
02993f4ef3
|
Merge remote-tracking branch 'origin/master' into test
|
2019-08-12 15:16:50 +08:00 |
|
joylink_cuiweidong
|
1b01141b88
|
修改剧本编辑 字段名称
|
2019-08-12 14:21:32 +08:00 |
|
sunzhenyu
|
2cbf0f0452
|
Merge branch 'master' of git.cloud.tencent.com:joylink/jl-nclient
|
2019-08-12 14:12:16 +08:00 |
|
sunzhenyu
|
da5bc03838
|
修改错误引用
|
2019-08-12 14:12:12 +08:00 |
|
ival
|
9c51afb419
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-12 14:10:57 +08:00 |
|
ival
|
be91b4f1c6
|
修改语言
|
2019-08-12 14:10:46 +08:00 |
|
fan
|
df1697e137
|
调整：代码修改
|
2019-08-12 14:08:16 +08:00 |
|
ival
|
0289ddf5d1
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-12 14:05:12 +08:00 |
|
ival
|
ffd23c3adb
|
修改配置
|
2019-08-12 14:04:57 +08:00 |
|
sunzhenyu
|
46d776a642
|
pull
|
2019-08-12 13:43:40 +08:00 |
|
sunzhenyu
|
de7ee56d77
|
删除不用资源
|
2019-08-12 13:42:53 +08:00 |
|
fan
|
6f7d87b72c
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient into master_loading2
|
2019-08-12 13:40:55 +08:00 |
|
fan
|
0b5cfcc9a7
|
调整：代码修改
|
2019-08-12 13:40:34 +08:00 |
|
joylink_cuiweidong
|
47b2be3a8b
|
剧本创建修改查询接口调整
|
2019-08-12 11:31:43 +08:00 |
|
ival
|
914b5d4e0e
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-12 11:01:13 +08:00 |
|
ival
|
0bc9d40ad1
|
修改打包配置
|
2019-08-12 11:01:00 +08:00 |
|
fan
|
9623c98994
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient into master_loading2
|
2019-08-12 10:59:28 +08:00 |
|
fan
|
a9d00b042e
|
调整：代码修改
|
2019-08-12 10:57:38 +08:00 |
|
ival
|
98e6755aba
|
修改解析错误的问题
|
2019-08-12 10:41:24 +08:00 |
|
jade
|
5992dbc5bc
|
Merge remote-tracking branch 'origin/master' into test
|
2019-08-12 10:36:09 +08:00 |
|
ival
|
21778c7f7c
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-12 10:19:11 +08:00 |
|
ival
|
52e9b1f79f
|
增加国际化配置
|
2019-08-12 10:18:59 +08:00 |
|
fan
|
358b3cf6d0
|
调整：代码修改
|
2019-08-12 10:14:19 +08:00 |
|
ival
|
94e16353f3
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-12 09:36:43 +08:00 |
|
ival
|
fc6279efdf
|
修改加载方式
|
2019-08-12 09:36:27 +08:00 |
|
joylink_cuiweidong
|
f1b3906973
|
任务目标模块国际化
|
2019-08-09 19:00:37 +08:00 |
|