Commit Graph

374 Commits

Author SHA1 Message Date
fan
a3ecc1dfc6 调整:国际化 2019-08-13 18:11:58 +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
fan
8725104c7b 调整:国际化 2019-08-13 09:20:49 +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
fan
13d7e5df8b 调整:国际化 2019-08-12 18:54:32 +08:00
ival
dc0b5301e0 增加导出部分地图数据 2019-08-12 18:22:14 +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
ival
52e9b1f79f 增加国际化配置 2019-08-12 10:18:59 +08:00
joylink_cuiweidong
f1b3906973 任务目标模块国际化 2019-08-09 19:00:37 +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
7cde547775 desc: 增加英文文件内容 2019-08-09 17:40:53 +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
joylink_cuiweidong
6951bf9f3a 页面样式修改
国际化添加
2019-08-09 17:26:33 +08:00
ival
bfddddf7e6 修改代码 2019-08-09 17:25:45 +08:00
zyy
fdd28f3c45 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 15:41:39 +08:00
zyy
de5ca5225a desc: 配置地图国际化语言 2019-08-09 15:40:33 +08:00
ival
7af324ab1e 国际化配置 2019-08-09 15:10:13 +08:00
ival
b89d99f2a5 修改i18n语言层次 2019-08-09 09:31:09 +08:00
ival
7a41260bae 增加国际化配置 2019-08-08 11:33:06 +08:00
ival
c66d72a049 增加i18n国际化配置 2019-08-08 11:29:03 +08:00