Commit Graph

502 Commits

Author SHA1 Message Date
sunzhenyu
39002937e1 调整文件结构 2019-08-13 16:23:46 +08:00
sunzhenyu
8749644fa8 Merge branch 'master' of git.cloud.tencent.com:joylink/jl-nclient 2019-08-13 09:49:46 +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
sunzhenyu
74527e79fe 修改三维view文件结构 2019-08-12 18:37:43 +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
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
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
ival
6d960f82e2 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-09 18:29:26 +08:00
ival
763cff0a7c 修改页面不刷新的问题 2019-08-09 18:29:08 +08:00
joylink_cuiweidong
ddd282f5ca 国际化修改 2019-08-09 18:24:13 +08:00
joylink_cuiweidong
b82393366c Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
#	src/i18n/langs/en/index.js
#	src/i18n/langs/zh/index.js
2019-08-09 18:20:34 +08:00
zyy
ff44562b2c Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-09 17:41:20 +08:00
zyy
7cde547775 desc: 增加英文文件内容 2019-08-09 17:40:53 +08:00
fan
367edf0118 调整:代码修改 2019-08-09 17:38:20 +08:00
fan
19eb3314c8 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient into master_loading2 2019-08-09 17:37:24 +08:00
zyy
ca0cdeb7f9 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
#	src/i18n/langs/zh/index.js
2019-08-09 17:37:12 +08:00
zyy
374bf96525 desc: 增加规则,提示信息国际化 2019-08-09 17:36:20 +08:00
fan
a3b7ed0522 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient into master_loading2 2019-08-09 17:34:13 +08:00
joylink_cuiweidong
6951bf9f3a 页面样式修改
国际化添加
2019-08-09 17:26:33 +08:00