From 3b2799d0828b3ade4987c65e55ccf3f118d83e87 Mon Sep 17 00:00:00 2001 From: tuqiang <437016993@qq.com> Date: Wed, 6 Dec 2023 11:23:04 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- acs/nladmin-ui/src/i18n/langs/task/en.js | 19 ++++++++++++++ acs/nladmin-ui/src/i18n/langs/task/in.js | 19 ++++++++++++++ acs/nladmin-ui/src/i18n/langs/task/zh.js | 19 ++++++++++++++ acs/nladmin-ui/src/views/acs/device/index.vue | 2 +- .../src/views/acs/device/opc/index.vue | 6 ++--- .../src/views/acs/device/protocol/index.vue | 4 +-- .../views/acs/history/instRecord/index.vue | 26 +++++++++---------- .../acs/history/taskTreeRecord/index.vue | 26 +++++++++---------- .../src/views/acs/instruction/index.vue | 4 +-- acs/nladmin-ui/src/views/acs/task/index.vue | 4 +-- .../src/views/acs/task/taskFeedback/index.vue | 2 +- .../src/views/system/auto/index.vue | 14 +++++----- .../src/views/system/timing/index.vue | 18 ++++++------- 13 files changed, 110 insertions(+), 53 deletions(-) diff --git a/acs/nladmin-ui/src/i18n/langs/task/en.js b/acs/nladmin-ui/src/i18n/langs/task/en.js index 8824491..e0b34b6 100644 --- a/acs/nladmin-ui/src/i18n/langs/task/en.js +++ b/acs/nladmin-ui/src/i18n/langs/task/en.js @@ -51,6 +51,25 @@ export default { 'please_enter_origin_level': 'Please enter origin-level!', 'please_select_destination_column': 'Please select destination-column!', 'please_select_destination_level': 'Please select the destination floor!' + }, + screen: { + 'title': 'Lanzhou Hailiang equipment management task kanban', + 'task_screen': 'Task Kanban', + 'device': 'Current device', + 'Wednesday': 'Wednesday', + 'year': 'year', + 'month': 'month', + 'day': 'day', + 'task_code': 'task_code', + 'inst_code': 'inst_code', + 'start': 'start', + 'end': 'end', + 'material': 'material', + 'material_num': 'material_num', + 'vehicle_code': 'vehicle_code', + 'bar': 'bar', + 'create_time': 'create_time', + 'IP': 'IP' } } } diff --git a/acs/nladmin-ui/src/i18n/langs/task/in.js b/acs/nladmin-ui/src/i18n/langs/task/in.js index 884a78d..d3bc8c7 100644 --- a/acs/nladmin-ui/src/i18n/langs/task/in.js +++ b/acs/nladmin-ui/src/i18n/langs/task/in.js @@ -51,6 +51,25 @@ export default { 'please_enter_origin_level': 'Silakan masukkan asal-level!', 'please_select_destination_column': 'Silakan pilih tujuan-kolom!', 'please_select_destination_level': 'Silakan pilih lantai tujuan!”' + }, + screen: { + 'title': 'Lanzhou Hailiang tugas manajemen peralatan kanban', + 'task_screen': 'Tugas Kanban', + 'device': 'Perangkat saat ini', + 'Wednesday': 'Rabu', + 'year': 'tahun', + 'month': 'bulan', + 'day': 'hari', + 'task_code': 'Nomor tugas', + 'inst_code': 'Nomor instruksi', + 'start': 'Titik awal', + 'end': 'Terminal', + 'material': 'Jenis barang', + 'material_num': 'Jumlah barang', + 'vehicle_code': 'Nomor kendaraan', + 'bar': 'Kode batang', + 'create_time': 'Waktu masuk', + 'IP': 'IP' } } } diff --git a/acs/nladmin-ui/src/i18n/langs/task/zh.js b/acs/nladmin-ui/src/i18n/langs/task/zh.js index fdb16a9..a15c7f8 100644 --- a/acs/nladmin-ui/src/i18n/langs/task/zh.js +++ b/acs/nladmin-ui/src/i18n/langs/task/zh.js @@ -51,6 +51,25 @@ export default { 'please_enter_origin_level': '请输入起点-层!', 'please_select_destination_column': '请选择终点-列!', 'please_select_destination_level': '请选择终点-层!' + }, + screen: { + 'title': '兰州海亮设备管理任务看板', + 'task_screen': '任务看板', + 'device': '当前设备', + 'Wednesday': '星期三', + 'year': '年', + 'month': '月', + 'day': '日', + 'task_code': '任务号', + 'inst_code': '指令号', + 'start': '起点', + 'end': '终点', + 'material': '物料类型', + 'material_num': '物料数量', + 'vehicle_code': '载具号', + 'bar': '条码', + 'create_time': '入库时间', + 'IP': 'IP' } } } diff --git a/acs/nladmin-ui/src/views/acs/device/index.vue b/acs/nladmin-ui/src/views/acs/device/index.vue index 7d68f0b..13f2ae0 100644 --- a/acs/nladmin-ui/src/views/acs/device/index.vue +++ b/acs/nladmin-ui/src/views/acs/device/index.vue @@ -155,7 +155,7 @@ :data="scope.row" :permission="permission" /> - + {{ $t('common.driver_configuration') }} diff --git a/acs/nladmin-ui/src/views/acs/device/opc/index.vue b/acs/nladmin-ui/src/views/acs/device/opc/index.vue index 886cfd2..7ab2edb 100644 --- a/acs/nladmin-ui/src/views/acs/device/opc/index.vue +++ b/acs/nladmin-ui/src/views/acs/device/opc/index.vue @@ -111,9 +111,9 @@ diff --git a/acs/nladmin-ui/src/views/acs/device/protocol/index.vue b/acs/nladmin-ui/src/views/acs/device/protocol/index.vue index b3320d6..ba1fa33 100644 --- a/acs/nladmin-ui/src/views/acs/device/protocol/index.vue +++ b/acs/nladmin-ui/src/views/acs/device/protocol/index.vue @@ -50,7 +50,7 @@ - - - - + + + + - - - - - - - - - + + + + + + + + + diff --git a/acs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue b/acs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue index d88ea01..8ab6764 100644 --- a/acs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue +++ b/acs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue @@ -99,25 +99,25 @@ @selection-change="crud.selectionChangeHandler" > - - - + + + - - - - - - - - - - + + + + + + + + + + diff --git a/acs/nladmin-ui/src/views/acs/instruction/index.vue b/acs/nladmin-ui/src/views/acs/instruction/index.vue index eed1cc0..af0f2aa 100644 --- a/acs/nladmin-ui/src/views/acs/instruction/index.vue +++ b/acs/nladmin-ui/src/views/acs/instruction/index.vue @@ -168,14 +168,14 @@ {{ $t('common.Forced_cancellation') }} {{ $t('common.Initialize') }} diff --git a/acs/nladmin-ui/src/views/acs/task/index.vue b/acs/nladmin-ui/src/views/acs/task/index.vue index 5a39c00..6a7762d 100644 --- a/acs/nladmin-ui/src/views/acs/task/index.vue +++ b/acs/nladmin-ui/src/views/acs/task/index.vue @@ -333,8 +333,8 @@ - -