diff --git a/src/i18n/langs/en.js b/src/i18n/langs/en.js index 73f7731..004ee39 100644 --- a/src/i18n/langs/en.js +++ b/src/i18n/langs/en.js @@ -8,7 +8,7 @@ module.exports = { login: 'Login' }, homeinfo: { - topinfo: 'device info', + topinfo: 'Device information', deviceinfo: 'Device information', task: 'Current task', status: 'Task status', @@ -17,18 +17,31 @@ module.exports = { error: 'AGV Fault' }, carrypoint: { - topinfo: 'pickup point', - button1: 'auto pickup', - button2: 'auto release', - button3: 'set target site' + topinfo: 'Pickup point', + button1: 'Auto pickup', + button2: 'Auto release', + button3: 'Set target site' + }, + tasklists: { + topinfo: 'Task management', + select: 'Select', + ordernumber: 'Order number', + tasknumber: 'Task number', + targetpoint: 'Target point', + taskstatus: 'Task status', + createTime: 'createTime', + button1: 'Move up', + button2: 'Move down', + button3: 'Task cancel', + button4: 'Task submit' }, errorinfo: { - topinfo: 'error info', - ordernumber: 'order number', - errorname: 'error name', - errortype: 'error type', - errorcontent: 'error content', - solution: 'solution' + topinfo: 'Error info', + ordernumber: 'Order number', + errorname: 'Error name', + errortype: 'Error type', + errorcontent: 'Error content', + solution: 'Solution' }, user: { usermanagement: 'User management', diff --git a/src/i18n/langs/zh.js b/src/i18n/langs/zh.js index 88f5e92..d799468 100644 --- a/src/i18n/langs/zh.js +++ b/src/i18n/langs/zh.js @@ -9,12 +9,12 @@ module.exports = { }, homeinfo: { topinfo: '设备信息', - deviceinfo: '设备信息', - task: '当前任务', - status: '任务状态', - tasknum: '任务数量', - speed: '当前速度', - error: 'AGV故障' + deviceinfo: '设 备 信 息', + task: '当 前 任 务', + status: '任 务 状 态', + tasknum: '任 务 数 量', + speed: '当 前 速 度', + error: 'AGV 故 障' }, carrypoint: { topinfo: '搬运起点', @@ -22,6 +22,19 @@ module.exports = { button2: '自动放货', button3: '定位目标站点' }, + tasklists: { + topinfo: '任务管理', + select: '选中', + ordernumber: '序号', + tasknumber: '任务号', + targetpoint: '目标站点', + taskstatus: '任务状态', + createTime: '生成时间', + button1: '任务上移', + button2: '任务下移', + button3: '任务取消', + button4: '任务提交' + }, errorinfo: { topinfo: '故障信息', ordernumber: '序号', diff --git a/src/pages/modules/home/home.vue b/src/pages/modules/home/home.vue index ac099d4..c5d6485 100644 --- a/src/pages/modules/home/home.vue +++ b/src/pages/modules/home/home.vue @@ -157,6 +157,7 @@ export default { height 102px font-size 36px font-style italic + // font-family YouSheBiaoTiHei color #F6F9FE background center / 100% 100% url(../../../images/new/bg-home-r1.png) no-repeat .rttxt @@ -180,7 +181,7 @@ export default { float left display inline-block color #f6f9fe - width 48% + width 47% .txt01 float left display inline-block @@ -200,7 +201,7 @@ export default { float left display inline-block color #f6f9fe - width 48% + width 47% .txt float left display inline-block @@ -214,7 +215,7 @@ export default { float left display inline-block color #f6f9fe - width 48% + width 47% .txt float left display inline-block @@ -222,7 +223,7 @@ export default { // margin-left 34px font-size 30px .speed-bg - width 513px + width 633px height 12px background center / 100% 100% url(../../../images/new/bg-home-r3.png) no-repeat position relative diff --git a/src/pages/modules/taskmanage/TaskLists.vue b/src/pages/modules/taskmanage/TaskLists.vue index 2666f15..14dc547 100644 --- a/src/pages/modules/taskmanage/TaskLists.vue +++ b/src/pages/modules/taskmanage/TaskLists.vue @@ -3,18 +3,18 @@
| 选中 | -序号 | -任务号 | -目标站点 | -任务状态 | -生成时间 | +{{ $t('tasklists.select') }} | +{{ $t('tasklists.ordernumber') }} | +{{ $t('tasklists.tasknumber') }} | +{{ $t('tasklists.targetpoint') }} | +{{ $t('tasklists.taskstatus') }} | +{{ $t('tasklists.createTime') }} |
|---|---|---|---|---|---|---|---|---|---|---|---|