From 053751c58fa72d9572c3a5ce02d6fafa6d5fc463 Mon Sep 17 00:00:00 2001
From: tuqiang <437016993@qq.com>
Date: Fri, 8 Dec 2023 17:25:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E3=80=81=E5=AE=8C=E6=88=90=E5=9B=BD=E9=99=85=E5=8C=96=E5=89=A9?=
 =?UTF-8?q?=E4=BD=99=E9=83=A8=E5=88=86=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 acs/nladmin-ui/src/i18n/langs/address/en.js   |  12 +-
 acs/nladmin-ui/src/i18n/langs/address/in.js   |  10 +-
 acs/nladmin-ui/src/i18n/langs/auto/en.js      |  18 +-
 acs/nladmin-ui/src/i18n/langs/auto/in.js      |  30 +-
 acs/nladmin-ui/src/i18n/langs/chinese.js      |   4 +-
 acs/nladmin-ui/src/i18n/langs/config/en.js    |  26 +-
 acs/nladmin-ui/src/i18n/langs/config/in.js    |  26 +-
 .../src/i18n/langs/customPolicy/en.js         |   8 +-
 .../src/i18n/langs/customPolicy/in.js         |   8 +-
 acs/nladmin-ui/src/i18n/langs/device/en.js    |  31 +-
 acs/nladmin-ui/src/i18n/langs/device/in.js    |  29 +-
 acs/nladmin-ui/src/i18n/langs/device/zh.js    |   3 +-
 acs/nladmin-ui/src/i18n/langs/en.js           |  36 +-
 acs/nladmin-ui/src/i18n/langs/english.js      |   4 +-
 acs/nladmin-ui/src/i18n/langs/history/en.js   |  19 +-
 acs/nladmin-ui/src/i18n/langs/history/in.js   |  21 +-
 acs/nladmin-ui/src/i18n/langs/history/zh.js   |   3 +-
 acs/nladmin-ui/src/i18n/langs/in.js           |  54 +-
 acs/nladmin-ui/src/i18n/langs/indonesian.js   |   4 +-
 .../src/i18n/langs/instruction/en.js          |  52 +-
 .../src/i18n/langs/instruction/in.js          |  36 +-
 acs/nladmin-ui/src/i18n/langs/menu/en.js      |  32 +-
 acs/nladmin-ui/src/i18n/langs/menu/in.js      |  34 +-
 acs/nladmin-ui/src/i18n/langs/monitor/en.js   |  46 +-
 acs/nladmin-ui/src/i18n/langs/monitor/in.js   |  48 +-
 acs/nladmin-ui/src/i18n/langs/opc/en.js       |  32 +-
 acs/nladmin-ui/src/i18n/langs/opc/in.js       |  30 +-
 acs/nladmin-ui/src/i18n/langs/opc/zh.js       |  10 +-
 acs/nladmin-ui/src/i18n/langs/param/en.js     |  10 +-
 acs/nladmin-ui/src/i18n/langs/param/in.js     |   8 +-
 acs/nladmin-ui/src/i18n/langs/protocol/en.js  |   8 +-
 acs/nladmin-ui/src/i18n/langs/protocol/in.js  |   8 +-
 acs/nladmin-ui/src/i18n/langs/protocol/zh.js  |   2 +-
 acs/nladmin-ui/src/i18n/langs/role/en.js      |   0
 acs/nladmin-ui/src/i18n/langs/role/in.js      |   0
 acs/nladmin-ui/src/i18n/langs/role/zh.js      |   0
 acs/nladmin-ui/src/i18n/langs/route/en.js     |  32 +-
 acs/nladmin-ui/src/i18n/langs/route/in.js     |  30 +-
 .../src/i18n/langs/storageCell/en.js          |  25 +-
 .../src/i18n/langs/storageCell/in.js          |  23 +-
 .../src/i18n/langs/storageCell/zh.js          |   3 +-
 acs/nladmin-ui/src/i18n/langs/task/en.js      | 100 +--
 acs/nladmin-ui/src/i18n/langs/task/in.js      |  96 +--
 acs/nladmin-ui/src/i18n/langs/task/zh.js      |   4 +-
 acs/nladmin-ui/src/i18n/langs/timing/en.js    |  42 +-
 acs/nladmin-ui/src/i18n/langs/timing/in.js    |  36 +-
 acs/nladmin-ui/src/i18n/langs/timing/zh.js    |  10 +-
 acs/nladmin-ui/src/i18n/langs/user/en.js      |  35 +
 acs/nladmin-ui/src/i18n/langs/user/in.js      |  35 +
 acs/nladmin-ui/src/i18n/langs/user/zh.js      |  35 +
 acs/nladmin-ui/src/i18n/langs/zh-CN.js        |   6 +-
 .../src/views/acs/device/address/index.vue    |  33 +-
 .../views/acs/device/customPolicy/index.vue   |   8 +-
 acs/nladmin-ui/src/views/acs/device/index.vue | 169 ++---
 .../src/views/acs/device/opc/index.vue        | 103 +--
 .../src/views/acs/device/protocol/index.vue   |  87 +--
 .../views/acs/device/storageCell/index.vue    |  67 +-
 .../views/acs/history/instRecord/index.vue    | 121 ++--
 .../views/acs/history/taskRecord/index.vue    | 143 +++--
 .../acs/history/taskTreeRecord/index.vue      | 132 ++--
 .../src/views/acs/history/udwData/index.vue   |  57 +-
 .../src/views/acs/instruction/index.vue       | 143 +++--
 .../src/views/acs/route/routeLine/index.vue   |  29 +-
 acs/nladmin-ui/src/views/acs/task/index.vue   | 597 +++++++++---------
 .../src/views/acs/task/taskFeedback/index.vue |   3 +-
 .../src/views/monitor/log/search.vue          |  30 +-
 .../src/views/monitor/lucene/index.vue        | 145 ++++-
 .../src/views/monitor/lucene/search.vue       | 202 +++---
 .../src/views/system/auto/index.vue           |   6 +-
 .../src/views/system/param/index.vue          |   2 +-
 .../src/views/system/role/index.vue           |  29 +-
 .../src/views/system/timing/index.vue         |  73 ++-
 .../src/views/system/user/index.vue           |  98 +--
 73 files changed, 2021 insertions(+), 1470 deletions(-)
 create mode 100644 acs/nladmin-ui/src/i18n/langs/role/en.js
 create mode 100644 acs/nladmin-ui/src/i18n/langs/role/in.js
 create mode 100644 acs/nladmin-ui/src/i18n/langs/role/zh.js
 create mode 100644 acs/nladmin-ui/src/i18n/langs/user/en.js
 create mode 100644 acs/nladmin-ui/src/i18n/langs/user/in.js
 create mode 100644 acs/nladmin-ui/src/i18n/langs/user/zh.js

diff --git a/acs/nladmin-ui/src/i18n/langs/address/en.js b/acs/nladmin-ui/src/i18n/langs/address/en.js
index 240d2b0..d79cc93 100644
--- a/acs/nladmin-ui/src/i18n/langs/address/en.js
+++ b/acs/nladmin-ui/src/i18n/langs/address/en.js
@@ -1,12 +1,12 @@
 export default {
   'address': {
-    'title': 'wms address',
-    'methods_code': 'methods code',
-    'methods_name': 'methods name',
-    'methods_url': 'methods url',
-    'remark': 'remark'
+    'title': 'Wms Address',
+    'methods_code': 'Methods Code',
+    'methods_name': 'Methods Name',
+    'methods_url': 'Methods Url',
+    'remark': 'Remark'
   },
   'msg': {
-    'delete_msg': 'Apakah Anda yakin untuk menghapusnya? Jika ada nod subordinat, mereka akan dihapus bersama. Operasi ini tidak dapat dibatalkan!'
+    'delete_msg': 'If There Are Subordinate Nodes, Delete Them Together, And This Operation Cannot Be Undone!'
   }
 }
diff --git a/acs/nladmin-ui/src/i18n/langs/address/in.js b/acs/nladmin-ui/src/i18n/langs/address/in.js
index 40e2af7..b35b402 100644
--- a/acs/nladmin-ui/src/i18n/langs/address/in.js
+++ b/acs/nladmin-ui/src/i18n/langs/address/in.js
@@ -1,13 +1,13 @@
 export default {
   'address': {
     'title': 'Alamat WMS',
-    'methods_code': 'Kode metodologi',
-    'methods_name': 'nama metode',
-    'methods_url': 'meminta alamat',
-    'remark': 'informasi'
+    'methods_code': 'Kode Metodologi',
+    'methods_name': 'Nama Metode',
+    'methods_url': 'Meminta Alamat',
+    'remark': 'Informasi'
   },
   'msg': {
-    'delete_msg': 'Apakah Anda yakin untuk menghapusnya? Jika ada nod subordinat, mereka akan dihapus bersama. Operasi ini tidak dapat dibatalkan!'
+    'delete_msg': 'Apakah Anda Yakin Untuk Menghapusnya? Jika Ada Nod Subordinat, Mereka Akan Dihapus Bersama. Operasi Ini Tidak Dapat Dibatalkan!'
   }
 }
 
diff --git a/acs/nladmin-ui/src/i18n/langs/auto/en.js b/acs/nladmin-ui/src/i18n/langs/auto/en.js
index 205bf9c..4ba99bf 100644
--- a/acs/nladmin-ui/src/i18n/langs/auto/en.js
+++ b/acs/nladmin-ui/src/i18n/langs/auto/en.js
@@ -1,17 +1,17 @@
 export default {
   'Auto': {
     'table': {
-      'name': 'name',
-      'code': 'code',
-      'status': 'status',
-      'thread_name': 'thread_name',
-      'thread_state': 'thread_state',
-      'usedStatus': 'usedStatus',
-      'stopMessage': 'stopMessage',
-      'operate': 'operate'
+      'name': 'Name',
+      'code': 'Code',
+      'status': 'Status',
+      'thread_name': 'Thread Name',
+      'thread_state': 'Thread State',
+      'usedStatus': 'UsedStatus',
+      'stopMessage': 'StopMessage',
+      'operate': 'Operate'
     },
     'msg': {
-      'select_msg': 'Are you sure to stop this thread?'
+      'select_msg': 'Are You Sure To Stop This Thread?'
     }
   }
 }
diff --git a/acs/nladmin-ui/src/i18n/langs/auto/in.js b/acs/nladmin-ui/src/i18n/langs/auto/in.js
index cbe311c..d9a24f0 100644
--- a/acs/nladmin-ui/src/i18n/langs/auto/in.js
+++ b/acs/nladmin-ui/src/i18n/langs/auto/in.js
@@ -1,17 +1,17 @@
 export default {
-    'Auto': {
-        'table': {
-            'name': 'nama',
-            'code': 'nomor',
-            'status': 'keadaan',
-            'thread_name': 'Nama Benda',
-            'thread_state': 'Status benang',
-            'usedStatus': 'Status penggunaan',
-            'stopMessage': 'Hentikan pesan',
-            'operate': 'operasi',
-        },
-        'msg': {
-            'stop_msg': 'Apakah Anda yakin untuk menghentikan benang ini？'
-        }
+  'Auto': {
+    'table': {
+      'name': 'Nama',
+      'code': 'Nomor',
+      'status': 'Keadaan',
+      'thread_name': 'Nama Benda',
+      'thread_state': 'Status benang',
+      'usedStatus': 'Status Penggunaan',
+      'stopMessage': 'Hentikan Pesan',
+      'operate': 'Operasi'
+    },
+    'msg': {
+      'select_msg': 'Apakah Anda Yakin Untuk Menghentikan Benang Ini?'
     }
-}
\ No newline at end of file
+  }
+}
diff --git a/acs/nladmin-ui/src/i18n/langs/chinese.js b/acs/nladmin-ui/src/i18n/langs/chinese.js
index 5b6b431..3262cc2 100644
--- a/acs/nladmin-ui/src/i18n/langs/chinese.js
+++ b/acs/nladmin-ui/src/i18n/langs/chinese.js
@@ -16,6 +16,7 @@ import customPolicy from './customPolicy/zh'
 import monitor from './monitor/zh'
 import timing from './timing/zh'
 import config from './config/zh'
+import user from './user/zh'
 import deviceErrorInfo from './deviceErrorInfo/zh'
 
 export default {
@@ -37,6 +38,7 @@ export default {
   ...monitor,
   ...timing,
   ...config,
-  ...deviceErrorInfo
+  ...deviceErrorInfo,
+  ...user
 }
 
diff --git a/acs/nladmin-ui/src/i18n/langs/config/en.js b/acs/nladmin-ui/src/i18n/langs/config/en.js
index 35fab3c..e60a9b2 100644
--- a/acs/nladmin-ui/src/i18n/langs/config/en.js
+++ b/acs/nladmin-ui/src/i18n/langs/config/en.js
@@ -1,22 +1,22 @@
 export default {
   'config': {
     'table': {
-      'device_execution': 'Device execution',
-      'please_select': 'Please select',
-      'end_of_instruction': 'End of instructio',
-      'end_of_task': 'End of task',
-      'end_device': 'End device',
-      'max': 'Maximum quantity',
-      'allocation_ratio': 'Allocation ratio',
+      'device_execution': 'Device Execution',
+      'please_select': 'Please Select',
+      'end_of_instruction': 'End Of Instructio',
+      'end_of_task': 'End Of Task',
+      'end_device': 'End Device',
+      'max': 'Maximum Quantity',
+      'allocation_ratio': 'Allocation Ratio',
       'cancel': 'Cancel',
       'confirm': 'Confirm',
-      'device_code': 'Device code',
-      'destination_device': 'Destination device',
-      'inst_nextdevice_code': 'Command destination device',
-      'destination_configuration': 'Destination configuration',
+      'device_code': 'Device Code',
+      'destination_device': 'Destination Device',
+      'inst_nextdevice_code': 'Command Destination Device',
+      'destination_configuration': 'Destination Configuration',
       'operation': 'Operation',
-      'device_is_not_null': 'Device code cannot be empty',
-      'mapping_relationship': 'Mapping relationship'
+      'device_is_not_null': 'Device Code Cannot Be Empty',
+      'mapping_relationship': 'Mapping Relationship'
     },
     'rules': {
     }
diff --git a/acs/nladmin-ui/src/i18n/langs/config/in.js b/acs/nladmin-ui/src/i18n/langs/config/in.js
index 2b081c6..47d56b5 100644
--- a/acs/nladmin-ui/src/i18n/langs/config/in.js
+++ b/acs/nladmin-ui/src/i18n/langs/config/in.js
@@ -1,22 +1,22 @@
 export default {
   'config': {
     'table': {
-      'device_execution': 'Eksekusi perangkat',
-      'please_select': 'Silakan pilih',
-      'end_of_instruction': 'Akhir instruksi',
-      'end_of_task': 'Akhir tugas',
-      'end_device': 'Perangkat akhir',
-      'max': 'Jumlah maksimum',
-      'allocation_ratio': 'Rasio alokasi',
+      'device_execution': 'Eksekusi Perangkat',
+      'please_select': 'Silakan Pilih',
+      'end_of_instruction': 'Akhir Instruksi',
+      'end_of_task': 'Akhir Tugas',
+      'end_device': 'Perangkat Akhir',
+      'max': 'Jumlah Maksimum',
+      'allocation_ratio': 'Rasio Alokasi',
       'cancel': 'Membatalkan',
       'confirm': 'Mengonfirmasi',
-      'device_code': 'Kode perangkat',
-      'destination_device': 'Perangkat tujuan tugas',
-      'inst_nextdevice_code': 'Perangkat tujuan perintah',
-      'destination_configuration': 'Konfigurasi tujuan',
+      'device_code': 'Kode Perangkat',
+      'destination_device': 'Perangkat Tujuan Tugas',
+      'inst_nextdevice_code': 'Perangkat Tujuan Perintah',
+      'destination_configuration': 'Konfigurasi Tujuan',
       'operation': 'Operasi',
-      'device_is_not_null': 'Kode perangkat tidak boleh kosong',
-      'mapping_relationship': 'Hubungan pemetaan'
+      'device_is_not_null': 'Kode Perangkat Tidak Boleh Kosong',
+      'mapping_relationship': 'Hubungan Pemetaan'
     },
     'rules': {
     }
diff --git a/acs/nladmin-ui/src/i18n/langs/customPolicy/en.js b/acs/nladmin-ui/src/i18n/langs/customPolicy/en.js
index 7730dc4..5a93ad9 100644
--- a/acs/nladmin-ui/src/i18n/langs/customPolicy/en.js
+++ b/acs/nladmin-ui/src/i18n/langs/customPolicy/en.js
@@ -1,10 +1,10 @@
 export default {
   'customPolicy': {
-    'title': 'Custom policy',
-    'unit_code': 'Policy number',
-    'unit_name': 'Policy name'
+    'title': 'Custom Policy',
+    'unit_code': 'Policy Number',
+    'unit_name': 'Policy Name'
   },
   'msg': {
-    'delete_msg': 'Apakah Anda yakin untuk menghapusnya? Jika ada nod subordinat, mereka akan dihapus bersama. Operasi ini tidak dapat dibatalkan!'
+    'delete_msg': 'Are You Sure To Delete It? If There Are Subordinate Nodes, they Will Be Deleted Together. This Operation Cannot Be Undone!'
   }
 }
diff --git a/acs/nladmin-ui/src/i18n/langs/customPolicy/in.js b/acs/nladmin-ui/src/i18n/langs/customPolicy/in.js
index ec9b8af..45d1d52 100644
--- a/acs/nladmin-ui/src/i18n/langs/customPolicy/in.js
+++ b/acs/nladmin-ui/src/i18n/langs/customPolicy/in.js
@@ -1,11 +1,11 @@
 export default {
   'customPolicy': {
-    'title': 'Strategi khusus',
-    'unit_code': 'Nomor strategi',
-    'unit_name': 'Nama strategi'
+    'title': 'Strategi Khusus',
+    'unit_code': 'Nomor Strategi',
+    'unit_name': 'Nama Strategi'
   },
   'msg': {
-    'delete_msg': 'Apakah Anda yakin untuk menghapusnya? Jika ada nod subordinat, mereka akan dihapus bersama. Operasi ini tidak dapat dibatalkan!'
+    'delete_msg': 'Apakah Anda Yakin Untuk Menghapusnya? Jika Ada Nod Subordinat, Mereka Akan Dihapus Bersama. Operasi Ini Tidak Dapat Dibatalkan!'
   }
 }
 
diff --git a/acs/nladmin-ui/src/i18n/langs/device/en.js b/acs/nladmin-ui/src/i18n/langs/device/en.js
index 04a6878..4344388 100644
--- a/acs/nladmin-ui/src/i18n/langs/device/en.js
+++ b/acs/nladmin-ui/src/i18n/langs/device/en.js
@@ -1,20 +1,23 @@
 export default {
   'device': {
-    'title': 'device',
+    'title': 'Device',
     'placeholder': {
-      'enter_name_code': 'enter a name or code',
-      'device_type': 'device type',
-      'please_select': 'please select'
+      'enter_name_code': 'Enter A Name Or Code',
+      'device_type': 'Device Type',
+      'please_select': 'Please Select',
+      'name_code': 'Name Or Code'
     },
     'device_table_title': {
-      'device_identification': 'device identification',
-      'device_encoding': 'device encoding',
-      'device_name': 'device name',
-      'device_type': 'device type',
-      'region': 'region',
-      'sequence_number': 'sequence number',
-      'descriptive_information': 'descriptive information',
-      'configured': 'configured'
+      'device_identification': 'Device Identification',
+      'device_encoding': 'Device Encoding',
+      'device_name': 'Device Name',
+      'device_type': 'Device Type',
+      'region': 'Region',
+      'sequence_number': 'Sequence Number',
+      'descriptive_information': 'Descriptive Information',
+      'configured': 'Configured',
+      'visible': 'Visible',
+      'create_time': 'Create Time'
     },
     'device_dialog': {
       'zh_device_name': 'ZH-name',
@@ -22,10 +25,10 @@ export default {
       'in_device_name': 'IN-name'
     },
     'driver_configuration': {
-      'basic_information': 'basic information'
+      'basic_information': 'Basic Information'
     },
     'msg': {
-      'delete_msg': 'Are you sure to delete it? If there are subordinate nodes, they will be deleted together. This operation cannot be undone!'
+      'delete_msg': 'Are You Sure To Delete It? If There Are Subordinate Nodes, they Will Be Deleted Together. This Operation Cannot Be Undone!'
     }
   }
 }
diff --git a/acs/nladmin-ui/src/i18n/langs/device/in.js b/acs/nladmin-ui/src/i18n/langs/device/in.js
index 56e73a1..63370ad 100644
--- a/acs/nladmin-ui/src/i18n/langs/device/in.js
+++ b/acs/nladmin-ui/src/i18n/langs/device/in.js
@@ -1,20 +1,23 @@
 export default {
   'device': {
-    'title': 'peralatan',
+    'title': 'Peralatan',
     'placeholder': {
-      'enter_name_code': 'Masukkan nama atau kode',
-      'device_type': 'Jenis perangkat',
-      'please_select': 'Silakan pilih'
+      'enter_name_code': 'Masukkan Nama Atau Kode',
+      'device_type': 'Jenis Perangkat',
+      'please_select': 'Silakan Pilih',
+      'name_code': 'Nama Atau Kode'
     },
     'device_table_title': {
-      'device_identification': 'Identifikasi perangkat',
-      'device_encoding': 'Pengkodean perangkat',
-      'device_name': 'Nama perangkat',
-      'device_type': 'Jenis perangkat',
+      'device_identification': 'Identifikasi Perangkat',
+      'device_encoding': 'Pengkodean Perangkat',
+      'device_name': 'Nama Perangkat',
+      'device_type': 'Jenis Perangkat',
       'region': 'Wilayah',
-      'sequence_number': 'Nomor urut',
-      'descriptive_information': 'Informasi deskriptif',
-      'configured': 'Apakah itu dikonfigurasi'
+      'sequence_number': 'Nomor Urut',
+      'descriptive_information': 'Informasi Deskriptif',
+      'configured': 'Apakah Itu Dikonfigurasi',
+      'visible': 'Terlihat',
+      'create_time': 'Tanggal Pembuatan'
     },
     'device_dialog': {
       'zh_device_name': 'ZH-Nama',
@@ -22,10 +25,10 @@ export default {
       'in_device_name': 'IN-Nama'
     },
     'driver_configuration': {
-      'basic_information': 'Informasi dasar'
+      'basic_information': 'Informasi Dasar'
     },
     'msg': {
-      'delete_msg': 'Apakah Anda yakin untuk menghapusnya? Jika ada nod subordinat, mereka akan dihapus bersama. Operasi ini tidak dapat dibatalkan!'
+      'delete_msg': 'Apakah Anda Yakin Untuk Menghapusnya? Jika Ada Nod Subordinat, Mereka Akan Dihapus Bersama. Operasi Ini Tidak Dapat Dibatalkan!'
     }
   }
 }
diff --git a/acs/nladmin-ui/src/i18n/langs/device/zh.js b/acs/nladmin-ui/src/i18n/langs/device/zh.js
index 767864c..c1a810b 100644
--- a/acs/nladmin-ui/src/i18n/langs/device/zh.js
+++ b/acs/nladmin-ui/src/i18n/langs/device/zh.js
@@ -4,7 +4,8 @@ export default {
     'placeholder': {
       'enter_name_code': '输入名称或者编码',
       'device_type': '设备类型',
-      'please_select': '请选择'
+      'please_select': '请选择',
+      'name_code': '名称或编码'
     },
     'device_table_title': {
       'device_identification': '设备标识',
diff --git a/acs/nladmin-ui/src/i18n/langs/en.js b/acs/nladmin-ui/src/i18n/langs/en.js
index 5f54bde..906b145 100644
--- a/acs/nladmin-ui/src/i18n/langs/en.js
+++ b/acs/nladmin-ui/src/i18n/langs/en.js
@@ -33,7 +33,7 @@ export default {
     'verification_code': 'Code',
     'login_rm': 'Remember Me',
     'login': 'Login',
-    'login_ing': 'Logging in...',
+    'login_ing': 'Logging In...',
     'Create': 'Create',
     'Update': 'Update',
     'Delete': 'Delete',
@@ -64,8 +64,8 @@ export default {
     'startDate': 'StartDate',
     'endDate': 'EndDate',
     'moreMenu': 'MoreMenu',
-    'browses': 'browse',
-    'fz': 'Full screen zoom',
+    'browses': 'Browse',
+    'fz': 'Full Screen Zoom',
     'Tips': 'Tips',
     'Tip1': 'Confirm deletion of selected',
     'Tip2': 'Data?',
@@ -82,19 +82,23 @@ export default {
     'Tip13': 'Are you sure to log out and exit the system?',
     'Tip14': 'WebSocket connection error',
     'Tip15': 'Please enter an icon name',
-    'loading': 'loading...',
-    'synchronous': 'synchronous',
-    'determine': 'determine',
-    'stop': 'stop',
-    'firing': 'firing',
-    'import': 'import',
-    'driver_configuration': 'driver configuration',
-    'create_time': 'create time',
-    'update_time': 'update time',
-    'create_by': 'create people',
-    'update_by': 'update people',
-    'is_on': 'Enable or not',
-    'please': 'please select'
+    'loading': 'Loading...',
+    'synchronous': 'Synchronous',
+    'determine': 'Determine',
+    'stop': 'Stop',
+    'firing': 'Firing',
+    'import': 'Import',
+    'driver_configuration': 'Driver Configuration',
+    'create_time': 'Create Time',
+    'update_time': 'Update Time',
+    'create_by': 'Create People',
+    'update_by': 'Update People',
+    'is_on': 'Enable Or Not',
+    'please': 'Please Select',
+    'true': 'True',
+    'false': 'False',
+    'Running': 'Running',
+    'Paused': 'Paused'
   },
   'monitor': {
     'sys': 'System',
diff --git a/acs/nladmin-ui/src/i18n/langs/english.js b/acs/nladmin-ui/src/i18n/langs/english.js
index 80fae62..73d9664 100644
--- a/acs/nladmin-ui/src/i18n/langs/english.js
+++ b/acs/nladmin-ui/src/i18n/langs/english.js
@@ -17,6 +17,7 @@ import timing from './timing/en'
 import config from './config/en'
 import customPolicy from './customPolicy/en'
 import deviceErrorInfo from './deviceErrorInfo/en'
+import user from './user/en'
 
 export default {
   ...enLocale,
@@ -37,6 +38,7 @@ export default {
   ...monitor,
   ...timing,
   ...config,
-  ...deviceErrorInfo
+  ...deviceErrorInfo,
+  ...user
 }
 
diff --git a/acs/nladmin-ui/src/i18n/langs/history/en.js b/acs/nladmin-ui/src/i18n/langs/history/en.js
index 8a73391..8234a71 100644
--- a/acs/nladmin-ui/src/i18n/langs/history/en.js
+++ b/acs/nladmin-ui/src/i18n/langs/history/en.js
@@ -1,22 +1,23 @@
 export default {
   'TaskRecord': {
     'table': {
-      'Task_code': 'Input task number',
-      'Vehicle_number': 'Input vehicle number',
-      'Task_number': 'Task code(instruction code)',
+      'Task_code': 'Input Task Number',
+      'Vehicle_number': 'Input Vehicle Number',
+      'Task_number': 'Task code(Instruction Code)',
       'Status': 'Status',
-      'Priority': 'Task priority',
-      'Starting_point_two': 'Starting point two',
+      'Priority': 'Task Priority',
+      'Starting_point_two': 'Starting Point Two',
       'Endpoint_two': 'Endpoint Two',
       'Material': 'Material',
       'Quantity': 'Quantity',
       'Numbering': 'Numbering',
       'Value': 'Value',
-      'Input_task_instruction_number': 'Enter task number or instruction number',
-      'Instruction_code': 'Instruction code',
-      'Instruction_status': 'Instruction_status',
+      'Input_task_instruction_number': 'Enter Task Number Or Instruction Number',
+      'Instruction_code': 'Instruction Code',
+      'Instruction_status': 'Instruction Status',
       'Update_by': 'Modifier',
-      'Update_time': 'Modification time'
+      'Update_time': 'Modification Time',
+      'unified_key': 'Unified Key'
     },
     'rules': {
     }
diff --git a/acs/nladmin-ui/src/i18n/langs/history/in.js b/acs/nladmin-ui/src/i18n/langs/history/in.js
index 0d2f1c5..b20a7be 100644
--- a/acs/nladmin-ui/src/i18n/langs/history/in.js
+++ b/acs/nladmin-ui/src/i18n/langs/history/in.js
@@ -1,22 +1,23 @@
 export default {
   'TaskRecord': {
     'table': {
-      'Task_code': 'Input nomor tugas',
-      'Vehicle_number': 'Input nomor kendaraan',
-      'Task_number': 'Nomor tugas(kode instruksi)',
+      'Task_code': 'Input Nomor Tugas',
+      'Vehicle_number': 'Input Nomor Kendaraan',
+      'Task_number': 'Nomor Tugas(Kode Instruksi)',
       'Status': 'Status',
-      'Priority': 'Prioritas tugas',
-      'Starting_point_two': 'Titik awalan dua',
-      'Endpoint_two': 'Titik akhir dua',
+      'Priority': 'Prioritas Tugas',
+      'Starting_point_two': 'Titik Awalan Dua',
+      'Endpoint_two': 'Titik Akhir Dua',
       'Material': 'Bahan',
       'Quantity': 'Jumlah',
       'Numbering': 'Nomor',
       'Value': 'Nilai',
-      'Input_task_instruction_number': 'Masukkan nomor tugas atau nomor instruksi',
-      'Instruction_code': 'Kode instruksi',
-      'Instruction_status': 'Status instruksi',
+      'Input_task_instruction_number': 'Masukkan Nomor Tugas Atau Nomor Instruksi',
+      'Instruction_code': 'Kode Instruksi',
+      'Instruction_status': 'Status Instruksi',
       'Update_by': 'Pengubah',
-      'Update_time': 'Waktu modifikasi'
+      'Update_time': 'Waktu Modifikasi',
+      'unified_key': 'Nilai Unik'
     },
     'rules': {
     }
diff --git a/acs/nladmin-ui/src/i18n/langs/history/zh.js b/acs/nladmin-ui/src/i18n/langs/history/zh.js
index 6383cf3..2e24eca 100644
--- a/acs/nladmin-ui/src/i18n/langs/history/zh.js
+++ b/acs/nladmin-ui/src/i18n/langs/history/zh.js
@@ -16,7 +16,8 @@ export default {
       'Instruction_code': '指令编码',
       'Instruction_status': '指令状态',
       'Update_by': '修改者',
-      'Update_time': '修改时间'
+      'Update_time': '修改时间',
+      'unified_key': '唯一值'
     },
     'rules': {
     }
diff --git a/acs/nladmin-ui/src/i18n/langs/in.js b/acs/nladmin-ui/src/i18n/langs/in.js
index 2e27d17..36ad2bc 100644
--- a/acs/nladmin-ui/src/i18n/langs/in.js
+++ b/acs/nladmin-ui/src/i18n/langs/in.js
@@ -1,7 +1,7 @@
 export default {
-  'lang': 'in',
+  'lang': 'In',
   'common': {
-    'home': 'rumah', // 首页
+    'home': 'Rumah', // 首页
     'Layout_setting': 'Pengaturan Bentangan',
     'Personal_center': 'Pusat Pribadi',
     'Log_out': 'Log Out',
@@ -11,15 +11,15 @@ export default {
     'phone': 'Nomor Ponsel',
     'phone2': 'Ponsel',
     'sex': 'Gender',
-    'sex_male': 'laki-laki',
-    'sex_female': 'wanita',
+    'sex_male': 'Laki-Laki',
+    'sex_female': 'Wanita',
     'email': 'E-mail',
     'Security_settings': 'Pengaturan Keamanan',
     'Save_settings': 'Simpan Pengaturan',
-    'Reset_settings': 'Reset pengaturan',
-    'Change_password': 'Ubah kata sandi',
-    'New_password': 'Kata sandi baru',
-    'Old_password': 'Kata sandi lama',
+    'Reset_settings': 'Reset Pengaturan',
+    'Change_password': 'Ubah Kata Sandi',
+    'New_password': 'Kata Sandi Baru',
+    'Old_password': 'Kata Sandi Lama',
     'Verify_password': 'Konfirmasi Sandi',
     'User_information': 'Informasi Pengguna',
     'Operation_log': 'Log Operasi',
@@ -31,9 +31,9 @@ export default {
     'account': 'Akaun',
     'password': 'Sandi',
     'verification_code': 'Kode',
-    'login_rm': 'Ingat aku',
+    'login_rm': 'Ingat Aku',
     'login': 'Login',
-    'login_ing': 'Daftar masuk',
+    'login_ing': 'Daftar Masuk',
     'Create': 'Buat',
     'Update': 'Kemaskini',
     'Delete': 'Hapus',
@@ -42,11 +42,11 @@ export default {
     'SelectAll': 'Pilih Semua',
     'Query': 'Pertanyaan',
     'Reset': 'Reset',
-    'Confirm': 'konfirmasi',
+    'Confirm': 'Konfirmasi',
     'Cancel': 'Batalkan',
     'Forced_cancellation': 'Pembatalan Paksa',
     'Initialize': 'Menginisialisasi',
-    'Operate': 'operasi',
+    'Operate': 'Operasi',
     'Refresh': 'Segar',
     'Closes': 'Tutup',
     'Closes_l': 'Tutup Sisi Kiri',
@@ -55,7 +55,7 @@ export default {
     'Closes_a': 'Tutup Semua',
     'Theme_style_setting': 'Pengaturan Gaya Tema',
     'Theme_color': 'Warna Tema',
-    'System_layout_configuration': 'Konfigurasi layout sistem',
+    'System_layout_configuration': 'Konfigurasi Layout Sistem',
     'Open': 'Buka',
     'Fixation': 'Tetap',
     'Display': 'Tampilan',
@@ -64,8 +64,8 @@ export default {
     'startDate': 'TarikhAwal',
     'endDate': 'TarikhAkhir',
     'moreMenu': 'LebihBanyakMenu',
-    'browses': 'melayar',
-    'fz': 'Zum layar penuh',
+    'browses': 'Melayar',
+    'fz': 'Zum Layar Penuh',
     'Tips': 'Prompt',
     'Tip1': 'Konfirmasi Penghapusan Yang Dipilih',
     'Tip2': 'Data?',
@@ -84,17 +84,21 @@ export default {
     'Tip15': 'Silakan masukkan nama ikon',
     'loading': 'Memuatkan Data...',
     'synchronous': 'Sinkron',
-    'determine': 'konfirmasi',
-    'stop': 'berhenti',
-    'firing': 'start-up',
+    'determine': 'Konfirmasi',
+    'stop': 'Berhenti',
+    'firing': 'Start Up',
     'import': 'Mengimpor',
-    'driver_configuration': 'Konfigurasi driver',
-    'create_time': 'Buat waktu',
-    'update_time': 'Untuk memperbarui waktu',
-    'create_by': 'Dibuat oleh',
-    'update_by': 'pengubah',
-    'is_on': 'Diaktifkan atau tidak',
-    'please': 'Silahkan pilih'
+    'driver_configuration': 'Konfigurasi Driver',
+    'create_time': 'Buat Waktu',
+    'update_time': 'Untuk Memperbarui Waktu',
+    'create_by': 'Dibuat Oleh',
+    'update_by': 'Pengubah',
+    'is_on': 'Diaktifkan Atau Tidak',
+    'please': 'Silahkan Pilih',
+    'true': 'Ada',
+    'false': 'Tidak',
+    'Running': 'Menjalankan',
+    'Paused': 'Berhenti'
   },
   'monitor': {
     'sys': 'Sistem',
diff --git a/acs/nladmin-ui/src/i18n/langs/indonesian.js b/acs/nladmin-ui/src/i18n/langs/indonesian.js
index ddc65cb..08c39af 100644
--- a/acs/nladmin-ui/src/i18n/langs/indonesian.js
+++ b/acs/nladmin-ui/src/i18n/langs/indonesian.js
@@ -17,6 +17,7 @@ import timing from './timing/in'
 import config from './config/in'
 import customPolicy from './customPolicy/in'
 import deviceErrorInfo from './deviceErrorInfo/in'
+import user from './user/in'
 
 export default {
   ...idLocale,
@@ -38,5 +39,6 @@ export default {
   ...monitor,
   ...config,
   ...timing,
-  ...deviceErrorInfo
+  ...deviceErrorInfo,
+  ...user
 }
diff --git a/acs/nladmin-ui/src/i18n/langs/instruction/en.js b/acs/nladmin-ui/src/i18n/langs/instruction/en.js
index 038a850..9f3cd9f 100644
--- a/acs/nladmin-ui/src/i18n/langs/instruction/en.js
+++ b/acs/nladmin-ui/src/i18n/langs/instruction/en.js
@@ -1,36 +1,36 @@
 export default {
   'Inst': {
     'table': {
-      'instruction_code': 'instruction_code',
-      'instruction_type': 'instruction_type',
-      'task_code': 'task_code',
-      'vehicle_code': 'vehicle_code',
-      'instruction_status': 'instruction_status',
-      'send_status': 'send_status',
-      'start_point_code': 'start_device_code',
-      'next_point_code': 'next_device_code',
-      'put_point_code': 'put_point_code',
-      'execute_device_code': 'execute_device_code',
-      'carno': 'carno',
-      'remark': 'remark',
-      'create_by': 'create_by',
-      'create_time': 'create_time',
-      'update_by': 'update_by',
-      'update_time': 'update_time',
-      'input_taskCode_or_instCode': 'input_taskCode_or_instCode',
-      'input_vehicleCode': 'input_vehicleCode',
-      'material': 'material_type',
-      'task_status': 'task_status',
-      'input_startCode_or_nextCode': 'input_startCode_or_nextCode',
-      'ready': 'ready',
+      'instruction_code': 'Instruction Code',
+      'instruction_type': 'Instruction Type',
+      'task_code': 'Task Code',
+      'vehicle_code': 'Vehicle Code',
+      'instruction_status': 'Instruction Status',
+      'send_status': 'Send Status',
+      'start_point_code': 'Start Device Code',
+      'next_point_code': 'Next Device Code',
+      'put_point_code': 'Put Point Code',
+      'execute_device_code': 'Execute Device Code',
+      'carno': 'Carno',
+      'remark': 'Remark',
+      'create_by': 'Created By',
+      'create_time': 'Create Time',
+      'update_by': 'Update By',
+      'update_time': 'Update Time',
+      'input_taskCode_or_instCode': 'Input TaskCode Or InstCode',
+      'input_vehicleCode': 'Input VehicleCode',
+      'material': 'Material Type',
+      'task_status': 'Task Status',
+      'input_startCode_or_nextCode': 'Input StartCode Or NextCode',
+      'ready': 'Ready',
       'Execution': 'Execution',
       'Finish': 'Finish',
-      'undelivered': 'undelivered',
-      'succeed': 'succeed',
-      'fail': 'fail'
+      'undelivered': 'Undelivered',
+      'succeed': 'Succeed',
+      'fail': 'Fail'
     },
     'rules': {
-      'NotNull': 'Cannot be empty'
+      'NotNull': 'Cannot Be Empty'
     }
   }
 }
diff --git a/acs/nladmin-ui/src/i18n/langs/instruction/in.js b/acs/nladmin-ui/src/i18n/langs/instruction/in.js
index 4f043ba..d03b471 100644
--- a/acs/nladmin-ui/src/i18n/langs/instruction/in.js
+++ b/acs/nladmin-ui/src/i18n/langs/instruction/in.js
@@ -10,27 +10,27 @@ export default {
       'start_point_code': 'Titik Penjemputan',
       'next_point_code': 'Titik Pengantaran',
       'put_point_code': 'Titik Pembuangan',
-      'execute_device_code': 'Perangkat eksekusi',
-      'carno': 'Nomor kendaraan',
-      'remark': 'deskripsi',
-      'create_by': 'Dibuat oleh',
-      'create_time': 'Waktu pembuatan',
-      'update_by': 'Diubah oleh',
-      'update_time': 'Ubah waktu',
-      'input_taskCode_or_instCode': 'Masukkan nomor tugas atau nomor instruksi',
-      'input_vehicleCode': 'Masukkan nomor kendaraan',
-      'material': 'Jenis barang',
-      'task_status': 'Status tugas',
-      'input_startCode_or_nextCode': 'Jenis barang',
-      'ready': 'siap',
+      'execute_device_code': 'Perangkat Eksekusi',
+      'carno': 'Nomor Kendaraan',
+      'remark': 'Deskripsi',
+      'create_by': 'Dibuat Oleh',
+      'create_time': 'Waktu Pembuatan',
+      'update_by': 'Diubah Oleh',
+      'update_time': 'Ubah Waktu',
+      'input_taskCode_or_instCode': 'Masukkan Nomor Tugas Atau Nomor Instruksi',
+      'input_vehicleCode': 'Masukkan Nomor Kendaraan',
+      'material': 'Jenis Barang',
+      'task_status': 'Status Tugas',
+      'input_startCode_or_nextCode': 'Jenis Barang',
+      'ready': 'Siap',
       'Execution': 'Eksekusi',
-      'Finish': 'selesai',
-      'undelivered': 'Tidak terkirim',
-      'succeed': 'berhasil',
-      'fail': 'gagal'
+      'Finish': 'Selesai',
+      'undelivered': 'Tidak Terkirim',
+      'succeed': 'Berhasil',
+      'fail': 'Gagal'
     },
     'rules': {
-      'NotNull': 'Cannot be empty'
+      'NotNull': 'Cannot Be Empty'
     }
   }
 }
diff --git a/acs/nladmin-ui/src/i18n/langs/menu/en.js b/acs/nladmin-ui/src/i18n/langs/menu/en.js
index 3e17f1d..73b924c 100644
--- a/acs/nladmin-ui/src/i18n/langs/menu/en.js
+++ b/acs/nladmin-ui/src/i18n/langs/menu/en.js
@@ -2,23 +2,23 @@ export default {
   'menu': {
     'title': 'Menu',
     'placeholder': {
-      'fuzzy_search': 'fuzzy search',
-      'owning_system': 'system',
-      'choose_icon': 'choose icon',
-      'component_tip': 'match the Name field within the component',
-      'choose_superior_category': 'choose superior category'
+      'fuzzy_search': 'Fuzzy Search',
+      'owning_system': 'System',
+      'choose_icon': 'Choose Icon',
+      'component_tip': 'Match The Name Field Within The Component',
+      'choose_superior_category': 'Choose Superior Category'
     },
     'table_title': {
-      'menu_title': 'title',
-      'system': 'system',
-      'icon': 'icon',
-      'sort': 'sort',
-      'permission_ident': 'permission mark',
-      'path': 'path',
-      'outside_chain': 'out chain',
-      'cache': 'cache',
-      'visible': 'visible',
-      'create_time': 'create time'
+      'menu_title': 'Title',
+      'system': 'System',
+      'icon': 'Icon',
+      'sort': 'Sort',
+      'permission_ident': 'Permission Mark',
+      'path': 'Path',
+      'outside_chain': 'Out Chain',
+      'cache': 'Cache',
+      'visible': 'Visible',
+      'create_time': 'Create Time'
     },
     'dialog': {
       'menu_type': 'Menu Type',
@@ -42,7 +42,7 @@ export default {
       'superior_class': 'Superior Class'
     },
     'msg': {
-      'delete_msg': 'Are you sure to delete it? If there are subordinate nodes, they will be deleted together. This operation cannot be undone!'
+      'delete_msg': 'Are You Sure To Delete It? If There Are Subordinate Nodes, They Will Be Deleted Together. This Operation Cannot Be Undone!'
     }
   }
 }
diff --git a/acs/nladmin-ui/src/i18n/langs/menu/in.js b/acs/nladmin-ui/src/i18n/langs/menu/in.js
index 163e09f..25ca975 100644
--- a/acs/nladmin-ui/src/i18n/langs/menu/in.js
+++ b/acs/nladmin-ui/src/i18n/langs/menu/in.js
@@ -1,24 +1,24 @@
 export default {
   'menu': {
-    'title': '菜单',
+    'title': 'Menu',
     'placeholder': {
-      'fuzzy_search': 'pencarian kabur',
-      'owning_system': 'sistem terkait',
-      'choose_icon': 'Klik pada ikon pemilihan',
-      'component_tip': 'Cocok medan Nama dalam komponen',
-      'choose_superior_category': 'Pilih kategori superior'
+      'fuzzy_search': 'Pencarian Kabur',
+      'owning_system': 'Sistem Terkait',
+      'choose_icon': 'Klik Pada Ikon Pemilihan',
+      'component_tip': 'Cocok Medan Nama Dalam Komponen',
+      'choose_superior_category': 'Pilih Kategori Superior'
     },
     'table_title': {
-      'menu_title': 'title',
-      'system': 'sistem',
-      'icon': 'ikon',
-      'sort': 'sort',
-      'permission_ident': 'otoritas',
-      'path': 'assembly',
-      'outside_chain': 'rantai luar',
-      'cache': 'cache',
-      'visible': 'terlihat',
-      'create_time': 'tarikh penciptaan'
+      'menu_title': 'Title',
+      'system': 'Sistem',
+      'icon': 'Ikon',
+      'sort': 'Sort',
+      'permission_ident': 'Otoritas',
+      'path': 'Assembly',
+      'outside_chain': 'Rantai Luar',
+      'cache': 'Cache',
+      'visible': 'Terlihat',
+      'create_time': 'Tarikh Penciptaan'
     },
     'dialog': {
       'menu_type': 'Jenis Menu',
@@ -42,7 +42,7 @@ export default {
       'superior_class': 'Kategori Tertinggi'
     },
     'msg': {
-      'delete_msg': 'Apakah Anda yakin untuk menghapusnya? Jika ada nod subordinat, mereka akan dihapus bersama. Operasi ini tidak dapat dibatalkan!'
+      'delete_msg': 'Apakah Anda Yakin Untuk Menghapusnya? Jika Ada Nod Subordinat, Mereka Akan Dihapus Bersama. Operasi Ini Tidak Dapat Dibatalkan!'
     }
   }
 }
diff --git a/acs/nladmin-ui/src/i18n/langs/monitor/en.js b/acs/nladmin-ui/src/i18n/langs/monitor/en.js
index 5ee279a..19c9f4e 100644
--- a/acs/nladmin-ui/src/i18n/langs/monitor/en.js
+++ b/acs/nladmin-ui/src/i18n/langs/monitor/en.js
@@ -3,41 +3,41 @@ export default {
     'table': {
       'clear': 'Clear',
       'username': 'Username',
-      'IP_source': 'IP source',
+      'IP_source': 'IP Source',
       'description': 'Description',
       'browser': 'Browser',
-      'create_time': 'Creation time',
-      'exception_details': 'Exception details',
-      'view_details': 'View details',
-      'clear_log': 'Are you sure you want to clear all exception logs?',
+      'create_time': 'Creation Time',
+      'exception_details': 'Exception Details',
+      'view_details': 'View Details',
+      'clear_log': 'Are You Sure You Want To Clear All Exception Logs?',
       'prompt': 'Prompt',
       'confirm': 'Confirm',
       'cancel': 'Cancel',
       'request_time': 'Request Time',
-      'search': 'Please enter the content you want to search'
+      'search': 'Please Enter The Content You Want To Search'
     },
     'lucence': {
       'operate': 'Operation',
-      'device_code': 'Device number',
-      'task_code': 'Task code',
-      'instruct_code': 'Instruction code',
+      'device_code': 'Device Number',
+      'task_code': 'Task Code',
+      'instruct_code': 'Instruction Code',
       'method': 'Method',
-      'status_code': 'Status code',
-      'requestparam': 'Request parameter',
-      'responseparam': 'Return parameter',
+      'status_code': 'Status Code',
+      'requestparam': 'Request Parameter',
+      'responseparam': 'Return Parameter',
       'logTime': 'Timestamp',
-      'content': 'Content details',
-      'method_name': 'Please enter the method name you want to search.',
-      'search_status_code': 'Please enter the status code you want to search.',
-      'search_request_param': 'Please enter the request parameter you want to search.',
-      'search_response_param': 'Please enter the response parameter you want to search.',
-      'search_content': 'Please enter the details of the content you want to search.',
+      'content': 'Content Details',
+      'method_name': 'Please Enter The Method Name You Want To Search.',
+      'search_status_code': 'Please Enter The Status Code You Want To Search.',
+      'search_request_param': 'Please Enter The Request Parameter You Want To Search.',
+      'search_response_param': 'Please Enter The Response Parameter You Want To Search.',
+      'search_content': 'Please Enter The Details Of The Content You Want To Search.',
       'until': 'Until',
-      'start_time': 'start date',
-      'end_time': 'End date',
-      'the_past_week': 'The past week',
-      'the_past_month': 'The past month',
-      'the_past_three_months': 'The past three months'
+      'start_time': 'Start Date',
+      'end_time': 'End Date',
+      'the_past_week': 'The Past Week',
+      'the_past_month': 'The Past Month',
+      'the_past_three_months': 'The Past Three Months'
     }
   }
 }
diff --git a/acs/nladmin-ui/src/i18n/langs/monitor/in.js b/acs/nladmin-ui/src/i18n/langs/monitor/in.js
index 4ff4ca4..1a2b9ec 100644
--- a/acs/nladmin-ui/src/i18n/langs/monitor/in.js
+++ b/acs/nladmin-ui/src/i18n/langs/monitor/in.js
@@ -2,42 +2,42 @@ export default {
   'monitor': {
     'table': {
       'clear': 'Mengosongkan',
-      'username': 'Nama pengguna',
+      'username': 'Nama Pengguna',
       'IP_source': 'Sumber IP',
       'description': 'Deskripsi',
       'browser': 'Peramban',
-      'create_time': 'Waktu pembuatan',
-      'exception_details': 'Detail pengecualian',
-      'view_details': 'Lihat detail',
-      'clear_log': 'Anda yakin ingin menghapus semua log pengecualian?',
+      'create_time': 'Waktu Pembuatan',
+      'exception_details': 'Detail Pengecualian',
+      'view_details': 'Lihat Detail',
+      'clear_log': 'Anda Yakin Ingin Menghapus Semua Log Pengecualian?',
       'prompt': 'Peringatan',
       'confirm': 'Konfirmasi',
       'cancel': 'Batal',
       'request_time': 'Waktu Permintaan',
-      'search': 'Silakan masukkan konten yang ingin Anda cari'
+      'search': 'Silakan Masukkan Konten Yang Ingin Anda Cari'
     },
     'lucence': {
       'operate': 'Operasi',
-      'device_code': 'Nomor perangkat',
-      'task_code': 'Kode tugas',
-      'instruct_code': 'Kode instruksi',
+      'device_code': 'Nomor Perangkat',
+      'task_code': 'Kode Tugas',
+      'instruct_code': 'Kode Instruksi',
       'method': 'Metode',
-      'status_code': 'Kode status',
-      'requestparam': 'Parameter permintaan',
-      'responseparam': 'Parameter pengembalian',
-      'logTime': 'Stempel waktu',
-      'content': 'Rincian konten',
-      'method_name': 'Silakan masukkan nama metode yang ingin Anda cari.',
-      'search_status_code': 'Silakan masukkan kode status yang ingin Anda cari.',
-      'search_request_param': 'Silakan masukkan parameter permintaan yang ingin Anda cari.',
-      'search_response_param': 'Silakan masukkan parameter respons yang ingin Anda cari.',
-      'search_content': 'Silakan masukkan rincian konten yang ingin Anda cari.',
+      'status_code': 'Kode Status',
+      'requestparam': 'Parameter Permintaan',
+      'responseparam': 'Parameter Pengembalian',
+      'logTime': 'Stempel Waktu',
+      'content': 'Rincian Konten',
+      'method_name': 'Silakan Masukkan Nama Metode Yang Ingin Anda Cari.',
+      'search_status_code': 'Silakan Masukkan Kode Status Yang Ingin Anda Cari.',
+      'search_request_param': 'Silakan Masukkan Parameter Permintaan Yang Ingin Anda Cari.',
+      'search_response_param': 'Silakan Masukkan Parameter Respons Yang Ingin Anda Cari.',
+      'search_content': 'Silakan Masukkan Rincian Konten Yang Ingin Anda Cari.',
       'until': 'Sampai',
-      'start_time': 'Tanggal mulai',
-      'end_time': 'Tanggal berakhir',
-      'the_past_week': 'Minggu terakhir',
-      'the_past_month': 'Bulan terakhir',
-      'the_past_three_months': 'Tiga bulan terakhir'
+      'start_time': 'Tanggal Mulai',
+      'end_time': 'Tanggal Berakhir',
+      'the_past_week': 'Minggu Terakhir',
+      'the_past_month': 'Bulan Terakhir',
+      'the_past_three_months': 'Tiga Bulan Terakhir'
     }
   }
 }
diff --git a/acs/nladmin-ui/src/i18n/langs/opc/en.js b/acs/nladmin-ui/src/i18n/langs/opc/en.js
index 364d033..30b670f 100644
--- a/acs/nladmin-ui/src/i18n/langs/opc/en.js
+++ b/acs/nladmin-ui/src/i18n/langs/opc/en.js
@@ -2,23 +2,29 @@ export default {
   'opc': {
     'title': 'OPC',
     'placeholder': {
-      'enter_name_code_path': 'enter a name or code or path'
+      'enter_name_code_path': 'Enter A Name Or Code Or Path',
+      'name_code_path': 'Name Code Address',
+      'name_code': 'Name Or Code'
     },
     'table_title': {
-      'opc_code': 'OPC code',
-      'opc_name': 'OPC name',
-      'opc_address': 'OPC address',
-      'program_id': 'program ID',
-      'registry_id': 'registry ID',
-      'remark': 'remark',
-      'plc_code': 'PLC code',
-      'plc_name': 'PLC name',
-      'plc_address': 'PLC address',
-      'type': 'type',
-      'plc_add': 'plc add'
+      'opc_code': 'OPC Code',
+      'opc_name': 'OPC Name',
+      'opc_address': 'OPC Address',
+      'program_id': 'Program ID',
+      'registry_id': 'Registry ID',
+      'remark': 'Remark',
+      'plc_code': 'PLC Code',
+      'plc_name': 'PLC Name',
+      'plc_address': 'PLC Address',
+      'type': 'Type',
+      'plc_add': 'Plc Add',
+      'domain': 'Domain'
+    },
+    'dialog': {
+      'detail': 'Detail'
     },
     'msg': {
-      'delete_msg': 'Are you sure to delete it? If there are subordinate nodes, they will be deleted together. This operation cannot be undone!'
+      'delete_msg': 'Are You Sure To Delete It? If There Are Subordinate Nodes, They Will Be Deleted Together. This Operation Cannot Be Undone!'
     }
   }
 }
diff --git a/acs/nladmin-ui/src/i18n/langs/opc/in.js b/acs/nladmin-ui/src/i18n/langs/opc/in.js
index c007ed0..163ce36 100644
--- a/acs/nladmin-ui/src/i18n/langs/opc/in.js
+++ b/acs/nladmin-ui/src/i18n/langs/opc/in.js
@@ -2,23 +2,29 @@ export default {
   'opc': {
     'title': 'OPC',
     'placeholder': {
-      'enter_name_code_path': 'Masukkan nama, kode atau pencarian alamat'
+      'enter_name_code_path': 'Masukkan Nama, Kode Atau Pencarian Alamat',
+      'name_code_path': 'Nama, Kode, Atau Alamat',
+      'name_code': 'Nama, Kode Atau'
     },
     'table_title': {
-      'opc_code': 'opc kode',
-      'opc_name': 'opc nama',
-      'opc_address': 'opc alamat',
-      'program_id': 'Program id',
+      'opc_code': 'Opc Kode',
+      'opc_name': 'Opc Nama',
+      'opc_address': 'Opc Alamat',
+      'program_id': 'Program Id',
       'registry_id': 'Pendaftaran ID',
-      'remark': 'informasi',
-      'plc_code': 'PLC kode',
-      'plc_name': 'PLC nama',
-      'plc_address': 'PLC alamat',
-      'type': 'jenis',
-      'plc_add': 'PLC baru'
+      'remark': 'Informasi',
+      'plc_code': 'PLC Kode',
+      'plc_name': 'PLC Nama',
+      'plc_address': 'PLC Alamat',
+      'type': 'Jenis',
+      'plc_add': 'PLC Baru',
+      'domain': 'Wilayah'
+    },
+    'dialog': {
+      'detail': 'Detail'
     },
     'msg': {
-      'delete_msg': 'Apakah Anda yakin untuk menghapusnya? Jika ada nod subordinat, mereka akan dihapus bersama. Operasi ini tidak dapat dibatalkan!'
+      'delete_msg': 'Apakah Anda Yakin Untuk Menghapusnya? Jika Ada Nod Subordinat, Mereka Akan Dihapus Bersama. Operasi Ini Tidak Dapat Dibatalkan!'
     }
   }
 }
diff --git a/acs/nladmin-ui/src/i18n/langs/opc/zh.js b/acs/nladmin-ui/src/i18n/langs/opc/zh.js
index d2882e7..4356cfd 100644
--- a/acs/nladmin-ui/src/i18n/langs/opc/zh.js
+++ b/acs/nladmin-ui/src/i18n/langs/opc/zh.js
@@ -2,7 +2,9 @@ export default {
   'opc': {
     'title': 'OPC',
     'placeholder': {
-      'enter_name_code_path': '输入名称、编码或者地址搜索'
+      'enter_name_code_path': '输入名称、编码或者地址搜索',
+      'name_code_path': '名称、编码或者地址',
+      'name_code': '名称或者编码'
     },
     'table_title': {
       'opc_code': 'OPC编码',
@@ -15,7 +17,11 @@ export default {
       'plc_name': 'PLC名称',
       'plc_address': 'PLC地址',
       'type': '类型',
-      'plc_add': '新增PLC'
+      'plc_add': '新增PLC',
+      'domain': '域'
+    },
+    'dialog': {
+      'detail': '详情'
     },
     'msg': {
       'delete_msg': '确定删除吗,如果存在下级节点则一并删除，此操作不能撤销！'
diff --git a/acs/nladmin-ui/src/i18n/langs/param/en.js b/acs/nladmin-ui/src/i18n/langs/param/en.js
index 7255108..b445381 100644
--- a/acs/nladmin-ui/src/i18n/langs/param/en.js
+++ b/acs/nladmin-ui/src/i18n/langs/param/en.js
@@ -1,13 +1,13 @@
 export default {
   'SysParam': {
     'table': {
-      'code': 'code',
-      'name': 'name',
-      'values': 'value',
-      'description': 'remark'
+      'code': 'Code',
+      'name': 'Name',
+      'values': 'Value',
+      'description': 'Remark'
     },
     'rules': {
-      'NotNull': 'Cannot be empty'
+      'NotNull': 'Cannot Be Empty'
     }
   }
 }
diff --git a/acs/nladmin-ui/src/i18n/langs/param/in.js b/acs/nladmin-ui/src/i18n/langs/param/in.js
index 29b2312..c5fd27d 100644
--- a/acs/nladmin-ui/src/i18n/langs/param/in.js
+++ b/acs/nladmin-ui/src/i18n/langs/param/in.js
@@ -1,13 +1,13 @@
 export default {
   'SysParam': {
     'table': {
-      'code': 'kode',
-      'name': 'nama',
-      'values': 'nilai',
+      'code': 'Kode',
+      'name': 'Nama',
+      'values': 'Nilai',
       'description': 'Catatan'
     },
     'rules': {
-      'NotNull': 'Tidak dapat kosong'
+      'NotNull': 'Tidak Dapat Kosong'
     }
   }
 }
diff --git a/acs/nladmin-ui/src/i18n/langs/protocol/en.js b/acs/nladmin-ui/src/i18n/langs/protocol/en.js
index 934057a..513a453 100644
--- a/acs/nladmin-ui/src/i18n/langs/protocol/en.js
+++ b/acs/nladmin-ui/src/i18n/langs/protocol/en.js
@@ -1,12 +1,12 @@
 export default {
   'protocol': {
     'table_title': {
-      'driver_code': 'driver code',
-      'extra_code': 'extra code',
-      'extra_name': 'extra code'
+      'driver_code': 'Driver Code',
+      'extra_code': 'Extra Code',
+      'extra_name': 'Extra Code'
     },
     'msg': {
-      'delete_msg': 'Are you sure to delete it? If there are subordinate nodes, they will be deleted together. This operation cannot be undone!'
+      'delete_msg': 'Are You Sure To Delete It? If There Are Subordinate Nodes, They Will Be Deleted Together. This Operation Cannot Be Undone!'
     }
   }
 }
diff --git a/acs/nladmin-ui/src/i18n/langs/protocol/in.js b/acs/nladmin-ui/src/i18n/langs/protocol/in.js
index 5e33f7e..b8050ea 100644
--- a/acs/nladmin-ui/src/i18n/langs/protocol/in.js
+++ b/acs/nladmin-ui/src/i18n/langs/protocol/in.js
@@ -1,12 +1,12 @@
 export default {
   'protocol': {
     'table_title': {
-      'driver_code': 'drive ',
-      'ekstra_code': 'protokol no',
-      'ekstra_name': 'nilai kesepakatan'
+      'driver_code': 'Pengkodean Drive',
+      'extra_code': 'protokol No',
+      'extra_name': 'Nilai kesepakatan'
     },
     'msg': {
-      'delete_msg': 'Apakah Anda yakin untuk menghapusnya? Jika ada nod subordinat, mereka akan dihapus bersama. Operasi ini tidak dapat dibatalkan!'
+      'delete_msg': 'Apakah Anda Yakin Untuk Menghapusnya? Jika Ada Nod Subordinat, Mereka Akan Dihapus Bersama. Operasi Ini Tidak Dapat Dibatalkan!'
     }
   }
 }
diff --git a/acs/nladmin-ui/src/i18n/langs/protocol/zh.js b/acs/nladmin-ui/src/i18n/langs/protocol/zh.js
index c14ee50..b498b24 100644
--- a/acs/nladmin-ui/src/i18n/langs/protocol/zh.js
+++ b/acs/nladmin-ui/src/i18n/langs/protocol/zh.js
@@ -1,7 +1,7 @@
 export default {
   'protocol': {
     'table_title': {
-      'driver_code': '驱动',
+      'driver_code': '驱动编码',
       'extra_code': '协议编号',
       'extra_name': '协议值'
     },
diff --git a/acs/nladmin-ui/src/i18n/langs/role/en.js b/acs/nladmin-ui/src/i18n/langs/role/en.js
new file mode 100644
index 0000000..e69de29
diff --git a/acs/nladmin-ui/src/i18n/langs/role/in.js b/acs/nladmin-ui/src/i18n/langs/role/in.js
new file mode 100644
index 0000000..e69de29
diff --git a/acs/nladmin-ui/src/i18n/langs/role/zh.js b/acs/nladmin-ui/src/i18n/langs/role/zh.js
new file mode 100644
index 0000000..e69de29
diff --git a/acs/nladmin-ui/src/i18n/langs/route/en.js b/acs/nladmin-ui/src/i18n/langs/route/en.js
index e99a273..efe8aca 100644
--- a/acs/nladmin-ui/src/i18n/langs/route/en.js
+++ b/acs/nladmin-ui/src/i18n/langs/route/en.js
@@ -1,26 +1,26 @@
 export default {
   'route': {
-    'title1': 'Routing route',
-    'title2': 'Routing scheme',
+    'title1': 'Routing Route',
+    'title2': 'Routing Scheme',
     'placeholder': {
-      'enter_code': 'Please enter the device number',
-      'enter_next_device_code': 'Please enter the post-device number',
-      'please_type': 'Please enter Route type'
+      'enter_code': 'Please Enter The Device Number',
+      'enter_next_device_code': 'Please Enter The Post-device Number',
+      'please_type': 'Please Enter Route Type'
     },
     'table_title': {
-      'route_plan_id': 'Routing scheme',
-      'device_code': 'current device name',
-      'next_device_code': 'post-device name',
-      'type': 'Route type',
-      'transport_route': 'transport_route',
-      'agv_route': 'agv route',
-      'weights': 'weights',
-      'remark': 'description information',
-      'code': 'code',
-      'name': 'name'
+      'route_plan_id': 'Routing Scheme',
+      'device_code': 'Current Device Name',
+      'next_device_code': 'Post Device Name',
+      'type': 'Route Type',
+      'transport_route': 'Transport Route',
+      'agv_route': 'AGV Route',
+      'weights': 'Weights',
+      'remark': 'Description Information',
+      'code': 'Code',
+      'name': 'Name'
     },
     'msg': {
-      'delete_msg': 'Are you sure to delete it? If there are subordinate nodes, they will be deleted together. This operation cannot be undone!'
+      'delete_msg': 'Are You Sure To Delete It? If There Are Subordinate Nodes, They Will Be Deleted Together. This Operation Cannot Be Undone!'
     }
   }
 }
diff --git a/acs/nladmin-ui/src/i18n/langs/route/in.js b/acs/nladmin-ui/src/i18n/langs/route/in.js
index 350e2e2..88632d8 100644
--- a/acs/nladmin-ui/src/i18n/langs/route/in.js
+++ b/acs/nladmin-ui/src/i18n/langs/route/in.js
@@ -1,26 +1,26 @@
 export default {
   'route': {
-    'title1': 'Rute rute',
-    'title2': 'Skema routing',
+    'title1': 'Rute Rute',
+    'title2': 'Skema Routing',
     'placeholder': {
-      'enter_code': 'Silakan masukkan nomor perangkat anda',
-      'enter_next_device_code': 'Silahkan masukkan nomor perangkat belakang',
-      'please_type': 'Silahkan pilih jenis routing'
+      'enter_code': 'Silakan Masukkan Nomor Perangkat Anda',
+      'enter_next_device_code': 'Silahkan Masukkan Nomor Perangkat Belakang',
+      'please_type': 'Silahkan Pilih Jenis Routing'
     },
     'table_title': {
-      'route_plan_id': 'skema rute ',
-      'device_code': 'nama divais saat ini',
-      'next_device_code': 'nama perangkat rear',
-      'type': 'jenis rute',
-      'transport_rute': 'rute pengiriman',
-      'agv_rute': 'agv rute',
-      'weights': 'kanan',
-      'remark': 'deskripsi pesan',
-      'code': 'kode',
+      'route_plan_id': 'Skema Rute ',
+      'device_code': 'Nama Divais Saat Ini',
+      'next_device_code': 'Nama Perangkat Rear',
+      'type': 'Jenis Rute',
+      'transport_rute': 'Rute Pengiriman',
+      'agv_rute': 'Agv Rute',
+      'weights': 'Kanan',
+      'remark': 'Deskripsi Pesan',
+      'code': 'Kode',
       'name': 'Nama'
     },
     'msg': {
-      'delete_msg': 'Apakah Anda yakin untuk menghapusnya? Jika ada nod subordinat, mereka akan dihapus bersama. Operasi ini tidak dapat dibatalkan!'
+      'delete_msg': 'Apakah Anda Yakin Untuk Menghapusnya? Jika Ada Nod Subordinat, Mereka Akan Dihapus Bersama. Operasi Ini Tidak Dapat Dibatalkan!'
     }
   }
 }
diff --git a/acs/nladmin-ui/src/i18n/langs/storageCell/en.js b/acs/nladmin-ui/src/i18n/langs/storageCell/en.js
index 4a32817..7b61753 100644
--- a/acs/nladmin-ui/src/i18n/langs/storageCell/en.js
+++ b/acs/nladmin-ui/src/i18n/langs/storageCell/en.js
@@ -1,22 +1,23 @@
 export default {
   'storageCell': {
-    'title': 'Storage location management',
+    'title': 'Storage Location Management',
     'placeholder': {
-      'enter_location_code': 'enter location code',
-      'enter_parent_location_code': 'enter parent location code',
-      'enter_agv_site': 'enter agv site'
+      'enter_location_code': 'Enter Location Code',
+      'enter_parent_location_code': 'Enter Parent Location Code',
+      'enter_agv_site': 'Enter Agv Site'
     },
     'table_title': {
-      'storage_code': 'storage code',
-      'x': 'x',
-      'y': 'y',
-      'z': 'z',
-      'address': 'AGV address',
-      'parent_storage_code': 'parent storage code',
-      'remark': 'remark'
+      'storage_code': 'Storage Code',
+      'x': 'X',
+      'y': 'Y',
+      'z': 'Z',
+      'address': 'AGV Address',
+      'parent_storage_code': 'Parent Storage Code',
+      'remark': 'Remark',
+      'agv_site': 'AGV Site'
     },
     'msg': {
-      'delete_msg': 'Are you sure to delete it? If there are subordinate nodes, they will be deleted together. This operation cannot be undone!'
+      'delete_msg': 'Are You Sure To Delete It? If There Are Subordinate Nodes, They Will Be Deleted Together. This Operation Cannot Be Undone!'
     }
   }
 }
diff --git a/acs/nladmin-ui/src/i18n/langs/storageCell/in.js b/acs/nladmin-ui/src/i18n/langs/storageCell/in.js
index 9bee7f0..9e6f89c 100644
--- a/acs/nladmin-ui/src/i18n/langs/storageCell/in.js
+++ b/acs/nladmin-ui/src/i18n/langs/storageCell/in.js
@@ -1,22 +1,23 @@
 export default {
   'storageCell': {
-    'title': 'Manajemen pustaka',
+    'title': 'Manajemen Pustaka',
     'placeholder': {
-      'enter_location_code': 'Sebenarnyayangsangatbaik',
-      'enter_parent_location_code': 'Kucicipi berapamu kucicipi',
-      'enter_agv_site': 'Diterjemahkan oleh'
+      'enter_location_code': 'Masukkan Kode Lokasi',
+      'enter_parent_location_code': 'Kucicipi Berapamu Kucicipi',
+      'enter_agv_site': 'Diterjemahkan Oleh'
     },
     'table_title': {
-      'storage_code': 'Kode lokasi',
-      'x': 'x',
-      'y': 'y',
-      'z': 'z',
+      'storage_code': 'Kode Lokasi',
+      'x': 'X',
+      'y': 'Y',
+      'z': 'Z',
       'address': 'AGV Mengkodekan',
-      'parent_storage_code': 'Kode sistem induk',
-      'remark': 'Informasi'
+      'parent_storage_code': 'Kode Sistem Induk',
+      'remark': 'Informasi',
+      'agv_site': 'Situs AGV'
     },
     'msg': {
-      'delete_msg': 'Apakah Anda yakin untuk menghapusnya? Jika ada nod subordinat, mereka akan dihapus bersama. Operasi ini tidak dapat dibatalkan!'
+      'delete_msg': 'Apakah Anda Yakin Untuk Menghapusnya? Jika Ada Nod Subordinat, Mereka Akan Dihapus Bersama. Operasi Ini Tidak Dapat Dibatalkan!'
     }
   }
 }
diff --git a/acs/nladmin-ui/src/i18n/langs/storageCell/zh.js b/acs/nladmin-ui/src/i18n/langs/storageCell/zh.js
index b3f20af..8d3086c 100644
--- a/acs/nladmin-ui/src/i18n/langs/storageCell/zh.js
+++ b/acs/nladmin-ui/src/i18n/langs/storageCell/zh.js
@@ -13,7 +13,8 @@ export default {
       'z': '层',
       'address': 'AGV编码',
       'parent_storage_code': '父级系统编码',
-      'remark': '备注'
+      'remark': '备注',
+      'agv_site': 'AGV站点'
     },
     'msg': {
       'delete_msg': '确定删除吗,如果存在下级节点则一并删除，此操作不能撤销！'
diff --git a/acs/nladmin-ui/src/i18n/langs/task/en.js b/acs/nladmin-ui/src/i18n/langs/task/en.js
index e0b34b6..dc6cafb 100644
--- a/acs/nladmin-ui/src/i18n/langs/task/en.js
+++ b/acs/nladmin-ui/src/i18n/langs/task/en.js
@@ -1,74 +1,76 @@
 export default {
   'task': {
     'txt_box': {
-      'Enter_task_number': 'Enter task number',
-      'Vehicle_registration_number': 'Vehicle registration number',
-      'Material_type': 'Material type',
-      'Task_status': 'Task status',
-      'Origin_or_destination': 'Origin or destination',
-      'Task_type': 'Task type',
-      'Warehouse_task_type': 'Warehouse task type',
-      'AGV_system': 'AGV system',
-      'Routing_scheme': 'Routing scheme',
+      'Enter_task_number': 'Enter Task Number',
+      'Vehicle_registration_number': 'Vehicle Registration Number',
+      'Material_type': 'Material Type',
+      'Task_status': 'Task Status',
+      'Origin_or_destination': 'Origin Or Destination',
+      'Task_type': 'Task Type',
+      'Warehouse_task_type': 'Warehouse Task Type',
+      'AGV_system': 'AGV System',
+      'Routing_scheme': 'Routing Scheme',
       'Priority': 'Priority',
-      'Vehicle_number': 'Vehicle number',
-      'Task_code': 'Task code',
-      'Task': 'Task'
+      'Vehicle_number': 'Vehicle Number',
+      'Task_code': 'Task Code',
+      'Task': 'Task',
+      'start_or_end': 'Origin Or Destination',
+      'time': 'Time'
     },
     'select': {
       'Placeholder': 'Select',
-      'Start_point': 'Start point',
-      'Starting_column': 'Starting column',
-      'Starting_layer': 'Starting layer',
+      'Start_point': 'Start Point',
+      'Starting_column': 'Starting Column',
+      'Starting_layer': 'Starting Layer',
       'Destination': 'Destination',
-      'Ending_column': 'Ending column',
-      'Ending_layer': 'Ending layer',
+      'Ending_column': 'Ending Column',
+      'Ending_layer': 'Ending Layer',
       'Description': 'Description',
       'Cancel': 'Cancel',
       'Confirm': 'Confirm',
       'Ready': 'Ready',
-      'In_progress': 'In progress',
+      'In_progress': 'In Progress',
       'Completed': 'Completed',
-      'Pickup_point': 'Pickup point',
-      'Delivery_point': 'Delivery point',
+      'Pickup_point': 'Pickup Point',
+      'Delivery_point': 'Delivery Point',
       'Remark': 'Remark',
       'Creator': 'Creator',
-      'Create_time': 'Creation time',
+      'Create_time': 'Creation Time',
       'Operation': 'Operation',
-      'Create_command': 'Create command',
+      'Create_command': 'Create Command',
       'Reset': 'Reset',
       'Void': 'Void',
-      'Starting_point': 'Starting point',
-      'Target_point': 'Target point',
-      'Is_it_completed': 'Is it completed',
-      'error_code': 'Error code',
-      'start_time': 'Start time',
-      'finish_time': 'Completion time',
-      'create_type': 'Create type',
-      'finish_type': 'Completion type',
-      'retry_times': 'Retry count',
-      'please_enter_origin-column': 'Please enter origin-column!',
-      '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!'
+      'Starting_point': 'Starting Point',
+      'Target_point': 'Target Point',
+      'Is_it_completed': 'Is It Completed',
+      'error_code': 'Error Code',
+      'start_time': 'Start Time',
+      'finish_time': 'Completion Time',
+      'create_type': 'Create Type',
+      'finish_type': 'Completion Type',
+      'retry_times': 'Retry Count',
+      'please_enter_origin-column': 'Please Enter Origin Column!',
+      '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',
+      'title': 'Lanzhou Hailiang Equipment Management Task Kanban',
       'task_screen': 'Task Kanban',
-      'device': 'Current device',
+      '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',
+      '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 d3bc8c7..c8ac9c0 100644
--- a/acs/nladmin-ui/src/i18n/langs/task/in.js
+++ b/acs/nladmin-ui/src/i18n/langs/task/in.js
@@ -1,74 +1,76 @@
 export default {
   'task': {
     'txt_box': {
-      'Enter_task_number': 'Masukkan nomor tugas',
+      'Enter_task_number': 'Masukkan Nomor Tugas',
       'Vehicle_registration_number': 'Nomor Registrasi Kendaraan',
-      'Material_type': 'Tipe material',
-      'Task_status': 'Status tugas',
-      'Origin_or_destination': 'Asal atau tujuan',
-      'Task_type': 'Jenis tugas',
-      'Warehouse_task_type': 'Jenis tugas gudang',
+      'Material_type': 'Tipe Material',
+      'Task_status': 'Status Tugas',
+      'Origin_or_destination': 'Asal Atau Tujuan',
+      'Task_type': 'Jenis Tugas',
+      'Warehouse_task_type': 'Jenis Tugas Gudang',
       'AGV_system': 'Sistem AGV',
-      'Routing_scheme': 'Skema routing',
+      'Routing_scheme': 'Skema Routing',
       'Priority': 'Prioritas',
-      'Vehicle_number': 'Nomor kendaraan',
-      'Task_code': 'Nomor tugas',
-      'Task': 'Tugas'
+      'Vehicle_number': 'Nomor Kendaraan',
+      'Task_code': 'Nomor Tugas',
+      'Task': 'Tugas',
+      'start_or_end': 'Asal Atau Tujuan',
+      'time': 'Waktu'
     },
     'select': {
       'Placeholder': 'Pilih',
-      'Start_point': 'Titik awal',
-      'Starting_column': 'Kolom awal',
-      'Starting_layer': 'Lapisan awal',
+      'Start_point': 'Titik Awal',
+      'Starting_column': 'Kolom Awal',
+      'Starting_layer': 'Lapisan Awal',
       'Destination': 'Tujuan',
-      'Ending_column': 'Kolom akhir',
-      'Ending_layer': 'Lapisan akhir',
+      'Ending_column': 'Kolom Akhir',
+      'Ending_layer': 'Lapisan Akhir',
       'Description': 'Deskripsi',
       'Cancel': 'Batalkan',
       'Confirm': 'Konfirmasi',
       'Ready': 'Siap',
-      'In_progress': 'Sedang berlangsung',
+      'In_progress': 'Sedang Berlangsung',
       'Completed': 'Selesai',
-      'Pickup_point': 'Titik pengambilan',
-      'Delivery_point': 'Titik pengiriman',
+      'Pickup_point': 'Titik Pengambilan',
+      'Delivery_point': 'Titik Pengiriman',
       'Remark': 'Catatan',
       'Creator': 'Pencipta',
-      'Create_time': 'Waktu penciptaan',
+      'Create_time': 'Waktu Penciptaan',
       'Operation': 'Operasi',
-      'Create_command': 'Perintah membuat',
-      'Reset': 'Atur ulang',
+      'Create_command': 'Perintah Membuat',
+      'Reset': 'Atur Ulang',
       'Void': 'Batal',
-      'Starting_point': 'Titik awal',
-      'Target_point': 'Titik tujuan',
-      'Is_it_completed': 'Apakah sudah selesai',
-      'error_code': 'Kode kesalahan',
-      'start_time': 'Waktu mulai',
-      'finish_time': 'Waktu penyelesaian',
-      'create_type': 'Jenis pembuatan',
-      'finish_type': 'Jenis penyelesaian',
-      'retry_times': 'Jumlah percobaan ulang',
-      'please_enter_origin_column': 'Silakan masukkan asal-kolom!',
-      'please_enter_origin_level': 'Silakan masukkan asal-level!',
-      'please_select_destination_column': 'Silakan pilih tujuan-kolom!',
-      'please_select_destination_level': 'Silakan pilih lantai tujuan!”'
+      'Starting_point': 'Titik Awal',
+      'Target_point': 'Titik Tujuan',
+      'Is_it_completed': 'Apakah Sudah Selesai',
+      'error_code': 'Kode Kesalahan',
+      'start_time': 'Waktu Mulai',
+      'finish_time': 'Waktu Penyelesaian',
+      'create_type': 'Jenis Pembuatan',
+      'finish_type': 'Jenis Penyelesaian',
+      'retry_times': 'Jumlah Percobaan ulang',
+      'please_enter_origin_column': 'Silakan Masukkan Asal Kolom!',
+      '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',
+      'title': 'Lanzhou Hailiang Tugas Manajemen Peralatan Kanban',
       'task_screen': 'Tugas Kanban',
-      'device': 'Perangkat saat ini',
+      'device': 'Perangkat Saat Ini',
       'Wednesday': 'Rabu',
-      'year': 'tahun',
-      'month': 'bulan',
-      'day': 'hari',
-      'task_code': 'Nomor tugas',
-      'inst_code': 'Nomor instruksi',
-      'start': 'Titik awal',
+      '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',
+      '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 a15c7f8..1703153 100644
--- a/acs/nladmin-ui/src/i18n/langs/task/zh.js
+++ b/acs/nladmin-ui/src/i18n/langs/task/zh.js
@@ -13,7 +13,9 @@ export default {
       'Priority': '优先级',
       'Vehicle_number': '载具号',
       'Task_code': '任务号',
-      'Task': '任务'
+      'Task': '任务',
+      'start_or_end': '起点或终点',
+      'time': '时间段'
     },
     'select': {
       'Placeholder': '请选择',
diff --git a/acs/nladmin-ui/src/i18n/langs/timing/en.js b/acs/nladmin-ui/src/i18n/langs/timing/en.js
index 33ea4a3..addd51b 100644
--- a/acs/nladmin-ui/src/i18n/langs/timing/en.js
+++ b/acs/nladmin-ui/src/i18n/langs/timing/en.js
@@ -1,25 +1,33 @@
 export default {
   'Timing': {
     'DB': {
-      'job_id': 'job_id',
-      'job_name': 'job_name',
-      'bean_name': 'bean_name',
-      'method_name': 'method_name',
-      'thread_state': 'thread_state',
-      'params': 'params',
-      'cron_expression': 'cron_expression',
-      'is_pause': 'is_pause',
-      'description': 'description',
-      'create_time': 'create_time',
-      'log': 'log',
-      'edit': 'edit',
-      'execute': 'execute',
-      'restore': 'restore',
-      'suspend': 'suspend'
+      'job_id': 'Job Id',
+      'job_name': 'Job Name',
+      'bean_name': 'Bean Name',
+      'method_name': 'Method Name',
+      'thread_state': 'Thread State',
+      'params': 'Params',
+      'cron_expression': 'Cron Expression',
+      'is_pause': 'Is Pause',
+      'description': 'Description',
+      'create_time': 'Create Time',
+      'log': 'Log',
+      'edit': 'Edit',
+      'execute': 'Execute',
+      'restore': 'Restore',
+      'suspend': 'Suspend',
+      'Leader': 'Leader',
+      'Alarm_mailbox': 'Alarm Mailbox',
+      'Whether_pause': 'Whether Pause?',
+      'Parameter_content': 'Parameter Content',
+      'please_enter_cron_expression': 'Please Enter A Cron Expression',
+      'spilt1': 'Multiple Expressions Are Separated By Commas',
+      'spilt2': 'Multiple Mailboxes Are Separated By Commas',
+      'Generate_expressions': 'Generate Expressions'
     },
     'msg': {
-      'select_msg': 'Enter task name to search for',
-      'delete_msg': 'Are you sure to stop and delete this task?'
+      'select_msg': 'Enter Task Name To Search For',
+      'delete_msg': 'Are You Sure To Stop And Delete This Task?'
     }
   }
 }
diff --git a/acs/nladmin-ui/src/i18n/langs/timing/in.js b/acs/nladmin-ui/src/i18n/langs/timing/in.js
index ecb347b..2a2765d 100644
--- a/acs/nladmin-ui/src/i18n/langs/timing/in.js
+++ b/acs/nladmin-ui/src/i18n/langs/timing/in.js
@@ -3,23 +3,31 @@ export default {
     'DB': {
       'job_id': 'ID Tugas',
       'job_name': 'Tugas Nama',
-      'bean_name': 'Nama kacang',
-      'method_name': 'Metode eksekusi',
-      'thread_state': 'Status benang',
-      'params': 'parameter',
-      'cron_expression': 'ekspresi cron',
-      'is_pause': 'keadaan',
-      'description': 'deskripsikan',
-      'create_time': 'Tarikh penciptaan',
-      'log': 'jurnal',
-      'edit': 'edit',
-      'execute': 'implementasi',
+      'bean_name': 'Nama Kacang',
+      'method_name': 'Metode Eksekusi',
+      'thread_state': 'Status Benang',
+      'params': 'Parameter',
+      'cron_expression': 'Ekspresi Cron',
+      'is_pause': 'Keadaan',
+      'description': 'Deskripsikan',
+      'create_time': 'Tarikh Penciptaan',
+      'log': 'Jurnal',
+      'edit': 'Edit',
+      'execute': 'Implementasi',
       'restore': 'Kembalikan',
-      'suspend': 'suspend'
+      'suspend': 'Suspend',
+      'Leader': 'Kepala',
+      'Alarm_mailbox': 'Kotak surat alarm',
+      'Whether_pause': 'Apakah Akan Berhenti Setelah Kegagalan',
+      'Parameter_content': 'Konten Parameter',
+      'please_enter_cron_expression': 'Silakan Masukkan Ekspresi Cron',
+      'spilt1': 'Beberapa Ekspresi Dipisahkan Dengan Koma',
+      'spilt2': 'Beberapa Kotak Pesan Dipisahkan Dengan Koma',
+      'Generate_expressions': 'Menghasilkan Ekspresi'
     },
     'msg': {
-      'select_msg': 'Masukkan nama tugas untuk dicari',
-      'delete_msg': 'Apakah Anda yakin untuk menghentikan dan menghapus tugas ini?'
+      'select_msg': 'Masukkan Nama Tugas Untuk Dicari',
+      'delete_msg': 'Apakah Anda Yakin Untuk Menghentikan Dan Menghapus Tugas Ini?'
     }
   }
 }
diff --git a/acs/nladmin-ui/src/i18n/langs/timing/zh.js b/acs/nladmin-ui/src/i18n/langs/timing/zh.js
index 769dbc4..8c9a902 100644
--- a/acs/nladmin-ui/src/i18n/langs/timing/zh.js
+++ b/acs/nladmin-ui/src/i18n/langs/timing/zh.js
@@ -15,7 +15,15 @@ export default {
       'edit': '编辑',
       'execute': '执行',
       'restore': '恢复',
-      'suspend': '暂停'
+      'suspend': '暂停',
+      'Leader': '负责人',
+      'Alarm_mailbox': '告警邮箱',
+      'Whether_pause': '失败后是否暂停',
+      'Parameter_content': '参数内容',
+      'please_enter_cron_expression': '请输入cron表达式',
+      'spilt1': '多个表达式用逗号隔开',
+      'spilt2': '多个邮箱用逗号隔开',
+      'Generate_expressions': '生成表达式'
     },
     'msg': {
       'select_msg': '输入任务名称搜索',
diff --git a/acs/nladmin-ui/src/i18n/langs/user/en.js b/acs/nladmin-ui/src/i18n/langs/user/en.js
new file mode 100644
index 0000000..9cebe6b
--- /dev/null
+++ b/acs/nladmin-ui/src/i18n/langs/user/en.js
@@ -0,0 +1,35 @@
+export default {
+  'user': {
+    'table_title': {
+      'Department_name': 'Department Name',
+      'enter_department_name': 'Enter Department Name',
+      'Account_Number (Name)': 'Account_Number (Name)',
+      'Enter_Account_Number (Name)': 'Enter_Account_Number (Name)',
+      'State': 'State'
+    },
+    'table_value': {
+      'Username': 'Username',
+      'Name': 'Name',
+      'Sex': 'Sex',
+      'Phone': 'Phone',
+      'Mailbox': 'Mailbox',
+      'Department': 'Department',
+      'State': 'State',
+      'create_Date': 'Create Date',
+      'Operate': 'Operate'
+    },
+    'other': {
+      'Revise': 'Revise',
+      'Delete': 'Delete',
+      'More': 'More',
+      'Reset': 'Reset',
+      'Department_permissions': 'Department Permissions',
+      'Data_Permissions': 'Data Permissions',
+      'Lock_account': 'Lock Account',
+      'Assign_roles': 'Assign Roles'
+    },
+    'msg': {
+      'delete_msg': 'Confirm That One Of The Selected Data Items Is Deleted?'
+    }
+  }
+}
diff --git a/acs/nladmin-ui/src/i18n/langs/user/in.js b/acs/nladmin-ui/src/i18n/langs/user/in.js
new file mode 100644
index 0000000..053ab26
--- /dev/null
+++ b/acs/nladmin-ui/src/i18n/langs/user/in.js
@@ -0,0 +1,35 @@
+export default {
+  'user': {
+    'table_title': {
+      'Department_name': '部门名称',
+      'enter_department_name': '请输入部门名称',
+      'Account_Number (Name)': '账号（名称）',
+      'Enter_Account_Number (Name)': '请输入账号或者名称',
+      'State': '状态'
+    },
+    'table_value': {
+      'Username': '用户名',
+      'Name': '姓名',
+      'Sex': '性别',
+      'Phone': '电话',
+      'Mailbox': '邮箱',
+      'Department': '部门',
+      'State': '状态',
+      'create_Date': '创建日期',
+      'Operate': '操作'
+    },
+    'other': {
+      'Revise': 'Merevisi',
+      'Delete': 'Menghapus',
+      'More': 'Lebih',
+      'Reset': 'Kata Sandi',
+      'Department_permissions': 'Izin Departemen',
+      'Data_Permissions': 'Izin Data',
+      'Lock_account': 'Kunci Akun Anda',
+      'Assign_roles': 'Menetapkan Peran'
+    },
+    'msg': {
+      'delete_msg': 'Mengonfirmasi Bahwa Salah Satu Item Data Yang Dipilih Dihapus?'
+    }
+  }
+}
diff --git a/acs/nladmin-ui/src/i18n/langs/user/zh.js b/acs/nladmin-ui/src/i18n/langs/user/zh.js
new file mode 100644
index 0000000..a1567d8
--- /dev/null
+++ b/acs/nladmin-ui/src/i18n/langs/user/zh.js
@@ -0,0 +1,35 @@
+export default {
+  'user': {
+    'table_title': {
+      'Department_name': '部门名称',
+      'enter_department_name': '请输入部门名称',
+      'Account_Number (Name)': '账号（名称）',
+      'Enter_Account_Number (Name)': '请输入账号或者名称',
+      'State': '状态'
+    },
+    'table_value': {
+      'Username': '用户名',
+      'Name': '姓名',
+      'Sex': '性别',
+      'Phone': '电话',
+      'Mailbox': '邮箱',
+      'Department': '部门',
+      'State': '状态',
+      'create_Date': '创建日期',
+      'Operate': '操作'
+    },
+    'other': {
+      'Revise': '修改',
+      'Delete': '删除',
+      'More': '更多',
+      'Reset': '重置密码',
+      'Department_permissions': '部门权限',
+      'Data_Permissions': '数据权限',
+      'Lock_account': '锁定账号',
+      'Assign_roles': '分配角色'
+    },
+    'msg': {
+      'delete_msg': '确认删除选中的1条数据?'
+    }
+  }
+}
diff --git a/acs/nladmin-ui/src/i18n/langs/zh-CN.js b/acs/nladmin-ui/src/i18n/langs/zh-CN.js
index 15b23db..81c1bba 100644
--- a/acs/nladmin-ui/src/i18n/langs/zh-CN.js
+++ b/acs/nladmin-ui/src/i18n/langs/zh-CN.js
@@ -94,7 +94,11 @@ export default {
     'create_by': '创建者',
     'update_by': '修改者',
     'is_on': '是否启用',
-    'please': '请选择'
+    'please': '请选择',
+    'true': '是',
+    'false': '否',
+    'Running': '运行中',
+    'Paused': '已暂停'
   },
   'monitor': {
     'sys': '系统',
diff --git a/acs/nladmin-ui/src/views/acs/device/address/index.vue b/acs/nladmin-ui/src/views/acs/device/address/index.vue
index 1089579..c2a4c8c 100644
--- a/acs/nladmin-ui/src/views/acs/device/address/index.vue
+++ b/acs/nladmin-ui/src/views/acs/device/address/index.vue
@@ -5,21 +5,30 @@
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <div v-if="crud.props.searchToggle">
         <!-- 搜索 -->
-        <el-input
-          v-model="query.blurry"
-          size="small"
-          clearable
-          :placeholder="$t('device.placeholder.enter_name_code')"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <rrOperation />
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-suffix=":"
+        >
+          <el-form-item  :label="$t('opc.placeholder.name_code')">
+            <el-input
+              v-model="query.blurry"
+              size="small"
+              clearable
+              :placeholder="$t('device.placeholder.enter_name_code')"
+              style="width: 200px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+            <rrOperation />
+          </el-form-item>
+        </el-form>
       </div>
       <crudOperation :permission="permission" />
       <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
-        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="600px">
+        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="150px">
           <el-form-item :label="$t('address.methods_code')" prop="methods_code">
             <el-input v-model="form.methods_code" style="width: 370px;" />
           </el-form-item>
diff --git a/acs/nladmin-ui/src/views/acs/device/customPolicy/index.vue b/acs/nladmin-ui/src/views/acs/device/customPolicy/index.vue
index b084a51..61fd0ba 100644
--- a/acs/nladmin-ui/src/views/acs/device/customPolicy/index.vue
+++ b/acs/nladmin-ui/src/views/acs/device/customPolicy/index.vue
@@ -5,8 +5,8 @@
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" />
       <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
-        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="600px">
+        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="150px">
           <el-form-item :label="$t('device.device_table_title.device_name')" prop="key_code">
             <el-select
               v-model="form.key_code"
@@ -28,8 +28,8 @@
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">{{ "$t('common.Cancel')" }}</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ "$t('common.Confirm')" }}</el-button>
+          <el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm')}}</el-button>
         </div>
       </el-dialog>
       <!--表格渲染-->
diff --git a/acs/nladmin-ui/src/views/acs/device/index.vue b/acs/nladmin-ui/src/views/acs/device/index.vue
index 13f2ae0..b9cb920 100644
--- a/acs/nladmin-ui/src/views/acs/device/index.vue
+++ b/acs/nladmin-ui/src/views/acs/device/index.vue
@@ -5,28 +5,39 @@
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <div v-if="crud.props.searchToggle">
         <!-- 搜索 -->
-        <el-input
-          v-model="query.blurry"
-          size="small"
-          clearable
-          :placeholder="$t('device.placeholder.enter_name_code')"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <el-select
-          v-model="query.device_type"
-          clearable
-          filterable
-          size="small"
-          :placeholder="$t('device.placeholder.device_type')"
-          class="filter-item"
-          style="width: 190px"
-          @change="crud.toQuery"
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-suffix=":"
         >
-          <el-option v-for="item in device_types" :key="item.id" :label="item.label" :value="item.value" />
-        </el-select>
-        <rrOperation />
+          <el-form-item  :label="$t('device.placeholder.name_code')">
+            <el-input
+              v-model="query.blurry"
+              size="small"
+              clearable
+              :placeholder="$t('device.placeholder.enter_name_code')"
+              style="width: 200px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item  :label="$t('device.placeholder.device_type')">
+            <el-select
+              v-model="query.device_type"
+              clearable
+              filterable
+              size="small"
+              :placeholder="$t('device.placeholder.device_type')"
+              class="filter-item"
+              style="width: 200px"
+              @change="crud.toQuery"
+            >
+              <el-option v-for="item in device_types" :key="item.id" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+          <rrOperation />
+        </el-form>
       </div>
       <crudOperation :permission="permission">
         <el-button
@@ -56,63 +67,71 @@
         :before-close="crud.cancelCU"
         :visible.sync="crud.status.cu > 0"
         :title="crud.status.title"
-        width="500px"
+        width="1050px"
       >
-        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
-          <el-form-item v-if="false" :label="$t('device.table_title.device_identification')" prop="device_id">
-            <el-input v-model="form.device_id" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item :label="$t('device.device_table_title.device_encoding')" prop="device_code">
-            <el-input v-model="form.device_code" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item :label="$t('device.device_table_title.device_name')" prop="device_name">
-            <el-input v-model="form.device_name" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item :label="$t('device.device_dialog.in_device_name')" prop="in_device_name">
-            <el-input v-model="form.in_device_name" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item :label="$t('device.device_dialog.en_device_name')" prop="en_device_name">
-            <el-input v-model="form.en_device_name" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item :label="$t('device.device_dialog.zh_device_name')" prop="zh_device_name">
-            <el-input v-model="form.zh_device_name" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item :label="$t('device.device_table_title.device_type')" prop="device_type">
-            <el-select v-model="form.device_type" style="width: 370px" :placeholder="$t('device.placeholder.please_select')">
-              <el-option
-                v-for="item in device_types"
-                :key="item.id"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="$t('device.device_table_title.region')" prop="region">
-            <el-select v-model="form.region" style="width: 370px" :placeholder="$t('device.placeholder.please_select')">
-              <el-option
-                v-for="item in regions"
-                :key="item.id"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="$t('device.device_table_title.sequence_number')" prop="seq_num">
-            <el-input-number v-model="form.seq_num" value="1" :min="1" label="描述文字" />
-          </el-form-item>
-          <!--          <el-form-item label="生产厂家">-->
-          <!--            <el-input v-model="form.manufacturer" style="width: 370px;" />-->
-          <!--          </el-form-item>-->
-          <!--          <el-form-item label="厂家电话">-->
-          <!--            <el-input v-model="form.manufacturer_phone" style="width: 370px;" />-->
-          <!--          </el-form-item>-->
-          <el-form-item :label="$t('device.device_table_title.descriptive_information')" prop="description">
-            <el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea" />
-          </el-form-item>
+        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
+          <el-row>
+            <el-col :span="12">
+              <div class="grid-content bg-purple"></div>
+              <el-form-item v-if="false" :label="$t('device.table_title.device_identification')" prop="device_id">
+                <el-input v-model="form.device_id" style="width: 370px;" />
+              </el-form-item>
+              <el-form-item :label="$t('device.device_table_title.device_encoding')" prop="device_code">
+                <el-input v-model="form.device_code" style="width: 370px;" />
+              </el-form-item>
+              <el-form-item :label="$t('device.device_table_title.device_name')" prop="device_name">
+                <el-input v-model="form.device_name" style="width: 370px;" />
+              </el-form-item>
+              <el-form-item :label="$t('device.device_dialog.in_device_name')" prop="in_device_name">
+                <el-input v-model="form.in_device_name" style="width: 370px;" />
+              </el-form-item>
+              <el-form-item :label="$t('device.device_dialog.en_device_name')" prop="en_device_name">
+                <el-input v-model="form.en_device_name" style="width: 370px;" />
+              </el-form-item>
+              <el-form-item :label="$t('device.device_dialog.zh_device_name')" prop="zh_device_name">
+                <el-input v-model="form.zh_device_name" style="width: 370px;" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="grid-content bg-purple-light"></div>
+              <el-form-item :label="$t('device.device_table_title.device_type')" prop="device_type">
+                <el-select v-model="form.device_type" style="width: 370px" :placeholder="$t('device.placeholder.please_select')">
+                  <el-option
+                    v-for="item in device_types"
+                    :key="item.id"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item :label="$t('device.device_table_title.region')" prop="region">
+                <el-select v-model="form.region" style="width: 370px" :placeholder="$t('device.placeholder.please_select')">
+                  <el-option
+                    v-for="item in regions"
+                    :key="item.id"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item :label="$t('device.device_table_title.sequence_number')" prop="seq_num">
+                <el-input-number v-model="form.seq_num" value="1" :min="1" label="描述文字" />
+              </el-form-item>
+              <!--          <el-form-item label="生产厂家">-->
+              <!--            <el-input v-model="form.manufacturer" style="width: 370px;" />-->
+              <!--          </el-form-item>-->
+              <!--          <el-form-item label="厂家电话">-->
+              <!--            <el-input v-model="form.manufacturer_phone" style="width: 370px;" />-->
+              <!--          </el-form-item>-->
+              <el-form-item :label="$t('device.device_table_title.descriptive_information')" prop="description">
+                <el-input v-model="form.remark" style="width: 370px;"  type="textarea" />
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+          <el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
         </div>
       </el-dialog>
       <!--表格渲染-->
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 7ab2edb..7719468 100644
--- a/acs/nladmin-ui/src/views/acs/device/opc/index.vue
+++ b/acs/nladmin-ui/src/views/acs/device/opc/index.vue
@@ -5,16 +5,25 @@
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <div v-if="crud.props.searchToggle">
         <!-- 搜索 -->
-        <el-input
-          v-model="query.blurry"
-          clearable
-          size="small"
-          :placeholder="$t('opc.placeholder.enter_name_code_path')"
-          style="width: 250px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <rrOperation />
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-suffix=":"
+        >
+          <el-form-item  :label="$t('opc.placeholder.name_code_path')">
+            <el-input
+              v-model="query.blurry"
+              clearable
+              size="small"
+              :placeholder="$t('opc.placeholder.enter_name_code_path')"
+              style="width: 250px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <rrOperation />
+        </el-form>
       </div>
       <crudOperation :permission="permission" />
       <!--表单组件-->
@@ -23,41 +32,49 @@
         :before-close="crud.cancelCU"
         :visible.sync="crud.status.cu > 0"
         :title="crud.status.title"
-        width="550px"
+        width="1070px"
       >
-        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
-          <el-form-item :label="$t('opc.table_title.opc_code')" prop="opc_code">
-            <el-input v-model="form.opc_code" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item :label="$t('opc.table_title.opc_name')" prop="opc_name">
-            <el-input v-model="form.opc_name" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item :label="$t('opc.table_title.opc_address')">
-            <el-input v-model="form.opc_host" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item :label="$t('common.username')">
-            <el-input v-model="form.user" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item :label="$t('common.password')" prop="password">
-            <el-input v-model="form.password" style="width: 370px;" type="password" />
-            <el-button :loading="crud.cu === 2" type="primary" @click="getDetail()">详情</el-button>
-          </el-form-item>
-          <el-form-item :label="$t('opc.table_title.program_id')">
-            <el-input v-model="form.prog_id" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item :label="$t('opc.table_title.registry_id')">
-            <el-input v-model="form.cls_id" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="domain">
-            <el-input v-model="form.domain" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item :label="$t('opc.table_title.remark')">
-            <el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea" />
-          </el-form-item>
+        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="125px">
+          <el-row>
+            <el-col :span="12">
+              <div class="grid-content bg-purple"></div>
+              <el-form-item :label="$t('opc.table_title.opc_code')" prop="opc_code">
+                <el-input v-model="form.opc_code" style="width: 370px;" />
+              </el-form-item>
+              <el-form-item :label="$t('opc.table_title.opc_name')" prop="opc_name">
+                <el-input v-model="form.opc_name" style="width: 370px;" />
+              </el-form-item>
+              <el-form-item :label="$t('opc.table_title.opc_address')">
+                <el-input v-model="form.opc_host" style="width: 370px;" />
+              </el-form-item>
+              <el-form-item :label="$t('common.username')">
+                <el-input v-model="form.user" style="width: 370px;" />
+              </el-form-item>
+              <el-form-item :label="$t('common.password')" prop="password">
+                <el-input v-model="form.password" style="width: 370px;" type="password" />
+                <el-button :loading="crud.cu === 2" type="primary" @click="getDetail()">{{ $t('opc.dialog.detail') }}</el-button>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="grid-content bg-purple-light"></div>
+              <el-form-item :label="$t('opc.table_title.program_id')">
+                <el-input v-model="form.prog_id" style="width: 370px;" />
+              </el-form-item>
+              <el-form-item :label="$t('opc.table_title.registry_id')">
+                <el-input v-model="form.cls_id" style="width: 370px;" />
+              </el-form-item>
+              <el-form-item label="domain">
+                <el-input v-model="form.domain" style="width: 370px;" />
+              </el-form-item>
+              <el-form-item :label="$t('opc.table_title.remark')">
+                <el-input v-model="form.remark" style="width: 370px;" type="textarea" />
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+          <el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
         </div>
       </el-dialog>
 
@@ -106,7 +123,7 @@
         <el-table-column prop="password" :label="$t('common.password')" :min-width="flexWidth('password',crud.data,$t('opc.table_title.password'))" />
         <el-table-column prop="prog_id" :label="$t('opc.table_title.program_id')" :min-width="flexWidth('prog_id',crud.data,$t('opc.table_title.program_id'))" />
         <el-table-column prop="cls_id" :label="$t('opc.table_title.registry_id')" :min-width="flexWidth('cls_id',crud.data,$t('opc.table_title.registry_id'))" />
-        <el-table-column prop="domain" label="domain" :min-width="flexWidth('domain',crud.data,$t('opc.table_title.domain'))" />
+        <el-table-column prop="domain" :label="$t('opc.table_title.domain')" :min-width="flexWidth('domain',crud.data,$t('opc.table_title.domain'))" />
         <el-table-column prop="remark" :label="$t('opc.table_title.remark')" :min-width="flexWidth('remark',crud.data,$t('opc.table_title.remark'))" />
         <el-table-column prop="create_time" :label="$t('common.create_time')" :min-width="flexWidth('create_time',crud.data,$t('opc.table_title.create_time'))" />
         <el-table-column :label="$t('common.Operate')" width="200px" align="center" fixed="right">
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 ba1fa33..f1d5294 100644
--- a/acs/nladmin-ui/src/views/acs/device/protocol/index.vue
+++ b/acs/nladmin-ui/src/views/acs/device/protocol/index.vue
@@ -5,45 +5,58 @@
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <div v-if="crud.props.searchToggle">
         <!-- 搜索 -->
-        <el-input
-          v-model="query.blurry"
-          size="small"
-          clearable
-          :placeholder="$t('device.placeholder.enter_name_code')"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <el-select
-          v-model="query.device_types"
-          clearable
-          filterable
-          size="small"
-          :placeholder="$t('device.placeholder.device_type')"
-          class="filter-item"
-          style="width: 190px"
-          @change="crud.toQuery"
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-suffix=":"
         >
-          <el-option v-for="item in device_types" :key="item.id" :label="item.label" :value="item.value" />
-        </el-select>
-        <el-select
-          v-model="query.opc_id"
-          clearable
-          filterable
-          size="small"
-          placeholder="Server"
-          class="filter-item"
-          style="width: 190px"
-          @change="crud.toQuery"
-        >
-          <el-option
-            v-for="item in dataOpcservers"
-            :key="item.opc_id"
-            :label="item.opc_name"
-            :value="item.opc_id"
-          />
-        </el-select>
+          <el-form-item  :label="$t('opc.placeholder.name_code')">
+            <el-input
+              v-model="query.blurry"
+              size="small"
+              clearable
+              :placeholder="$t('device.placeholder.enter_name_code')"
+              style="width: 200px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item  :label="$t('device.placeholder.device_type')">
+            <el-select
+              v-model="query.device_types"
+              clearable
+              filterable
+              size="small"
+              :placeholder="$t('device.placeholder.device_type')"
+              class="filter-item"
+              style="width: 190px"
+              @change="crud.toQuery"
+            >
+              <el-option v-for="item in device_types" :key="item.id" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item  label="Server">
+            <el-select
+              v-model="query.opc_id"
+              clearable
+              filterable
+              size="small"
+              placeholder="Server"
+              class="filter-item"
+              style="width: 190px"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dataOpcservers"
+                :key="item.opc_id"
+                :label="item.opc_name"
+                :value="item.opc_id"
+              />
+            </el-select>
+          </el-form-item>
         <rrOperation />
+        </el-form>
       </div>
 
       <crudOperation>
diff --git a/acs/nladmin-ui/src/views/acs/device/storageCell/index.vue b/acs/nladmin-ui/src/views/acs/device/storageCell/index.vue
index 9d581ad..90bf984 100644
--- a/acs/nladmin-ui/src/views/acs/device/storageCell/index.vue
+++ b/acs/nladmin-ui/src/views/acs/device/storageCell/index.vue
@@ -4,37 +4,50 @@
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
         <!-- 搜索 -->
-        <el-input
-          v-model="query.storage_code"
-          size="small"
-          clearable
-          :placeholder="$t('storageCell.placeholder.enter_location_code')"
-          style="width: 200px;"
-          class="filter-item"
-        />
-        <el-input
-          v-model="query.parent_storage_code"
-          size="small"
-          clearable
-          :placeholder="$t('storageCell.placeholder.enter_parent_location_code')"
-          style="width: 200px;"
-          class="filter-item"
-        />
-        <el-input
-          v-model="query.address"
-          size="small"
-          clearable
-          :placeholder="$t('storageCell.placeholder.enter_agv_site')"
-          style="width: 200px;"
-          class="filter-item"
-        />
-        <rrOperation />
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-suffix=":"
+        >
+          <el-form-item  :label="$t('storageCell.table_title.storage_code')">
+            <el-input
+              v-model="query.storage_code"
+              size="small"
+              clearable
+              :placeholder="$t('storageCell.placeholder.enter_location_code')"
+              style="width: 200px;"
+              class="filter-item"
+            />
+          </el-form-item>
+          <el-form-item  :label="$t('storageCell.table_title.parent_storage_code')">
+            <el-input
+              v-model="query.parent_storage_code"
+              size="small"
+              clearable
+              :placeholder="$t('storageCell.placeholder.enter_parent_location_code')"
+              style="width: 200px;"
+              class="filter-item"
+            />
+          </el-form-item>
+          <el-form-item  :label="$t('storageCell.table_title.agv_site')">
+            <el-input
+              v-model="query.address"
+              size="small"
+              clearable
+              :placeholder="$t('storageCell.placeholder.enter_agv_site')"
+              style="width: 200px;"
+              class="filter-item"
+            />
+          </el-form-item>
+          <rrOperation />
+        </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" />
       <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
-        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="650px">
+        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="160px">
           <el-form-item v-if="false" label="货位标识" prop="storage_id">
             <el-input v-model="form.storage_id" style="width: 370px;" />
           </el-form-item>
diff --git a/acs/nladmin-ui/src/views/acs/history/instRecord/index.vue b/acs/nladmin-ui/src/views/acs/history/instRecord/index.vue
index 6e53d21..9421c82 100644
--- a/acs/nladmin-ui/src/views/acs/history/instRecord/index.vue
+++ b/acs/nladmin-ui/src/views/acs/history/instRecord/index.vue
@@ -4,58 +4,77 @@
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
         <!-- 搜索 -->
-        <el-input
-          v-model="query.code"
-          size="small"
-          clearable
-          :placeholder="$t('TaskRecord.table.Input_task_instruction_number')"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <el-input
-          v-model="query.vehicle_code"
-          size="small"
-          clearable
-          :placeholder="$t('task.txt_box.Vehicle_registration_number')"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <el-select
-          v-model="query.material_type"
-          clearable
-          filterable
-          size="small"
-          :placeholder="$t('task.txt_box.Material_type')"
-          class="filter-item"
-          style="width: 190px"
-          @change="crud.toQuery"
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-suffix=":"
         >
-          <el-option v-for="item in materialList" :key="item.id" :label="item.label" :value="item.value" />
-        </el-select>
-        <el-select
-          v-model="query.status"
-          clearable
-          filterable
-          size="small"
-          :placeholder="$t('task.txt_box.Task_status')"
-          class="filter-item"
-          style="width: 190px"
-          @change="crud.toQuery"
-        >
-          <el-option v-for="item in dict.task_status" :key="item.id" :label="item.label" :value="item.value" />
-        </el-select>
-        <el-input
-          v-model="query.point_code"
-          size="small"
-          clearable
-          :placeholder="$t('task.txt_box.Origin_or_destination')"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <Search />
+          <el-form-item  :label="$t('task.txt_box.Task_code')">
+            <el-input
+              v-model="query.code"
+              size="small"
+              clearable
+              :placeholder="$t('TaskRecord.table.Input_task_instruction_number')"
+              style="width: 200px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item  :label="$t('task.txt_box.Vehicle_number')">
+            <el-input
+              v-model="query.vehicle_code"
+              size="small"
+              clearable
+              :placeholder="$t('task.txt_box.Vehicle_registration_number')"
+              style="width: 200px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item  :label="$t('task.txt_box.Material_type')">
+            <el-select
+              v-model="query.material_type"
+              clearable
+              filterable
+              size="small"
+              :placeholder="$t('task.txt_box.Material_type')"
+              class="filter-item"
+              style="width: 190px"
+              @change="crud.toQuery"
+            >
+              <el-option v-for="item in materialList" :key="item.id" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item  :label="$t('task.txt_box.Task_status')">
+            <el-select
+              v-model="query.status"
+              clearable
+              filterable
+              size="small"
+              :placeholder="$t('task.txt_box.Task_status')"
+              class="filter-item"
+              style="width: 190px"
+              @change="crud.toQuery"
+            >
+              <el-option v-for="item in dict.task_status" :key="item.id" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item  :label="$t('task.txt_box.Origin_or_destination')">
+            <el-input
+              v-model="query.point_code"
+              size="small"
+              clearable
+              :placeholder="$t('task.txt_box.Origin_or_destination')"
+              style="width: 200px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item  :label="$t('task.txt_box.time')">
+            <Search />
+          </el-form-item>
+        </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
diff --git a/acs/nladmin-ui/src/views/acs/history/taskRecord/index.vue b/acs/nladmin-ui/src/views/acs/history/taskRecord/index.vue
index b666eb1..e6f500f 100644
--- a/acs/nladmin-ui/src/views/acs/history/taskRecord/index.vue
+++ b/acs/nladmin-ui/src/views/acs/history/taskRecord/index.vue
@@ -4,69 +4,88 @@
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
         <!-- 搜索 -->
-        <el-input
-          v-model="query.task_code"
-          size="small"
-          clearable
-          :placeholder="$t('TaskRecord.table.Task_code')"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <el-input
-          v-if="false"
-          v-model="query.is_over"
-          value="1"
-          size="small"
-          clearable
-          :placeholder="$t('TaskRecord.table.Task_code')"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <el-input
-          v-model="query.vehicle_code"
-          size="small"
-          clearable
-          :placeholder="$t('TaskRecord.table.Vehicle_number')"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <el-select
-          v-model="query.material_type"
-          clearable
-          filterable
-          size="small"
-          :placeholder="$t('task.txt_box.Material_type')"
-          class="filter-item"
-          style="width: 190px"
-          @change="crud.toQuery"
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-suffix=":"
         >
-          <el-option v-for="item in materialList" :key="item.id" :label="item.label" :value="item.value" />
-        </el-select>
-        <el-select
-          v-model="query.status"
-          clearable
-          filterable
-          size="small"
-          :placeholder="$t('task.txt_box.Task_status')"
-          class="filter-item"
-          style="width: 190px"
-          @change="crud.toQuery"
-        >
-          <el-option v-for="item in dict.task_status" :key="item.id" :label="item.label" :value="item.value" />
-        </el-select>
-        <el-input
-          v-model="query.point_code"
-          size="small"
-          clearable
-          :placeholder="$t('task.txt_box.Origin_or_destination')"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <Search />
+          <el-form-item  :label="$t('task.txt_box.Task_code')">
+            <el-input
+              v-model="query.task_code"
+              size="small"
+              clearable
+              :placeholder="$t('TaskRecord.table.Task_code')"
+              style="width: 200px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item  :label="$t('task.txt_box.Vehicle_number')">
+            <el-input
+              v-model="query.vehicle_code"
+              size="small"
+              clearable
+              :placeholder="$t('TaskRecord.table.Vehicle_number')"
+              style="width: 200px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item  :label="$t('task.txt_box.Material_type')">
+            <el-select
+              v-model="query.material_type"
+              clearable
+              filterable
+              size="small"
+              :placeholder="$t('task.txt_box.Material_type')"
+              class="filter-item"
+              style="width: 190px"
+              @change="crud.toQuery"
+            >
+              <el-option v-for="item in materialList" :key="item.id" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item  :label="$t('task.txt_box.Task_status')">
+            <el-select
+              v-model="query.status"
+              clearable
+              filterable
+              size="small"
+              :placeholder="$t('task.txt_box.Task_status')"
+              class="filter-item"
+              style="width: 190px"
+              @change="crud.toQuery"
+            >
+              <el-option v-for="item in dict.task_status" :key="item.id" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item  :label="$t('task.txt_box.Origin_or_destination')">
+            <el-input
+              v-model="query.point_code"
+              size="small"
+              clearable
+              :placeholder="$t('task.txt_box.Origin_or_destination')"
+              style="width: 200px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item  :label="$t('task.txt_box.time')">
+            <Search />
+          </el-form-item>
+        </el-form>
+<!--        <el-input-->
+<!--          v-if="false"-->
+<!--          v-model="query.is_over"-->
+<!--          value="1"-->
+<!--          size="small"-->
+<!--          clearable-->
+<!--          :placeholder="$t('TaskRecord.table.Task_code')"-->
+<!--          style="width: 200px;"-->
+<!--          class="filter-item"-->
+<!--          @keyup.enter.native="crud.toQuery"-->
+<!--        />-->
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
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 8ab6764..ca44f31 100644
--- a/acs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue
+++ b/acs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue
@@ -4,69 +4,77 @@
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
         <!-- 搜索 -->
-        <el-input
-          v-model="query.task_code"
-          size="small"
-          clearable
-          :placeholder="$t('TaskRecord.table.Task_code')"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <el-input
-          v-if="false"
-          v-model="query.is_over"
-          value="1"
-          size="small"
-          clearable
-          :placeholder="$t('TaskRecord.table.Task_code')"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <el-input
-          v-model="query.vehicle_code"
-          size="small"
-          clearable
-          :placeholder="$t('TaskRecord.table.Vehicle_number')"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <el-select
-          v-model="query.material_type"
-          clearable
-          filterable
-          size="small"
-          :placeholder="$t('task.txt_box.Material_type')"
-          class="filter-item"
-          style="width: 190px"
-          @change="crud.toQuery"
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-suffix=":"
         >
-          <el-option v-for="item in materialList" :key="item.id" :label="item.label" :value="item.value" />
-        </el-select>
-        <el-select
-          v-model="query.status"
-          clearable
-          filterable
-          size="small"
-          :placeholder="$t('task.txt_box.Task_status')"
-          class="filter-item"
-          style="width: 190px"
-          @change="crud.toQuery"
-        >
-          <el-option v-for="item in dict.task_status" :key="item.id" :label="item.label" :value="item.value" />
-        </el-select>
-        <el-input
-          v-model="query.point_code"
-          size="small"
-          clearable
-          :placeholder="$t('task.txt_box.Origin_or_destination')"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <Search />
+          <el-form-item  :label="$t('task.txt_box.Task_code')">
+            <el-input
+              v-model="query.task_code"
+              size="small"
+              clearable
+              :placeholder="$t('TaskRecord.table.Task_code')"
+              style="width: 200px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item  :label="$t('task.txt_box.Vehicle_number')">
+            <el-input
+              v-model="query.vehicle_code"
+              size="small"
+              clearable
+              :placeholder="$t('TaskRecord.table.Vehicle_number')"
+              style="width: 200px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item  :label="$t('task.txt_box.Material_type')">
+            <el-select
+              v-model="query.material_type"
+              clearable
+              filterable
+              size="small"
+              :placeholder="$t('task.txt_box.Material_type')"
+              class="filter-item"
+              style="width: 190px"
+              @change="crud.toQuery"
+            >
+              <el-option v-for="item in materialList" :key="item.id" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item  :label="$t('task.txt_box.Task_status')">
+            <el-select
+              v-model="query.status"
+              clearable
+              filterable
+              size="small"
+              :placeholder="$t('task.txt_box.Task_status')"
+              class="filter-item"
+              style="width: 190px"
+              @change="crud.toQuery"
+            >
+              <el-option v-for="item in dict.task_status" :key="item.id" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item  :label="$t('task.txt_box.Origin_or_destination')">
+            <el-input
+              v-model="query.point_code"
+              size="small"
+              clearable
+              :placeholder="$t('task.txt_box.Origin_or_destination')"
+              style="width: 200px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item  :label="$t('task.txt_box.time')">
+            <Search />
+          </el-form-item>
+        </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
diff --git a/acs/nladmin-ui/src/views/acs/history/udwData/index.vue b/acs/nladmin-ui/src/views/acs/history/udwData/index.vue
index c890379..d529b51 100644
--- a/acs/nladmin-ui/src/views/acs/history/udwData/index.vue
+++ b/acs/nladmin-ui/src/views/acs/history/udwData/index.vue
@@ -4,26 +4,37 @@
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
         <!-- 搜索 -->
-        <el-select
-          v-model="form.unified_key"
-          placeholder="unified_key"
-          class="filter-item"
-          clearable
-          filterable
-          size="small"
-          @change="crud.toQuery"
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-suffix=":"
         >
-          <el-option v-for="(item,index) in unified_key" :key="index" :label="item.label" :value="item.value" />
-        </el-select>
-        <el-input
-          v-model="query.code"
-          size="small"
-          clearable
-          :placeholder="$t('TaskRecord.table.Numbering')"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
+          <el-form-item  :label="$t('TaskRecord.table.Value')">
+            <el-select
+              v-model="form.unified_key"
+              :placeholder="$t('TaskRecord.table.Value')"
+              class="filter-item"
+              clearable
+              filterable
+              size="small"
+              @change="crud.toQuery"
+            >
+              <el-option v-for="(item,index) in unified_key" :key="index" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item  :label="$t('TaskRecord.table.Numbering')">
+            <el-input
+              v-model="query.code"
+              size="small"
+              clearable
+              :placeholder="$t('TaskRecord.table.Numbering')"
+              style="width: 200px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+        </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" />
@@ -36,7 +47,7 @@
         width="500px"
       >
         <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
-          <el-form-item label="unified_key">
+          <el-form-item :label="$t('TaskRecord.table.unified_key')">
             <el-input v-model="form.unified_key" style="width: 370px;" />
           </el-form-item>
           <el-form-item :label="$t('TaskRecord.table.Numbering')">
@@ -60,7 +71,7 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column prop="unified_key" label="unified_key" />
+        <el-table-column prop="unified_key" :label="$t('TaskRecord.table.unified_key')" />
         <el-table-column prop="key" :label="$t('TaskRecord.table.Numbering')" />
         <el-table-column prop="value" :label="$t('TaskRecord.table.Numbering')" />
         <el-table-column
@@ -82,7 +93,7 @@
       <!--弹窗设置设备与图标绑定与角度-->
       <el-dialog title="历史" :visible.sync="dialogFormVisible" width="35%">
         <el-form :model="form" size="small">
-          <el-form-item label="unified_key" prop="unified_key" label-width="100px">
+          <el-form-item :label="$t('TaskRecord.table.unified_key')" prop="unified_key" label-width="100px">
             <el-input v-model="form.unified_key" :disabled="true" />
           </el-form-item>
 
@@ -148,7 +159,7 @@ export default {
       rules: {
       },
       form: {
-        unified_key: 'opc_value',
+        unified_key: '',
         key: null,
         value: null,
         last_modify_date: null
diff --git a/acs/nladmin-ui/src/views/acs/instruction/index.vue b/acs/nladmin-ui/src/views/acs/instruction/index.vue
index af0f2aa..663665e 100644
--- a/acs/nladmin-ui/src/views/acs/instruction/index.vue
+++ b/acs/nladmin-ui/src/views/acs/instruction/index.vue
@@ -4,69 +4,88 @@
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
         <!-- 搜索 -->
-        <el-input
-          v-model="query.code"
-          size="small"
-          clearable
-          :placeholder="$t('Inst.table.input_taskCode_or_instCode')"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <el-input
-          v-model="query.vehicle_code"
-          size="small"
-          clearable
-          :placeholder="$t('Inst.table.input_vehicleCode')"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <el-select
-          v-model="query.material_type"
-          clearable
-          filterable
-          size="small"
-          :placeholder="$t('Inst.table.material')"
-          class="filter-item"
-          style="width: 190px"
-          @change="crud.toQuery"
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-suffix=":"
         >
-          <el-option v-for="item in materialList" :key="item.id" :label="item.label" :value="item.value" />
-        </el-select>
-        <el-select
-          v-model="query.status"
-          clearable
-          filterable
-          size="small"
-          :placeholder="$t('Inst.table.task_status')"
-          class="filter-item"
-          style="width: 190px"
-          @change="crud.toQuery"
-        >
-          <el-option v-for="item in dict.task_status" :key="item.id" :label="item.label" :value="item.value" />
-        </el-select>
-        <el-input
-          v-model="query.point_code"
-          size="small"
-          clearable
-          :placeholder="$t('Inst.table.input_startCode_or_nextCode')"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <el-select
-          v-model="query.instruction_type"
-          clearable
-          filterable
-          size="small"
-          :placeholder="$t('Inst.table.instruction_type')"
-          class="filter-item"
-          style="width: 190px"
-          @change="crud.toQuery"
-        >
-          <el-option v-for="item in dict.task_type" :key="item.id" :label="item.label" :value="item.value" />
-        </el-select>
+          <el-form-item  :label="$t('Inst.table.instruction_code')">
+            <el-input
+              v-model="query.code"
+              size="small"
+              clearable
+              :placeholder="$t('Inst.table.input_taskCode_or_instCode')"
+              style="width: 200px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item  :label="$t('Inst.table.vehicle_code')">
+            <el-input
+              v-model="query.vehicle_code"
+              size="small"
+              clearable
+              :placeholder="$t('Inst.table.input_vehicleCode')"
+              style="width: 200px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item  :label="$t('Inst.table.material')">
+            <el-select
+              v-model="query.material_type"
+              clearable
+              filterable
+              size="small"
+              :placeholder="$t('Inst.table.material')"
+              class="filter-item"
+              style="width: 200px"
+              @change="crud.toQuery"
+            >
+              <el-option v-for="item in materialList" :key="item.id" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item  :label="$t('Inst.table.task_status')">
+            <el-select
+              v-model="query.status"
+              clearable
+              filterable
+              size="small"
+              :placeholder="$t('Inst.table.task_status')"
+              class="filter-item"
+              style="width: 200px"
+              @change="crud.toQuery"
+            >
+              <el-option v-for="item in dict.task_status" :key="item.id" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item  :label="$t('task.txt_box.start_or_end')">
+            <el-input
+              v-model="query.point_code"
+              size="small"
+              clearable
+              :placeholder="$t('Inst.table.input_startCode_or_nextCode')"
+              style="width: 200px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item  :label="$t('Inst.table.instruction_type')">
+            <el-select
+              v-model="query.instruction_type"
+              clearable
+              filterable
+              size="small"
+              :placeholder="$t('Inst.table.instruction_type')"
+              class="filter-item"
+              style="width: 200px"
+              @change="crud.toQuery"
+            >
+              <el-option v-for="item in dict.task_type" :key="item.id" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-form>
         <rrOperation />
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
diff --git a/acs/nladmin-ui/src/views/acs/route/routeLine/index.vue b/acs/nladmin-ui/src/views/acs/route/routeLine/index.vue
index dd0b96d..bd278db 100644
--- a/acs/nladmin-ui/src/views/acs/route/routeLine/index.vue
+++ b/acs/nladmin-ui/src/views/acs/route/routeLine/index.vue
@@ -4,8 +4,13 @@
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
         <!-- 搜索 -->
-        <el-row :gutter="20">
-          <el-col :span="6">
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-suffix=":"
+        >
+          <el-form-item  :label="$t('route.table_title.type')">
             <el-select
               v-model="query.route_plan_id"
               :placeholder="$t('route.placeholder.please_type')"
@@ -18,8 +23,8 @@
                 :value="item.plan_uuid"
               />
             </el-select>
-          </el-col>
-          <el-col :span="6">
+          </el-form-item>
+          <el-form-item  :label="$t('route.table_title.device_code')">
             <el-input
               v-model="query.device_code"
               clearable
@@ -29,8 +34,8 @@
               class="filter-item"
               @keyup.enter.native="crud.toQuery"
             />
-          </el-col>
-          <el-col :span="6">
+          </el-form-item>
+          <el-form-item  :label="$t('route.table_title.next_device_code')">
             <el-input
               v-model="query.next_device_code"
               clearable
@@ -40,9 +45,9 @@
               class="filter-item"
               @keyup.enter.native="crud.toQuery"
             />
-          </el-col>
+          </el-form-item>
           <rrOperation />
-        </el-row>
+        </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
@@ -65,7 +70,7 @@
         :title="crud.status.title"
         width="600px"
       >
-        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="120px">
+        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="170px">
           <el-form-item v-if="false" label="路线标识" prop="line_uuid">
             <el-input v-model="form.line_uuid" style="width: 370px;" />
           </el-form-item>
@@ -142,12 +147,12 @@
             <el-input-number v-model="form.weights" :min="1" :max="10" label="描述文字" />
           </el-form-item>
           <el-form-item :label="$t('route.table_title.remark')" prop="description">
-            <el-input v-model="form.remark" style="width: 370px;" rows="5" type="textarea" />
+            <el-input v-model="form.remark" style="width: 370px;" rows="1" type="textarea" />
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+          <el-button type="text" @click="crud.cancelCU">{{ $t('task.select.Cancel') }}</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('task.select.Confirm') }}</el-button>
         </div>
       </el-dialog>
       <!--表格渲染-->
diff --git a/acs/nladmin-ui/src/views/acs/task/index.vue b/acs/nladmin-ui/src/views/acs/task/index.vue
index 6a7762d..4dd0dd2 100644
--- a/acs/nladmin-ui/src/views/acs/task/index.vue
+++ b/acs/nladmin-ui/src/views/acs/task/index.vue
@@ -4,69 +4,88 @@
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
         <!-- 搜索 -->
-        <el-input
-          v-model="query.task_code"
-          size="small"
-          clearable
-          :placeholder="$t('task.txt_box.Enter_task_number')"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <el-input
-          v-model="query.vehicle_code"
-          size="small"
-          clearable
-          :placeholder="$t('task.txt_box.Vehicle_registration_number')"
-          style="width: 225px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <el-select
-          v-model="query.material_type"
-          clearable
-          filterable
-          size="small"
-          :placeholder="$t('task.txt_box.Material_type')"
-          class="filter-item"
-          style="width: 190px"
-          @change="crud.toQuery"
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-suffix=":"
         >
-          <el-option v-for="item in materialList" :key="item.id" :label="item.label" :value="item.value" />
-        </el-select>
-        <el-select
-          v-model="query.status"
-          clearable
-          filterable
-          size="small"
-          :placeholder="$t('task.txt_box.Task_status')"
-          class="filter-item"
-          style="width: 190px"
-          @change="crud.toQuery"
-        >
-          <el-option v-for="item in dict.task_status" :key="item.id" :label="item.label" :value="item.value" />
-        </el-select>
-        <el-input
-          v-model="query.point_code"
-          size="small"
-          clearable
-          :placeholder="$t('task.txt_box.Origin_or_destination')"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <el-select
-          v-model="query.task_type"
-          clearable
-          filterable
-          size="small"
-          :placeholder="$t('task.txt_box.Task_type')"
-          class="filter-item"
-          style="width: 190px"
-          @change="crud.toQuery"
-        >
-          <el-option v-for="item in dict.task_type" :key="item.id" :label="item.label" :value="item.value" />
-        </el-select>
+          <el-form-item  :label="$t('task.txt_box.Task_code')">
+            <el-input
+              v-model="query.task_code"
+              size="small"
+              clearable
+              :placeholder="$t('task.txt_box.Enter_task_number')"
+              style="width: 200px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item :label="$t('task.txt_box.Vehicle_number')">
+            <el-input
+              v-model="query.vehicle_code"
+              size="small"
+              clearable
+              :placeholder="$t('task.txt_box.Vehicle_registration_number')"
+              style="width: 200px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item :label="$t('task.txt_box.Material_type')">
+            <el-select
+              v-model="query.material_type"
+              clearable
+              filterable
+              size="small"
+              :placeholder="$t('task.txt_box.Material_type')"
+              class="filter-item"
+              style="width: 200px"
+              @change="crud.toQuery"
+            >
+              <el-option v-for="item in materialList" :key="item.id" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item :label="$t('task.txt_box.Task_status')">
+            <el-select
+              v-model="query.status"
+              clearable
+              filterable
+              size="small"
+              :placeholder="$t('task.txt_box.Task_status')"
+              class="filter-item"
+              style="width: 200px"
+              @change="crud.toQuery"
+            >
+              <el-option v-for="item in dict.task_status" :key="item.id" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item :label="$t('task.txt_box.start_or_end')">
+            <el-input
+              v-model="query.point_code"
+              size="small"
+              clearable
+              :placeholder="$t('task.txt_box.Origin_or_destination')"
+              style="width: 200px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item :label="$t('task.txt_box.Task_type')">
+            <el-select
+              v-model="query.task_type"
+              clearable
+              filterable
+              size="small"
+              :placeholder="$t('task.txt_box.Task_type')"
+              class="filter-item"
+              style="width: 200px"
+              @change="crud.toQuery"
+            >
+              <el-option v-for="item in dict.task_type" :key="item.id" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
@@ -92,229 +111,237 @@
         </el-button>
       </crudOperation>
       <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :visible.sync="formDia" :title="crud.status.title" width="500px">
-        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
-          <el-form-item v-if="false" label="任务标识" prop="task_id">
-            <el-input v-model="form.task_id" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item :label="$t('task.txt_box.Material_type')">
-            <el-select
-              v-model="form.material"
-              style="width: 370px;"
-              filterable
-              :placeholder="$t('task.select.Placeholder')"
-              @change="isDisabled=false"
-            >
-              <el-option
-                v-for="item in dict.material_type"
-                :key="item.id"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="$t('task.txt_box.Task_type')">
-            <el-select
-              v-model="form.task_type"
-              style="width: 370px;"
-              filterable
-              :placeholder="$t('task.select.Placeholder')"
-              @change="isDisabled=false"
-            >
-              <el-option
-                v-for="item in dict.task_type"
-                :key="item.id"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item v-if="form.task_type == '7'" :label="$t('task.txt_box.Warehouse_task_type')">
-            <el-select
-              v-model="form.storage_task_type"
-              style="width: 370px;"
-              filterable
-              :placeholder="$t('task.select.Placeholder')"
-              @change="isDisabled=false"
-            >
-              <el-option
-                v-for="item in dict.storage_task_type"
-                :key="item.id"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="$t('task.txt_box.AGV_system')">
-            <el-select
-              v-model="form.agv_system_type"
-              style="width: 370px;"
-              filterable
-              clearable
-              :placeholder="$t('task.select.Placeholder')"
-              @change="isDisabled=false"
-            >
-              <el-option
-                v-for="item in dict.agv_system_type"
-                :key="item.id"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="$t('task.txt_box.Routing_scheme')">
-            <el-select
-              v-model="form.route_plan_code"
-              style="width: 370px;"
-              filterable
-              :placeholder="$t('task.select.Placeholder')"
-              default-first-option
-              @change="isDisabled=false"
-            >
-              <el-option
-                v-for="item in routeList"
-                :key="item.plan_code"
-                :label="item.plan_name"
-                :value="item.plan_code"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="$t('task.select.Start_point')" prop="start_point_code">
-            <el-select
-              v-model="form.start_point_code"
-              style="width: 370px;"
-              filterable
-              :placeholder="$t('task.select.Placeholder')"
-              @change="showStartStorage"
-            >
-              <el-option
-                v-for="item in deviceList"
-                :key="item.device_code"
-                :label="item.device_code"
-                :value="item.device_code"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item v-show="start_flag" :label="$t('task.select.Starting_column')" prop="from_y">
-            <el-select
-              v-model="form.from_y"
-              style="width: 370px;"
-              filterable
-              :placeholder="$t('task.select.Placeholder')"
-              @change="isDisabled=false"
-            >
-              <el-option
-                v-for="item in fromYList"
-                :key="item.id"
-                :label="item.value"
-                :value="item.id"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item v-show="start_flag" :label="$t('task.select.Starting_layer')" prop="from_z">
-            <el-select
-              v-model="form.from_z"
-              style="width: 370px;"
-              filterable
-              :placeholder="$t('task.select.Placeholder')"
-              @change="isDisabled=false"
-            >
-              <el-option
-                v-for="item in fromZList"
-                :key="item.id"
-                :label="item.value"
-                :value="item.id"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="$t('task.select.Destination')" prop="next_point_code">
-            <el-select
-              v-model="form.next_point_code"
-              style="width: 370px;"
-              filterable
-              :placeholder="$t('task.select.Placeholder')"
-              @change="showEndStorage"
-            >
-              <el-option
-                v-for="item in deviceList"
-                :key="item.device_code"
-                :label="item.device_code"
-                :value="item.device_code"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item v-show="end_flag" :label="$t('task.select.Ending_column')" prop="to_y">
-            <el-select
-              v-model="form.to_y"
-              style="width: 370px;"
-              filterable
-              :placeholder="$t('task.select.Placeholder')"
-              @change="isDisabled=false"
-            >
-              <el-option
-                v-for="item in toYList"
-                :key="item.id"
-                :label="item.value"
-                :value="item.id"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item v-show="end_flag" :label="$t('task.select.Ending_layer')" prop="to_z">
-            <el-select
-              v-model="form.to_z"
-              style="width: 370px;"
-              filterable
-              :placeholder="$t('task.select.Placeholder')"
-              @change="isDisabled=false"
-            >
-              <el-option
-                v-for="item in toZList"
-                :key="item.id"
-                :label="item.value"
-                :value="item.id"
-                @change="isDisabled=false"
-              />
-            </el-select>
-          </el-form-item>
-          <!--          <el-form-item label="起点2" prop="start_point_code2">-->
-          <!--            <el-select-->
-          <!--              v-model="form.start_point_code2"-->
-          <!--              style="width: 370px;"-->
-          <!--              filterable-->
-          <!--              placeholder="请选择"-->
-          <!--            >-->
-          <!--              <el-option-->
-          <!--                v-for="item in deviceList"-->
-          <!--                :key="item.device_code"-->
-          <!--                :label="item.device_code"-->
-          <!--                :value="item.device_code"-->
-          <!--              />-->
-          <!--            </el-select>-->
-          <!--          </el-form-item>-->
-          <!--          <el-form-item label="终点2" prop="next_point_code2">-->
-          <!--            <el-select-->
-          <!--              v-model="form.next_point_code2"-->
-          <!--              style="width: 370px;"-->
-          <!--              filterable-->
-          <!--              placeholder="请选择"-->
-          <!--            >-->
-          <!--              <el-option-->
-          <!--                v-for="item in deviceList"-->
-          <!--                :key="item.device_code"-->
-          <!--                :label="item.device_code"-->
-          <!--                :value="item.device_code"-->
-          <!--              />-->
-          <!--            </el-select>-->
-          <!--          </el-form-item>-->
-          <el-form-item :label="$t('task.txt_box.Priority')">
-            <el-input v-model="form.priority" style="width: 370px;" @change="isDisabled=false" />
-          </el-form-item>
-          <el-form-item :label="$t('task.txt_box.Vehicle_number')">
-            <el-input v-model="form.vehicle_code" style="width: 370px;" @change="isDisabled=false" />
-          </el-form-item>
-          <el-form-item :label="$t('task.select.Description')" prop="description">
-            <el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea" @change="isDisabled=false" />
-          </el-form-item>
+      <el-dialog :close-on-click-modal="false" :visible.sync="formDia" :title="crud.status.title" width="1100px">
+        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="135px">
+          <el-row>
+            <el-col :span="12">
+              <div class="grid-content bg-purple"></div>
+              <el-form-item v-if="false" label="任务标识" prop="task_id">
+                <el-input v-model="form.task_id" style="width: 240px;" />
+              </el-form-item>
+              <el-form-item :label="$t('task.txt_box.Material_type')">
+                <el-select
+                  v-model="form.material"
+                  style="width: 370px;"
+                  filterable
+                  :placeholder="$t('task.select.Placeholder')"
+                  @change="isDisabled=false"
+                >
+                  <el-option
+                    v-for="item in dict.material_type"
+                    :key="item.id"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item :label="$t('task.txt_box.Task_type')">
+                <el-select
+                  v-model="form.task_type"
+                  style="width: 370px;"
+                  filterable
+                  :placeholder="$t('task.select.Placeholder')"
+                  @change="isDisabled=false"
+                >
+                  <el-option
+                    v-for="item in dict.task_type"
+                    :key="item.id"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item v-if="form.task_type == '7'" :label="$t('task.txt_box.Warehouse_task_type')">
+                <el-select
+                  v-model="form.storage_task_type"
+                  style="width: 370px;"
+                  filterable
+                  :placeholder="$t('task.select.Placeholder')"
+                  @change="isDisabled=false"
+                >
+                  <el-option
+                    v-for="item in dict.storage_task_type"
+                    :key="item.id"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item :label="$t('task.txt_box.AGV_system')">
+                <el-select
+                  v-model="form.agv_system_type"
+                  style="width: 370px;"
+                  filterable
+                  clearable
+                  :placeholder="$t('task.select.Placeholder')"
+                  @change="isDisabled=false"
+                >
+                  <el-option
+                    v-for="item in dict.agv_system_type"
+                    :key="item.id"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item :label="$t('task.txt_box.Routing_scheme')">
+                <el-select
+                  v-model="form.route_plan_code"
+                  style="width: 370px;"
+                  filterable
+                  :placeholder="$t('task.select.Placeholder')"
+                  default-first-option
+                  @change="isDisabled=false"
+                >
+                  <el-option
+                    v-for="item in routeList"
+                    :key="item.plan_code"
+                    :label="item.plan_name"
+                    :value="item.plan_code"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item :label="$t('task.select.Start_point')" prop="start_point_code">
+                <el-select
+                  v-model="form.start_point_code"
+                  style="width: 370px;"
+                  filterable
+                  :placeholder="$t('task.select.Placeholder')"
+                  @change="showStartStorage"
+                >
+                  <el-option
+                    v-for="item in deviceList"
+                    :key="item.device_code"
+                    :label="item.device_code"
+                    :value="item.device_code"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="grid-content bg-purple-light"></div>
+              <el-form-item v-show="start_flag" :label="$t('task.select.Starting_column')" prop="from_y">
+                <el-select
+                  v-model="form.from_y"
+                  style="width: 370px;"
+                  filterable
+                  :placeholder="$t('task.select.Placeholder')"
+                  @change="isDisabled=false"
+                >
+                  <el-option
+                    v-for="item in fromYList"
+                    :key="item.id"
+                    :label="item.value"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item v-show="start_flag" :label="$t('task.select.Starting_layer')" prop="from_z">
+                <el-select
+                  v-model="form.from_z"
+                  style="width: 370px;"
+                  filterable
+                  :placeholder="$t('task.select.Placeholder')"
+                  @change="isDisabled=false"
+                >
+                  <el-option
+                    v-for="item in fromZList"
+                    :key="item.id"
+                    :label="item.value"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item :label="$t('task.select.Destination')" prop="next_point_code">
+                <el-select
+                  v-model="form.next_point_code"
+                  style="width: 370px;"
+                  filterable
+                  :placeholder="$t('task.select.Placeholder')"
+                  @change="showEndStorage"
+                >
+                  <el-option
+                    v-for="item in deviceList"
+                    :key="item.device_code"
+                    :label="item.device_code"
+                    :value="item.device_code"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item v-show="end_flag" :label="$t('task.select.Ending_column')" prop="to_y">
+                <el-select
+                  v-model="form.to_y"
+                  style="width: 370px;"
+                  filterable
+                  :placeholder="$t('task.select.Placeholder')"
+                  @change="isDisabled=false"
+                >
+                  <el-option
+                    v-for="item in toYList"
+                    :key="item.id"
+                    :label="item.value"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item v-show="end_flag" :label="$t('task.select.Ending_layer')" prop="to_z">
+                <el-select
+                  v-model="form.to_z"
+                  style="width: 370px;"
+                  filterable
+                  :placeholder="$t('task.select.Placeholder')"
+                  @change="isDisabled=false"
+                >
+                  <el-option
+                    v-for="item in toZList"
+                    :key="item.id"
+                    :label="item.value"
+                    :value="item.id"
+                    @change="isDisabled=false"
+                  />
+                </el-select>
+              </el-form-item>
+              <!--          <el-form-item label="起点2" prop="start_point_code2">-->
+              <!--            <el-select-->
+              <!--              v-model="form.start_point_code2"-->
+              <!--              style="width: 370px;"-->
+              <!--              filterable-->
+              <!--              placeholder="请选择"-->
+              <!--            >-->
+              <!--              <el-option-->
+              <!--                v-for="item in deviceList"-->
+              <!--                :key="item.device_code"-->
+              <!--                :label="item.device_code"-->
+              <!--                :value="item.device_code"-->
+              <!--              />-->
+              <!--            </el-select>-->
+              <!--          </el-form-item>-->
+              <!--          <el-form-item label="终点2" prop="next_point_code2">-->
+              <!--            <el-select-->
+              <!--              v-model="form.next_point_code2"-->
+              <!--              style="width: 370px;"-->
+              <!--              filterable-->
+              <!--              placeholder="请选择"-->
+              <!--            >-->
+              <!--              <el-option-->
+              <!--                v-for="item in deviceList"-->
+              <!--                :key="item.device_code"-->
+              <!--                :label="item.device_code"-->
+              <!--                :value="item.device_code"-->
+              <!--              />-->
+              <!--            </el-select>-->
+              <!--          </el-form-item>-->
+              <el-form-item :label="$t('task.txt_box.Priority')">
+                <el-input v-model="form.priority" style="width: 370px;" @change="isDisabled=false" />
+              </el-form-item>
+              <el-form-item :label="$t('task.txt_box.Vehicle_number')">
+                <el-input v-model="form.vehicle_code" style="width: 370px;" @change="isDisabled=false" />
+              </el-form-item>
+              <el-form-item :label="$t('task.select.Description')" prop="description">
+                <el-input v-model="form.remark" style="width: 370px;"  type="textarea" @change="isDisabled=false" />
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="text" @click="formDia=false">{{ $t('task.select.Cancel') }}</el-button>
diff --git a/acs/nladmin-ui/src/views/acs/task/taskFeedback/index.vue b/acs/nladmin-ui/src/views/acs/task/taskFeedback/index.vue
index f7c5603..d52604d 100644
--- a/acs/nladmin-ui/src/views/acs/task/taskFeedback/index.vue
+++ b/acs/nladmin-ui/src/views/acs/task/taskFeedback/index.vue
@@ -90,11 +90,10 @@
       </el-dialog>
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
-        <el-table-column type="selection" width="55" />
         <el-table-column v-if="false" prop="taskback_id" label="任务反馈标识" />
         <el-table-column v-if="false" prop="task_id" label="任务标识" />
         <el-table-column prop="task_code" :label="$t('task.txt_box.Task_code')" :min-width="flexWidth('task_code',crud.data,$t('task.txt_box.Task_code'))" />
-        <el-table-column prop="task_type" :label="$t('task.txt_box.Task_type')" :min-width="flexWidth('task_type',crud.data,$t('task.txt_box.Task_type'))" />
+        <el-table-column prop="task_type" :label="$t('task.txt_box.Task_type')" min-width="150px" />
         <el-table-column prop="task_status" :label="$t('task.txt_box.Task_status')" :min-width="flexWidth('task_status',crud.data,$t('task.txt_box.Task_status'))" />
         <el-table-column prop="start_point_code" :label="$t('task.select.Starting_point')" :min-width="flexWidth('start_point_code',crud.data,$t('task.txt_box.Starting_point'))" />
         <el-table-column prop="next_point_code" :label="$t('task.select.Target_point')" :min-width="flexWidth('next_point_code',crud.data,$t('task.txt_box.Target_point'))" />
diff --git a/acs/nladmin-ui/src/views/monitor/log/search.vue b/acs/nladmin-ui/src/views/monitor/log/search.vue
index af906d6..7c485e5 100644
--- a/acs/nladmin-ui/src/views/monitor/log/search.vue
+++ b/acs/nladmin-ui/src/views/monitor/log/search.vue
@@ -1,15 +1,25 @@
 <template>
   <div v-if="crud.props.searchToggle">
-    <el-input
-      v-model="query.blurry"
-      clearable
-      size="mini"
-      :placeholder="$t('monitor.table.search')"
-      style="width: 200px;"
-      class="filter-item"
-    />
-    <date-range-picker v-model="query.createTime" class="date-item" />
-    <rrOperation />
+    <!-- 搜索 -->
+    <el-form
+      :inline="true"
+      class="demo-form-inline"
+      label-position="right"
+      label-suffix=":"
+    >
+      <el-form-item  :label="$t('monitor.table.search')">
+        <el-input
+          v-model="query.blurry"
+          clearable
+          size="mini"
+          :placeholder="$t('monitor.table.search')"
+          style="width: 200px;"
+          class="filter-item"
+        />
+      </el-form-item>
+      <date-range-picker v-model="query.createTime" class="date-item" />
+      <rrOperation />
+    </el-form>
   </div>
 </template>
 
diff --git a/acs/nladmin-ui/src/views/monitor/lucene/index.vue b/acs/nladmin-ui/src/views/monitor/lucene/index.vue
index bc6fb3e..5987c8f 100644
--- a/acs/nladmin-ui/src/views/monitor/lucene/index.vue
+++ b/acs/nladmin-ui/src/views/monitor/lucene/index.vue
@@ -1,8 +1,122 @@
 <template>
   <div class="app-container">
     <div class="head-container">
-      <Search />
-      <crudOperation />
+      <div>
+        <!-- 搜索 -->
+        <!-- <el-input
+          v-model="query.device_code"
+          clearable
+          size="small"
+          placeholder="请输入你要搜索的设备号"
+          style="width: 200px;"
+          class="filter-item"
+        /> -->
+        <!-- <el-select
+              v-model="query.device_code"
+              clearable
+              filterable
+              size="small"
+              placeholder="请输入你要搜索的设备号"
+              class="filter-item"
+              style="width: 190px"
+              @change="crud.toQuery"
+            >
+            <el-option v-for="item in device_codes" :key="item.id" :label="item.label" :value="item.value" />
+            </el-select> -->
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-suffix=":"
+        >
+          <el-form-item  :label="$t('monitor.lucence.device_code')">
+            <el-select
+              ref="test"
+              v-model="query.device_code"
+              filterable
+              clearable
+              reserve-keyword
+              :placeholder="$t('monitor.lucence.device_code')"
+              style="width: 200px;"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in deviceList"
+                :key="item.device_code"
+                :label="item.device_code"
+                :value="item.device_code"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item  :label="$t('monitor.lucence.method')">
+            <el-input
+              v-model="query.method"
+              clearable
+              size="small"
+              :placeholder="$t('monitor.lucence.method_name')"
+              style="width: 200px;"
+              class="filter-item"
+            />
+          </el-form-item>
+          <el-form-item  :label="$t('monitor.lucence.status_code')">
+            <el-input
+              v-model="query.status_code"
+              clearable
+              size="small"
+              :placeholder="$t('monitor.lucence.search_status_code')"
+              style="width: 200px;"
+              class="filter-item"
+            />
+          </el-form-item>
+          <el-form-item  :label="$t('monitor.lucence.requestparam')">
+            <el-input
+              v-model="query.requestparam"
+              clearable
+              size="small"
+              :placeholder="$t('monitor.lucence.search_request_param')"
+              style="width: 200px;"
+              class="filter-item"
+            />
+          </el-form-item>
+          <el-form-item  :label="$t('monitor.lucence.responseparam')">
+            <el-input
+              v-model="query.responseparam"
+              clearable
+              size="small"
+              :placeholder="$t('monitor.lucence.search_response_param')"
+              style="width: 200px;"
+              class="filter-item"
+            />
+          </el-form-item>
+          <el-form-item  :label="$t('monitor.lucence.content')">
+            <el-input
+              v-model="query.blurry"
+              clearable
+              size="small"
+              :placeholder="$t('monitor.lucence.search_content')"
+              style="width: 200px;"
+              class="filter-item"
+            />
+          </el-form-item>
+          <el-form-item  :label="$t('monitor.lucence.logTime')">
+            <el-date-picker
+              v-model="query.createTime"
+              type="datetimerange"
+              :picker-options="pickerOptions"
+              format="yyyy-MM-dd HH:mm:ss"
+              :range-separator="$t('monitor.lucence.until')"
+              :start-placeholder="$t('monitor.lucence.start_time')"
+              :end-placeholder="$t('monitor.lucence.end_time')"
+              align="right"
+            />
+          </el-form-item>
+          <rrOperation />
+        </el-form>
+        <!--
+            <date-range-picker v-model="query.createTime" class="date-item" />
+        -->
+      </div>
+<!--      <crudOperation />-->
     </div>
     <!--表格渲染-->
     <el-table
@@ -14,16 +128,16 @@
     >
       <!--      <el-table-column type="selection" width="55"/>-->
       <!--      <el-table-column v-if="false" prop="id" label="id"/>-->
-      <el-table-column prop="operate" width="50" :label="$t('monitor.lucence.operate')" />
-      <el-table-column prop="device_code" :label="$t('monitor.lucence.device_code')" min-width="130" show-overflow-tooltip />
-      <el-table-column prop="task_code" :label="$t('monitor.lucence.task_code')" />
-      <el-table-column prop="instruct_code" :label="$t('monitor.lucence.instruct_code')" />
-      <el-table-column prop="method" :label="$t('monitor.lucence.method')" />
-      <el-table-column prop="status_code" :label="$t('monitor.lucence.status_code')" />
-      <el-table-column prop="requestparam" :label="$t('monitor.lucence.requestparam')" />
-      <el-table-column prop="responseparam" :label="$t('monitor.lucence.responseparam')" />
-      <el-table-column prop="logTime" width="170" :label="$t('monitor.lucence.logTime')" />
-      <el-table-column prop="content" width="500" :label="$t('monitor.lucence.content')" />
+      <el-table-column prop="operate" :min-width="flexWidth('operate',crud.data,$t('monitor.lucence.operate'))" :label="$t('monitor.lucence.operate')"  />
+      <el-table-column prop="device_code" :label="$t('monitor.lucence.device_code')" :min-width="flexWidth('device_code',crud.data,$t('monitor.lucence.device_code'))" show-overflow-tooltip />
+      <el-table-column prop="task_code" :label="$t('monitor.lucence.task_code')" :min-width="flexWidth('task_code',crud.data,$t('monitor.lucence.task_code'))" />
+      <el-table-column prop="instruct_code" :label="$t('monitor.lucence.instruct_code')" :min-width="flexWidth('instruct_code',crud.data,$t('monitor.lucence.instruct_code'))" />
+      <el-table-column prop="method" :label="$t('monitor.lucence.method')" :min-width="flexWidth('method',crud.data,$t('monitor.lucence.method'))" />
+      <el-table-column prop="status_code" :label="$t('monitor.lucence.status_code')" :min-width="flexWidth('status_code',crud.data,$t('monitor.lucence.status_code'))" />
+      <el-table-column prop="requestparam" :label="$t('monitor.lucence.requestparam')" :min-width="flexWidth('requestparam',crud.data,$t('monitor.lucence.requestparam'))" />
+      <el-table-column prop="responseparam" :label="$t('monitor.lucence.responseparam')" :min-width="flexWidth('responseparam',crud.data,$t('monitor.lucence.responseparam'))" />
+      <el-table-column prop="logTime"  :label="$t('monitor.lucence.logTime')" :min-width="flexWidth('logTime',crud.data,$t('monitor.lucence.logTime'))" />
+      <el-table-column prop="content" :min-width="flexWidth('content',crud.data,$t('monitor.lucence.content'))" :label="$t('monitor.lucence.content')" />
 
     </el-table>
     <!--分页组件-->
@@ -32,15 +146,15 @@
 </template>
 
 <script>
-import Search from './search'
 import CRUD, { crud, header, presenter } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
 import { delAll } from '@/api/acs/lucene/log'
+import deviceCrud from '@/api/acs/device/device'
 
 export default {
   name: 'LuceneLog',
-  components: { Search, pagination, crudOperation },
+  components: { pagination, crudOperation },
   mixins: [presenter(), header(), crud()],
   cruds: function() {
     return CRUD({
@@ -75,6 +189,9 @@ export default {
     }
   },
   created() {
+    deviceCrud.selectDeviceList().then(data => {
+      this.deviceList = data
+    })
   },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
diff --git a/acs/nladmin-ui/src/views/monitor/lucene/search.vue b/acs/nladmin-ui/src/views/monitor/lucene/search.vue
index 190fe0d..714e957 100644
--- a/acs/nladmin-ui/src/views/monitor/lucene/search.vue
+++ b/acs/nladmin-ui/src/views/monitor/lucene/search.vue
@@ -1,99 +1,123 @@
 <template>
-  <div v-if="crud.props.searchToggle">
-
-    <!-- <el-input
-      v-model="query.device_code"
-      clearable
-      size="small"
-      placeholder="请输入你要搜索的设备号"
-      style="width: 200px;"
-      class="filter-item"
-    /> -->
-    <!-- <el-select
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <!-- <el-input
           v-model="query.device_code"
           clearable
-          filterable
           size="small"
           placeholder="请输入你要搜索的设备号"
+          style="width: 200px;"
           class="filter-item"
-          style="width: 190px"
-          @change="crud.toQuery"
+        /> -->
+        <!-- <el-select
+              v-model="query.device_code"
+              clearable
+              filterable
+              size="small"
+              placeholder="请输入你要搜索的设备号"
+              class="filter-item"
+              style="width: 190px"
+              @change="crud.toQuery"
+            >
+            <el-option v-for="item in device_codes" :key="item.id" :label="item.label" :value="item.value" />
+            </el-select> -->
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-suffix=":"
         >
-        <el-option v-for="item in device_codes" :key="item.id" :label="item.label" :value="item.value" />
-        </el-select> -->
-    <el-select
-      ref="test"
-      v-model="query.device_code"
-      filterable
-      clearable
-      reserve-keyword
-      :placeholder="$t('monitor.lucence.device_code')"
-      style="width: 190px;"
-      @change="crud.toQuery"
-    >
-      <el-option
-        v-for="item in deviceList"
-        :key="item.device_code"
-        :label="item.device_code"
-        :value="item.device_code"
-      />
-    </el-select>
-
-    <el-input
-      v-model="query.method"
-      clearable
-      size="small"
-      :placeholder="$t('monitor.lucence.method_name')"
-      style="width: 200px;"
-      class="filter-item"
-    />
-    <el-input
-      v-model="query.status_code"
-      clearable
-      size="small"
-      :placeholder="$t('monitor.lucence.search_status_code')"
-      style="width: 200px;"
-      class="filter-item"
-    />
-    <el-input
-      v-model="query.requestparam"
-      clearable
-      size="small"
-      :placeholder="$t('monitor.lucence.search_request_param')"
-      style="width: 200px;"
-      class="filter-item"
-    />
-    <el-input
-      v-model="query.responseparam"
-      clearable
-      size="small"
-      :placeholder="$t('monitor.lucence.search_response_param')"
-      style="width: 200px;"
-      class="filter-item"
-    />
-    <el-input
-      v-model="query.blurry"
-      clearable
-      size="small"
-      :placeholder="$t('monitor.lucence.search_content')"
-      style="width: 200px;"
-      class="filter-item"
-    />
-    <!--
-        <date-range-picker v-model="query.createTime" class="date-item" />
-    -->
-
-    <el-date-picker
-      v-model="query.createTime"
-      type="datetimerange"
-      :picker-options="pickerOptions"
-      format="yyyy-MM-dd HH:mm:ss"
-      :range-separator="$t('monitor.lucence.until')"
-      :start-placeholder="$t('monitor.lucence.start_time')"
-      :end-placeholder="$t('monitor.lucence.end_time')"
-      align="right"
-    />
-    <rrOperation />
+          <el-form-item  :label="$t('monitor.lucence.device_code')">
+            <el-select
+              ref="test"
+              v-model="query.device_code"
+              filterable
+              clearable
+              reserve-keyword
+              :placeholder="$t('monitor.lucence.device_code')"
+              style="width: 200px;"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in deviceList"
+                :key="item.device_code"
+                :label="item.device_code"
+                :value="item.device_code"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item  :label="$t('monitor.lucence.method')">
+            <el-input
+              v-model="query.method"
+              clearable
+              size="small"
+              :placeholder="$t('monitor.lucence.method_name')"
+              style="width: 200px;"
+              class="filter-item"
+            />
+          </el-form-item>
+          <el-form-item  :label="$t('monitor.lucence.status_code')">
+            <el-input
+              v-model="query.status_code"
+              clearable
+              size="small"
+              :placeholder="$t('monitor.lucence.search_status_code')"
+              style="width: 200px;"
+              class="filter-item"
+            />
+          </el-form-item>
+          <el-form-item  :label="$t('monitor.lucence.requestparam')">
+            <el-input
+              v-model="query.requestparam"
+              clearable
+              size="small"
+              :placeholder="$t('monitor.lucence.search_request_param')"
+              style="width: 200px;"
+              class="filter-item"
+            />
+          </el-form-item>
+          <el-form-item  :label="$t('monitor.lucence.responseparam')">
+            <el-input
+              v-model="query.responseparam"
+              clearable
+              size="small"
+              :placeholder="$t('monitor.lucence.search_response_param')"
+              style="width: 200px;"
+              class="filter-item"
+            />
+          </el-form-item>
+          <el-form-item  :label="$t('monitor.lucence.content')">
+            <el-input
+              v-model="query.blurry"
+              clearable
+              size="small"
+              :placeholder="$t('monitor.lucence.search_content')"
+              style="width: 200px;"
+              class="filter-item"
+            />
+          </el-form-item>
+          <el-form-item  :label="$t('monitor.lucence.logTime')">
+            <el-date-picker
+              v-model="query.createTime"
+              type="datetimerange"
+              :picker-options="pickerOptions"
+              format="yyyy-MM-dd HH:mm:ss"
+              :range-separator="$t('monitor.lucence.until')"
+              :start-placeholder="$t('monitor.lucence.start_time')"
+              :end-placeholder="$t('monitor.lucence.end_time')"
+              align="right"
+            />
+          </el-form-item>
+          <rrOperation />
+        </el-form>
+        <!--
+            <date-range-picker v-model="query.createTime" class="date-item" />
+        -->
+      </div>
+    </div>
   </div>
 </template>
 
diff --git a/acs/nladmin-ui/src/views/system/auto/index.vue b/acs/nladmin-ui/src/views/system/auto/index.vue
index 071cae2..ee8cceb 100644
--- a/acs/nladmin-ui/src/views/system/auto/index.vue
+++ b/acs/nladmin-ui/src/views/system/auto/index.vue
@@ -21,7 +21,7 @@
       <el-table-column show-overflow-tooltip prop="stopMessage"  :label="$t('Auto.table.stopMessage')" :min-width="flexWidth('stopMessage',crud.data,$t('Auto.table.stopMessage'))" />
       <el-table-column v-permission="['admin','timing:edit','timing:del']" :label="$t('Auto.table.operate')"  width="170px" align="center" fixed="right">
         <template slot-scope="scope">
-          <el-button v-permission="['admin','timing:edit']" style="margin-left: -2px" type="text" size="mini" @click="start(scope.row.code)">{{ $t('common.firing') }}</el-button>
+          <el-button v-permission="['admin','timing:edit']" style="margin-left: -2px" type="text" size="mini" icon="el-icon-video-pause" @click="start(scope.row.code)">{{ $t('common.firing') }}</el-button>
           <el-popover
             :ref="scope.row.code"
             placement="top"
@@ -30,9 +30,9 @@
             {{ $t('Auto.msg.stop_msg') }}
             <div style="text-align: right; margin: 0">
               <el-button size="mini" type="text" @click="$refs[scope.row.code].doClose()">{{ $t('common.Cancel') }}</el-button>
-              <el-button :loading="delLoading" type="primary" size="mini" @click="stop(scope.row.code)">{{ $t('common.determine') }}</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini"  @click="stop(scope.row.code)">{{ $t('common.determine') }}</el-button>
             </div>
-            <el-button slot="reference" type="text" size="mini">{{ $t('common.stop') }}</el-button>
+            <el-button slot="reference" icon="el-icon-video-play" type="text" size="mini">{{ $t('common.stop') }}</el-button>
           </el-popover>
 
         </template>
diff --git a/acs/nladmin-ui/src/views/system/param/index.vue b/acs/nladmin-ui/src/views/system/param/index.vue
index b9a234b..5dbf1dc 100644
--- a/acs/nladmin-ui/src/views/system/param/index.vue
+++ b/acs/nladmin-ui/src/views/system/param/index.vue
@@ -23,7 +23,7 @@
             <el-input v-model="form.value" style="width: 370px;" />
           </el-form-item>
           <el-form-item :label="$t('SysParam.table.description')" prop="description">
-            <el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea" />
+            <el-input v-model="form.remark" style="width: 370px;" rows="1" type="textarea" />
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
diff --git a/acs/nladmin-ui/src/views/system/role/index.vue b/acs/nladmin-ui/src/views/system/role/index.vue
index 9db1230..a1ef7cf 100644
--- a/acs/nladmin-ui/src/views/system/role/index.vue
+++ b/acs/nladmin-ui/src/views/system/role/index.vue
@@ -4,16 +4,25 @@
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
         <!-- 搜索 -->
-        <el-input
-          v-model="query.blurry"
-          size="mini"
-          clearable
-          placeholder="输入名称"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <rrOperation />
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-suffix=":"
+        >
+          <el-form-item  :label="$t('task.txt_box.Task_code')">
+            <el-input
+              v-model="query.blurry"
+              size="mini"
+              clearable
+              :placeholder="$t('TaskRecord.table.Input_task_instruction_number')"
+              style="width: 200px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <rrOperation />
+        </el-form>
       </div>
       <crudOperation :permission="permission" />
     </div>
diff --git a/acs/nladmin-ui/src/views/system/timing/index.vue b/acs/nladmin-ui/src/views/system/timing/index.vue
index 9d5b50c..b07dd68 100644
--- a/acs/nladmin-ui/src/views/system/timing/index.vue
+++ b/acs/nladmin-ui/src/views/system/timing/index.vue
@@ -4,16 +4,25 @@
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
         <!-- 搜索 -->
-        <el-input
-          v-model="query.job_name"
-          clearable
-          size="mini"
-          :placeholder="$t('Timing.msg.select_msg')"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="toQuery"
-        />
-        <rrOperation />
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-suffix=":"
+        >
+          <el-form-item  :label="$t('Timing.DB.job_name')">
+            <el-input
+              v-model="query.job_name"
+              clearable
+              size="mini"
+              :placeholder="$t('Timing.msg.select_msg')"
+              style="width: 200px;"
+              class="filter-item"
+              @keyup.enter.native="toQuery"
+            />
+          </el-form-item>
+          <rrOperation />
+        </el-form>
       </div>
       <crudOperation :permission="permission">
         <!-- 任务日志 -->
@@ -39,57 +48,57 @@
       width="730px"
     >
       <el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="100px">
-        <el-form-item label="任务名称" prop="job_name">
+        <el-form-item :label="$t('Timing.DB.job_name')" prop="job_name">
           <el-input v-model="form.job_name" style="width: 220px;" />
         </el-form-item>
-        <el-form-item label="任务描述" prop="description">
+        <el-form-item :label="$t('Timing.DB.description')" prop="description">
           <el-input v-model="form.description" style="width: 220px;" />
         </el-form-item>
-        <el-form-item label="Bean名称" prop="bean_name">
+        <el-form-item :label="$t('Timing.DB.bean_name')" prop="bean_name">
           <el-input v-model="form.bean_name" style="width: 220px;" />
         </el-form-item>
-        <el-form-item label="执行方法" prop="method_name">
+        <el-form-item :label="$t('Timing.DB.method_name')" prop="method_name">
           <el-input v-model="form.method_name" style="width: 220px;" />
         </el-form-item>
-        <el-form-item label="Cron表达式" prop="cron_expression">
+        <el-form-item :label="$t('Timing.DB.cron_expression')" prop="cron_expression">
           <!--          <el-input v-model="form.cron_expression" style="width: 220px;" />-->
-          <el-input v-model="form.cron_expression" placeholder="请输入CRON 表达式" style="width: 220px;">
+          <el-input v-model="form.cron_expression" :placeholder="$t('Timing.DB.please_enter_cron_expression')" style="width: 220px;">
             <template slot="append">
               <el-button type="primary" @click="handleShowCron">
-                生成表达式
+                {{ $t('Timing.DB.Generate_expressions') }}
                 <i class="el-icon-time el-icon--right" />
               </el-button>
             </template>
           </el-input>
         </el-form-item>
-        <el-form-item label="子任务ID">
-          <el-input v-model="form.sub_task" placeholder="多个用逗号隔开，按顺序执行" style="width: 220px;" />
+        <el-form-item :label="$t('Timing.DB.job_id')">
+          <el-input v-model="form.sub_task" :placeholder="$t('Timing.DB.spilt1')" style="width: 220px;" />
         </el-form-item>
-        <el-form-item label="任务负责人" prop="person_in_charge">
+        <el-form-item :label="$t('Timing.DB.Leader')" prop="person_in_charge">
           <el-input v-model="form.person_in_charge" style="width: 220px;" />
         </el-form-item>
-        <el-form-item label="告警邮箱" prop="email">
-          <el-input v-model="form.email" placeholder="多个邮箱用逗号隔开" style="width: 220px;" />
+        <el-form-item :label="$t('Timing.DB.Alarm_mailbox')" prop="email">
+          <el-input v-model="form.email" :placeholder="$t('Timing.DB.spilt2')" style="width: 220px;" />
         </el-form-item>
-        <el-form-item label="失败后暂停">
+        <el-form-item :label="$t('Timing.DB.Whether_pause')">
           <el-radio-group v-model="form.pause_after_failure" style="width: 220px">
-            <el-radio :label="true">是</el-radio>
-            <el-radio :label="false">否</el-radio>
+            <el-radio :label="true">{{ $t('common.true') }}</el-radio>
+            <el-radio :label="false">{{ $t('common.false') }}</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="任务状态">
+        <el-form-item :label="$t('Timing.DB.thread_state')">
           <el-radio-group v-model="form.is_pause" style="width: 220px">
-            <el-radio :label="false">启用</el-radio>
-            <el-radio :label="true">暂停</el-radio>
+            <el-radio :label="false">{{ $t('common.firing') }}</el-radio>
+            <el-radio :label="true">{{ $t('common.stop') }}</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="参数内容">
+        <el-form-item :label="$t('Timing.DB.Parameter_content')">
           <el-input v-model="form.params" style="width: 556px;" rows="4" type="textarea" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="crud.cancelCU">取消</el-button>
-        <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        <el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
+        <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
       </div>
     </el-dialog>
     <!--表格渲染-->
@@ -116,7 +125,7 @@
       <el-table-column show-overflow-tooltip prop="is_pause" width="120px" :label="$t('Timing.DB.is_pause')" align="center">
         <template slot-scope="scope">
           <el-tag :type="scope.row.is_pause ? 'warning' : 'success'">{{
-            scope.row.is_pause ? '已暂停' : '运行中'
+            scope.row.is_pause ? $t('common.Paused') : $t('common.Running')
           }}
           </el-tag>
         </template>
diff --git a/acs/nladmin-ui/src/views/system/user/index.vue b/acs/nladmin-ui/src/views/system/user/index.vue
index 647b879..05121d4 100644
--- a/acs/nladmin-ui/src/views/system/user/index.vue
+++ b/acs/nladmin-ui/src/views/system/user/index.vue
@@ -4,15 +4,24 @@
       <!--侧边部门数据-->
       <el-col :span="4">
         <div class="head-container">
-          <el-input
-            v-model="deptName"
-            clearable
-            size="mini"
-            placeholder="请输入部门名称"
-            prefix-icon="el-icon-search"
-            class="filter-item"
-            @input="getDeptDatas"
-          />
+          <el-form
+            :inline="true"
+            class="demo-form-inline"
+            label-position="right"
+            label-suffix=":"
+          >
+            <el-form-item  :label="$t('user.table_title.Department_name')">
+              <el-input
+                v-model="deptName"
+                clearable
+                size="mini"
+                :placeholder="$t('user.table_title.enter_department_name')"
+                prefix-icon="el-icon-search"
+                class="filter-item"
+                @input="getDeptDatas"
+              />
+            </el-form-item>
+          </el-form>
         </div>
         <el-tree
           :data="deptDatas"
@@ -26,32 +35,43 @@
         <div class="head-container">
           <div v-if="crud.props.searchToggle">
             <!-- 搜索 -->
-            <el-input
-              v-model="query.blurry"
-              clearable
-              size="mini"
-              placeholder="输入账号或者名称"
-              style="width: 200px;"
-              class="filter-item"
-              @keyup.enter.native="crud.toQuery"
-            />
-            <el-select
-              v-model="query.is_used"
-              clearable
-              size="mini"
-              placeholder="状态"
-              class="filter-item"
-              style="width: 90px"
-              @change="crud.toQuery"
+            <el-form
+              :inline="true"
+              class="demo-form-inline"
+              label-position="right"
+              label-suffix=":"
             >
-              <el-option
-                v-for="item in enabledTypeOptions"
-                :key="item.key"
-                :label="item.display_name"
-                :value="item.key"
-              />
-            </el-select>
-            <rrOperation />
+              <el-form-item  :label="$t('user.table_title.enter_department_name')">
+                <el-input
+                  v-model="query.blurry"
+                  clearable
+                  size="mini"
+                  :placeholder="$t('user.table_title.Enter_Account_Number (Name)')"
+                  style="width: 200px;"
+                  class="filter-item"
+                  @keyup.enter.native="crud.toQuery"
+                />
+              </el-form-item>
+              <el-form-item  :label="$t('user.table_title.State')">
+                <el-select
+                  v-model="query.is_used"
+                  clearable
+                  size="mini"
+                  :placeholder="$t('user.table_title.State')"
+                  class="filter-item"
+                  style="width: 90px"
+                  @change="crud.toQuery"
+                >
+                  <el-option
+                    v-for="item in enabledTypeOptions"
+                    :key="item.key"
+                    :label="item.display_name"
+                    :value="item.key"
+                  />
+                </el-select>
+              </el-form-item>
+              <rrOperation />
+            </el-form>
           </div>
           <crudOperation show="" :permission="permission" />
         </div>
@@ -143,14 +163,14 @@
           @selection-change="crud.selectionChangeHandler"
         >
           <el-table-column :selectable="checkboxT" type="selection" width="55" />
-          <el-table-column prop="username" label="用户名" :min-width="flexWidth('username',crud.data,'用户名')" />
+          <el-table-column prop="username" :label="$t('user.table_value.Username')" :min-width="flexWidth('username',crud.data,$t('user.table_value.Username'))" />
           <el-table-column
             prop="person_name"
-            label="姓名"
-            :min-width="flexWidth('person_name',crud.data,'姓名')"
+            :label="$t('user.table_value.Name')"
+            :min-width="flexWidth('person_name',crud.data,$t('user.table_value.Name'))"
           />
-          <el-table-column prop="gender" label="性别" :min-width="flexWidth('gender',crud.data,'性别')" />
-          <el-table-column prop="phone" label="电话" :min-width="flexWidth('phone',crud.data,'电话')" />
+          <el-table-column prop="gender" :label="$t('user.table_value.Sex')" :min-width="flexWidth('gender',crud.data,$t('user.table_value.Sex'))" />
+          <el-table-column prop="phone" :label="$t('user.table_value.Phone')" :min-width="flexWidth('phone',crud.data,$t('user.table_value.Phone'))" />
           <el-table-column prop="email" label="邮箱" :min-width="flexWidth('email',crud.data,'邮箱')" />
           <el-table-column show-overflow-tooltip prop="depts" label="部门" :min-width="flexWidth('depts',crud.data,'邮箱')">
             <template slot-scope="scope">