From 55f31ff1c4106695761b432c012341512aeeae13 Mon Sep 17 00:00:00 2001 From: xiangxy Date: Tue, 28 Nov 2023 14:52:45 +0800 Subject: [PATCH] home --- src/i18n/langs/en.js | 9 ++++++++ src/i18n/langs/zh.js | 9 ++++++++ src/pages/modules/home/home.vue | 39 ++++++++++++++++++--------------- 3 files changed, 39 insertions(+), 18 deletions(-) diff --git a/src/i18n/langs/en.js b/src/i18n/langs/en.js index 844296a..a6aaa60 100644 --- a/src/i18n/langs/en.js +++ b/src/i18n/langs/en.js @@ -7,6 +7,15 @@ module.exports = { refreshtime: 'Refresh time(s)', login: 'Login' }, + homeinfo: { + topinfo: 'device info', + deviceinfo: 'device', + task: 'task', + status: 'status', + tasknum: 'task num', + speed: 'speed', + error: 'error' + }, user: { usermanagement: 'User management', fullname: 'Full name', diff --git a/src/i18n/langs/zh.js b/src/i18n/langs/zh.js index 5c914db..10f954f 100644 --- a/src/i18n/langs/zh.js +++ b/src/i18n/langs/zh.js @@ -7,6 +7,15 @@ module.exports = { refreshtime: '刷新时间(秒)', login: '登录' }, + homeinfo: { + topinfo: '设备信息', + deviceinfo: '设备信息', + task: '当前任务', + status: '任务状态', + tasknum: '任务数量', + speed: '当前速度', + error: 'AGV故障' + }, user: { usermanagement: '用户管理', fullname: '姓名', diff --git a/src/pages/modules/home/home.vue b/src/pages/modules/home/home.vue index 8a408ec..68c87df 100644 --- a/src/pages/modules/home/home.vue +++ b/src/pages/modules/home/home.vue @@ -5,38 +5,38 @@
-
设备信息
+
{{ $t('homeinfo.topinfo') }}
- 设备信息 + {{ $t('homeinfo.deviceinfo') }} {{dataInfo.device_info}}
- 当前任务 + {{ $t('homeinfo.task') }} {{dataInfo.task_name}} {{dataInfo.task_info}}
- 任务状态 + {{ $t('homeinfo.status') }} {{dataInfo.task_status}}
- 任务数量 + {{ $t('homeinfo.tasknum') }} {{dataInfo.task_num}}
- 当前速度 + {{ $t('homeinfo.speed') }} {{dataInfo.speed}}
- AGV故障 + {{ $t('homeinfo.error') }} {{dataInfo.error_name}}
@@ -57,7 +57,7 @@ export default { return { interTime: this.$store.getters.setTime, timer: null, - dataInfo: {} + // dataInfo: {} // dataInfo: { // device_info: 'NobleLiftPS10LMT_HuaHai', // task_name: '无', @@ -67,16 +67,16 @@ export default { // error_name: '障碍物告警', // button_name: '继续搬运' // } - // dataInfo: { - // device_info: 'NobleLiftPS10LMT_HuaHai', - // task_name: '任务号:11322', - // task_info: '目标点:5', - // task_status: '执行中', - // task_num: '待执行0/2', - // speed: '0.0m/s', - // error_name: '正常运行', - // button_name: '确认完成继续下个任务' - // } + dataInfo: { + device_info: 'NobleLiftPS10LMT_HuaHai', + task_name: '任务号:11322', + task_info: '目标点:5', + task_status: '执行中', + task_num: '待执行0/2', + speed: '0.0m/s', + error_name: '正常运行', + button_name: '确认完成继续下个任务' + } } }, created () { @@ -179,6 +179,7 @@ export default { float left display inline-block color #f6f9fe + width 30% .txt01 float left display inline-block @@ -197,6 +198,7 @@ export default { float left display inline-block color #f6f9fe + width 30% .txt float left display inline-block @@ -210,6 +212,7 @@ export default { float left display inline-block color #f6f9fe + width 30% .txt float left display inline-block