diff --git a/src/components/dialog.vue b/src/components/dialog.vue index 8d85d21..7d9129f 100644 --- a/src/components/dialog.vue +++ b/src/components/dialog.vue @@ -12,8 +12,8 @@
- - + +
diff --git a/src/i18n/i18n.js b/src/i18n/i18n.js index 1014819..bbb6236 100644 --- a/src/i18n/i18n.js +++ b/src/i18n/i18n.js @@ -10,19 +10,31 @@ Vue.use(VueI18n) // 引入本地包 const messages = { - 'en-US': Object.assign(en, enLocale), - 'en': Object.assign(en, enLocale), - 'zh-CN': Object.assign(zh, zhLocale), - 'zh': Object.assign(zh, zhLocale) + 'en-us': Object.assign(en, enLocale), + 'zh-cn': Object.assign(zh, zhLocale) +} + +// 获取当前系统使用语言字符串 +export const getLanguage = () => { + // 本地缓存获取 + let language = window.localStorage.getItem('locale') + if (language) { + return language + } + // 返回当前浏览器的语言设置 + language = (navigator.language || navigator.browserLanguage).toLowerCase() + const locales = Object.keys(messages) + for (const local of locales) { + if (local.indexOf(language) > -1) { + return local + } + } + return 'zh-cn' } -const navLang = navigator.language || navigator.userLanguage -let localLang = navLang || false -let lang = localLang || window.localStorage.getItem('locale') || 'zh-CN' -lang = 'zh-CN' // 创建国际化实例 const i18n = new VueI18n({ - locale: lang, + locale: getLanguage(), messages }) diff --git a/src/i18n/langs/en.js b/src/i18n/langs/en.js index d00370c..844296a 100644 --- a/src/i18n/langs/en.js +++ b/src/i18n/langs/en.js @@ -1,11 +1,85 @@ module.exports = { login: { - passwordlogin: 'Password login', + passwordlogin: 'Login', configuration: 'Configuration', - username: 'Username', password: 'Password', - domainnameaddress: 'Domain name address', + domainnameaddress: 'Domain address', refreshtime: 'Refresh time(s)', login: 'Login' + }, + user: { + usermanagement: 'User management', + fullname: 'Full name', + phone: 'Phone', + gender: 'Gender', + creationdate: 'Creation date', + adduser: 'Add user', + question1: 'Are you sure you want to reset your password?', + question2: 'Are you sure you want to delete this user?' + }, + role: { + rolemanagement: 'Role management', + rolename: 'Role name', + role: 'Role', + describe: 'Describe', + creationdate: 'Creation date', + addrole: 'Add role' + }, + system: { + systemmanagement: 'System management', + code: 'Code', + value: 'Value', + addparameter: 'Add parameter', + question1: 'Are you sure to delete it?' + }, + developer: { + developeroptions: 'Developer options' + }, + vehiclestatus: { + vehiclestatus: 'Vehicle status', + status: 'Status', + coordinate: 'coordinate', + headingangle: 'Heading angle', + steeringwheelangle: 'Steering wheel angle', + issuancespeed: 'Issuance speed', + actualspeed: 'Actual speed', + lateraldeviation: 'Lateral deviation', + headingdeviation: 'Heading deviation', + workstatus: 'Work status', + sensorstatus: 'Sensor status', + emergencystop: 'Emergency stop', + avoidancemoderate: 'Avoidance moderate', + resetbutton: 'Reset button', + avoidanceparking: 'Avoidance parking', + Safetyedge: 'Safety edge', + run: 'Run', + abnormal: 'Abnormal' + }, + vehiclecontrol: { + vehiclecontrol: 'Vehicle control', + Status: 'Status', + Control: 'Control', + control: ' control', + deviatestatus: 'Deviate status', + updatestatus: 'Update status', + monitorcontrol: 'Monitor control', + initializecoordinates: 'Initialize coordinates', + coordinateinformation: 'Coordinate information' + }, + button: { + cancel: 'Cancel', + ok: 'OK', + save: 'Save', + modify: 'Modify', + delete: 'Delete', + exit: 'Exit', + resetpassword: 'Reset password' + }, + common: { + name: 'Name', + username: 'User name', + number: 'S/N', + operate: 'Operate', + remark: 'Remark' } } diff --git a/src/i18n/langs/zh.js b/src/i18n/langs/zh.js index 3bb136d..5c914db 100644 --- a/src/i18n/langs/zh.js +++ b/src/i18n/langs/zh.js @@ -2,10 +2,84 @@ module.exports = { login: { passwordlogin: '密码登录', configuration: '配置', - username: '用户名', password: '密码', domainnameaddress: '域名地址', refreshtime: '刷新时间（秒）', login: '登录' + }, + user: { + usermanagement: '用户管理', + fullname: '姓名', + phone: '电话', + gender: '性别', + creationdate: '创建日期', + adduser: '添加用户', + question1: '确定重置密码吗？', + question2: '确定删除该用户吗？' + }, + role: { + rolemanagement: '角色管理', + rolename: '角色名', + role: '角色', + describe: '描述', + creationdate: '创建日期', + addrole: '新增角色' + }, + system: { + systemmanagement: '系统管理', + code: '编码', + value: '值', + addparameter: '添加参数', + question1: '确定删除吗？' + }, + developer: { + developeroptions: '开发者选项' + }, + vehiclestatus: { + vehiclestatus: '车辆状态', + status: '状态', + coordinate: '坐标', + headingangle: '航向角', + steeringwheelangle: '舵轮角度', + issuancespeed: '下发速度', + actualspeed: '实际速度', + lateraldeviation: '横向偏差', + headingdeviation: '航向偏差', + workstatus: '工作状态', + sensorstatus: '传感器状态', + emergencystop: '急停按钮', + avoidancemoderate: '避障减速', + resetbutton: '复位按钮', + avoidanceparking: '避障停车', + Safetyedge: '安全触边', + run: '运行', + abnormal: '异常' + }, + vehiclecontrol: { + vehiclecontrol: '车辆控制', + Status: '状态', + Control: '控制', + control: '控制', + deviatestatus: '偏离状态', + updatestatus: '更新状态', + monitorcontrol: '显示屏', + initializecoordinates: '初始化坐标', + coordinateinformation: '坐标信息' + }, + button: { + cancel: '取消', + ok: '确定', + save: '保存', + modify: '修改', + delete: '删除', + exit: '退出', + resetpassword: '重置密码' + }, + common: { + name: '名称', + username: '用户名', + number: '序号', + operate: '操作', + remark: '备注' } } diff --git a/src/images/new/arrow_up.png b/src/images/new/arrow_up.png new file mode 100644 index 0000000..38c3334 Binary files /dev/null and b/src/images/new/arrow_up.png differ diff --git a/src/pages/modules/login/login.vue b/src/pages/modules/login/login.vue index 12e091f..edd9679 100644 --- a/src/pages/modules/login/login.vue +++ b/src/pages/modules/login/login.vue @@ -1,5 +1,5 @@