Merge branch 'language'

2025-10-31 17:52:09 +08:00
parent 29c1ef23f5 93c85c232f
commit 5809110e4b
55 changed files with 1547 additions and 1287 deletions
--- a/nladmin-system/nlsso-server/libs/language-all.jar
+++ b/nladmin-system/nlsso-server/libs/language-all.jar
--- a/nladmin-system/nlsso-server/pom.xml
+++ b/nladmin-system/nlsso-server/pom.xml
@@ -284,7 +284,8 @@
            <groupId>nl.sdkall</groupId>
            <artifactId>language-all</artifactId>
            <version>0.0.1</version>
-            <!-- 移除 system 范围，使用默认的 compile 范围 -->
+            <scope>system</scope>
+            <systemPath>${project.basedir}/libs/language-all.jar</systemPath>
        </dependency>
        <!-- quartz -->
        <dependency>
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/bigscreen_manage/controller/BigScreenController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/bigscreen_manage/controller/BigScreenController.java
@@ -5,6 +5,7 @@ import cn.dev33.satoken.annotation.SaIgnore;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.nl.common.base.TableDataInfo;
 import org.nl.common.logging.annotation.Log;
 import org.nl.wms.bigscreen_manage.service.BigScreenService;
@@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;

 /**
@@ -41,10 +43,12 @@ public class BigScreenController {
    @Log("大屏数据")
    @SaIgnore
    public ResponseEntity<Object> getData(@RequestBody JSONObject stors) {
-        List<String> list = new ArrayList<>();
-        list.add("FJ");
-        List<JSONObject> data = bigScreenService.getData(list);
-        return new ResponseEntity<>(PdaResponse.requestParamOk(data.get(0)), HttpStatus.OK);
+        String storStr = stors.getString("stors");
+        List<JSONObject> data = new ArrayList<>();
+        if (!StringUtils.isEmpty(storStr)){
+            data = bigScreenService.getData(Arrays.asList(storStr.split(",")));
+        }
+        return new ResponseEntity<>(TableDataInfo.build(data), HttpStatus.OK);
    }

 }
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/bigscreen_manage/service/impl/BigScreenServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/bigscreen_manage/service/impl/BigScreenServiceImpl.java
@@ -118,7 +118,7 @@ public class BigScreenServiceImpl implements BigScreenService {
        // 空余货位
        result.put("emp_qty", emp_qty);
        // 使用货位百分比
-        double use_percentage = NumberUtil.mul(NumberUtil.div(use_qty, total_qty), 100);
+        double use_percentage = NumberUtil.mul(NumberUtil.div(use_qty, total_qty==0?1:total_qty), 100);
        result.put("use_percentage", NumberUtil.round(use_percentage, 2));
        return result;
    }
--- a/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml
+++ b/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml
@@ -9,10 +9,10 @@ spring:
    druid:
      db-type: com.alibaba.druid.pool.DruidDataSource
      driverClassName: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:fujia}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
+      url: jdbc:mysql://${DB_HOST:192.168.81.251}:${DB_PORT:3306}/${DB_NAME:fujia_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
      # url: jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:wms_oulun}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
      username: ${DB_USER:root}
-      password: ${DB_PWD:123456}
+      password: ${DB_PWD:P@ssw0rd.}
      # 初始连接数
      initial-size: 15
      # 最小连接数
--- a/nladmin-system/nlsso-server/src/main/resources/language/buss/buss.properties
+++ b/nladmin-system/nlsso-server/src/main/resources/language/buss/buss.properties
@@ -1,20 +0,0 @@
-dept_has=部门存在绑定的人员，请先解绑人员对应部门
-device_check=设备编号不能为空
-device_orderRun=设备工单已在生产
-genrator_cfg=请先配置生成器
-material_cfg=物料{0}配置信息异常,请维护
-material_check=物料ID{0}不存在
-material_notEq=物料不一致
-menu_url=外链必须以http\://或者https\://开头
-per_auth=存在关联的数据权限，请解除关联后删除
-point_checkNull=点位不能为空
-point_checkNull_1=起点或终点不能同时为空
-quartz_check=子任务中不能添加当前任务ID
-role_Check_1=角色名字不能为空
-task_isNull=任务信息不存在{0}
-task_statusWrong=任务已完成或已取消
-vehicle_check=载具编码不能为空
-vehicle_check_1=载具{0}组盘信息不存在
-workorder_checkNull=工单不存在{0}
-workorder_checkRun=该设备{0}不在生产中的工单
-workorder_statusError=工单状态不正确
--- a/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_en_US.properties
+++ b/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_en_US.properties
@@ -1,20 +0,0 @@
-dept_has=Ada personal terikat di departments Tolong lepaskan departments yang sama dari personal persona 
-device_check=Equipment number cannot be empty  
-device_orderRun=The equipment work order is already in production  
-genrator_cfg=Please configure the generator first  
-material_cfg=Abnormal configuration information for material {0}, please maintain  
-material_check=Item ID {0} does not exist  
-material_notEq=Material inconsistency  
-menu_url=External links must start with http\://or https\://  
-per_auth=There is an associated data permission, please remove it after disassociation  
-point_checkNull=The point cannot be empty  
-point_checkNull_1=The starting or ending points cannot both be empty  
-quartz_check=The current task ID cannot be added to a subtask  
-role_Check_1=The character name cannot be empty  
-task_isNull=Task information does not exist {0}  
-task_statusWrong=Task completed or canceled  
-vehicle_check=Vehicle code cannot be empty  
-vehicle_check_1=The disk information of vehicle {0} does not exist  
-workorder_checkNull=The work order does not exist {0} 
-workorder_checkRun=The equipment {0} is not in production for a work order  
-workorder_statusError=The work order status is incorrect  
--- a/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_id_ID.properties
+++ b/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_id_ID.properties
@@ -1,20 +0,0 @@
-dept_has=Ada personil terikat di departemen. Tolong lepaskan departemen yang sama dari personil pertama  
-device_check=Nomor peralatan tidak dapat kosong  
-device_orderRun=Perintah kerja peralatan sudah dalam produksi  
-genrator_cfg=Silakan konfigur generator pertama  
-material_cfg=Informasi konfigurasi abnormal untuk material {0}, silakan tetap  
-material_check=ID Item {0} tidak ada  
-material_notEq=Tidak konsistens materi  
-menu_url=Hubungan luar harus dimulai dengan http\://atau https\://  
-per_auth=Ada izin data terkait, silakan hapuskan setelah pemisahan  
-point_checkNull=Titik tidak dapat kosong  
-point_checkNull_1=Titik awal atau akhir tidak dapat berdua kosong  
-quartz_check=ID tugas saat ini tidak dapat ditambah ke subtask  
-role_Check_1=Nama karakter tidak dapat kosong  
-task_isNull=Informasi tugas tidak ada {0}  
-task_statusWrong=Tugas selesai atau dibatalkan  
-vehicle_check=Kode kendaraan tidak dapat kosong  
-vehicle_check_1=Informasi disk dari kendaraan {0} tidak ada  
-workorder_checkNull=Perintah kerja tidak ada  {0}
-workorder_checkRun=Perangkat {0} tidak dalam produksi untuk perintah kerja  
-workorder_statusError=Status perintah kerja tidak benar  
--- a/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_in_ID.properties
+++ b/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_in_ID.properties
@@ -1,20 +0,0 @@
-dept_has=Ada personil terikat di departemen. Tolong lepaskan departemen yang sama dari personil pertama  
-device_check=Nomor peralatan tidak dapat kosong  
-device_orderRun=Perintah kerja peralatan sudah dalam produksi  
-genrator_cfg=Silakan konfigur generator pertama  
-material_cfg=Informasi konfigurasi abnormal untuk material {0}, silakan tetap  
-material_check=ID Item {0} tidak ada  
-material_notEq=Tidak konsistens materi  
-menu_url=Hubungan luar harus dimulai dengan http\://atau https\://  
-per_auth=Ada izin data terkait, silakan hapuskan setelah pemisahan  
-point_checkNull=Titik tidak dapat kosong  
-point_checkNull_1=Titik awal atau akhir tidak dapat berdua kosong  
-quartz_check=ID tugas saat ini tidak dapat ditambah ke subtask  
-role_Check_1=Nama karakter tidak dapat kosong  
-task_isNull=Informasi tugas tidak ada {0}  
-task_statusWrong=Tugas selesai atau dibatalkan  
-vehicle_check=Kode kendaraan tidak dapat kosong  
-vehicle_check_1=Informasi disk dari kendaraan {0} tidak ada  
-workorder_checkNull=Perintah kerja tidak ada  {0}
-workorder_checkRun=Perangkat {0} tidak dalam produksi untuk perintah kerja  
-workorder_statusError=Status perintah kerja tidak benar  
--- a/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_zh_CN.properties
+++ b/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_zh_CN.properties
@@ -1,20 +0,0 @@
-dept_has=部门存在绑定的人员，请先解绑人员对应部门
-device_check=设备编号不能为空
-device_orderRun=设备工单已在生产
-genrator_cfg=请先配置生成器
-material_cfg=物料{0}配置信息异常,请维护
-material_check=物料ID{0}不存在
-material_notEq=物料不一致
-menu_url=外链必须以http\://或者https\://开头
-per_auth=存在关联的数据权限，请解除关联后删除
-point_checkNull=点位不能为空
-point_checkNull_1=起点或终点不能同时为空
-quartz_check=子任务中不能添加当前任务ID
-role_Check_1=角色名字不能为空
-task_isNull=任务信息不存在{0}
-task_statusWrong=任务已完成或已取消
-vehicle_check=载具编码不能为空
-vehicle_check_1=载具{0}组盘信息不存在
-workorder_checkNull=工单不存在{0}
-workorder_checkRun=该设备{0}不在生产中的工单
-workorder_statusError=工单状态不正确
--- a/nladmin-system/nlsso-server/src/main/resources/language/error/error.properties
+++ b/nladmin-system/nlsso-server/src/main/resources/language/error/error.properties
@@ -1,21 +0,0 @@
-error_AccessLimit=访问次数限制\!
-error_CodeGenerator=此环境不允许生成代码，请选择预览或者下载查看
-error_Config=配置信息不正确
-error_Create=创建失败
-error_Delete=删除失败
-error_File_1=文件超出规定大小\!
-error_File_2=只能上传图片
-error_File_3=上传失败
-error_LockOut=操作锁被占用{0},等待结束
-error_NotEq=参数校验异常：信息不一致
-error_NullPoint=信息为空
-error_NumberError_1=长度不是偶数\!
-error_ParamError=参数不正确
-error_ParamExist=信息已经存在{0}
-error_Point=点位错误
-error_Send=消息发送失败
-error_StatusError={0}信息状态不正确
-error_SystemAuthError=权限不足，操作失败
-error_SystemError=系统繁忙，稍后在试
-error_Update=更新失败
-error_isNull={0}查询信息不存在
--- a/nladmin-system/nlsso-server/src/main/resources/language/error/error_en_US.properties
+++ b/nladmin-system/nlsso-server/src/main/resources/language/error/error_en_US.properties
@@ -1,21 +0,0 @@
-error_AccessLimit=Access limit\!
-error_CodeGenerator=This environment does not allow code generation. Please choose to preview or download to view
-error_Config=Incorrect configuration information  
-error_Create=Creation failed
-error_Delete=Delete failed  
-error_File_1=The file exceeds the specified size\!
-error_File_2=Only uploadable images
-error_File_3=Upload failed  
-error_LockOut=Operation lock is occupied {0}, waiting for end  
-error_NotEq=Parameter verification exception\: inconsistent information  
-error_NullPoint=Only Empty Question
-error_NumberError_1=It's not even long\!
-error_ParamError=invalid parameter
-error_ParamExist=Parameter already exists {0}
-error_Point=point error
-error_Send=Message sending failed  
-error_StatusError={0} information status is incorrect  
-error_SystemAuthError=Insufficient permissions, operation failed
-error_SystemError=The system is busy, please try again later
-error_Update=Update failed  
-error_isNull={0}query is null
--- a/nladmin-system/nlsso-server/src/main/resources/language/error/error_id_ID.properties
+++ b/nladmin-system/nlsso-server/src/main/resources/language/error/error_id_ID.properties
@@ -1,21 +0,0 @@
-error_AccessLimit=Batas akses\!
-error_CodeGenerator=lingkungan ini tidak memungkinkan generasi kode. Silakan pilih untuk melihat atau mengunduh untuk melihat
-error_Config=Informasi konfigurasi yang salah  
-error_Create=Penciptaan gagal  
-error_Delete=Hapus gagal  
-error_File_1=Berkas melebihi ukuran yang ditentukan\!
-error_File_2=Hanya gambar yang dapat diunggah
-error_File_3=Upload gagal  
-error_LockOut=Operasi kunci sedang sibuk {0}, menunggu akhir  
-error_NotEq=Pengecualian verifikasi parameter\: informasi yang tidak konsisten  
-error_NullPoint=Pertanyaan Hanya Kosong
-error_NumberError_1=Panjangnya bahkan tidak\!
-error_ParamError=parameter tidak benar
-error_ParamExist=Parameter sudah ada {0}
-error_Point=Kesalahan titik
-error_Send=Pengiriman pesan gagal  
-error_StatusError=Status informasi {0} tidak benar  
-error_SystemAuthError=Keizinan tidak cukup, operasi gagal
-error_SystemError=Sistemnya sibuk, tolong coba lagi nanti
-error_Update=Kemaskini gagal  
-error_isNull={0}Pertanyaan Tidak ada
--- a/nladmin-system/nlsso-server/src/main/resources/language/error/error_in_ID.properties
+++ b/nladmin-system/nlsso-server/src/main/resources/language/error/error_in_ID.properties
@@ -1,21 +0,0 @@
-error_AccessLimit=Batas akses\!
-error_CodeGenerator=lingkungan ini tidak memungkinkan generasi kode. Silakan pilih untuk melihat atau mengunduh untuk melihat
-error_Config=Informasi konfigurasi yang salah  
-error_Create=Penciptaan gagal  
-error_Delete=Hapus gagal  
-error_File_1=Berkas melebihi ukuran yang ditentukan\!
-error_File_2=Hanya gambar yang dapat diunggah
-error_File_3=Upload gagal  
-error_LockOut=Operasi kunci sedang sibuk {0}, menunggu akhir  
-error_NotEq=Pengecualian verifikasi parameter\: informasi yang tidak konsisten  
-error_NullPoint=Pertanyaan Hanya Kosong
-error_NumberError_1=Panjangnya bahkan tidak\!
-error_ParamError=parameter tidak benar
-error_ParamExist=Parameter sudah ada {0}
-error_Point=Kesalahan titik
-error_Send=Pengiriman pesan gagal  
-error_StatusError=Status informasi {0} tidak benar  
-error_SystemAuthError=Keizinan tidak cukup, operasi gagal
-error_SystemError=Sistemnya sibuk, tolong coba lagi nanti
-error_Update=Kemaskini gagal  
-error_isNull={0}Pertanyaan Tidak ada
--- a/nladmin-system/nlsso-server/src/main/resources/language/error/error_zh_CN.properties
+++ b/nladmin-system/nlsso-server/src/main/resources/language/error/error_zh_CN.properties
@@ -1,21 +0,0 @@
-error_AccessLimit=访问次数限制\!
-error_CodeGenerator=此环境不允许生成代码，请选择预览或者下载查看
-error_Config=配置信息不正确
-error_Create=创建失败
-error_Delete=删除失败
-error_File_1=文件超出规定大小\!
-error_File_2=只能上传图片
-error_File_3=上传失败
-error_LockOut=操作锁被占用{0},等待结束
-error_NotEq=参数校验异常：信息不一致
-error_NullPoint=信息为空
-error_NumberError_1=长度不是偶数\!
-error_ParamError=参数不正确
-error_ParamExist=信息已经存在{0}
-error_Point=点位错误
-error_Send=消息发送失败
-error_StatusError={0}信息状态不正确
-error_SystemAuthError=权限不足，操作失败
-error_SystemError=系统繁忙，稍后在试
-error_Update=更新失败
-error_isNull={0}查询信息不存在
--- a/nladmin-system/nlsso-server/src/main/resources/language/i18n/en.js
+++ b/nladmin-system/nlsso-server/src/main/resources/language/i18n/en.js
@@ -1,13 +1,771 @@
 var config = {
-  "lang": "English222",
+  "language": "English",
  "platform": {
-    "title": "NOBLELIFT Platform",
-    "tip1": "The user name cannot be empty",
-    "tip2": "The password cannot be empty",
-    "tip3": "当前语言，111111英语"
+    "title": "NuoLi Platform"
+  },
+  "system": {
+    "exception": "System exception, please contact administrator",
+    "paramException": "Parameter exception, please check input parameters",
+    "resultException": "Request result does not exist",
+    "dataException": "Data exception, data does not exist",
+    "dataExceptionArg": "Data exception, %s data does not exist",
+    "dataDuplicationArg": "Data duplication, %s already exists in the system",
+    "dataFormat": "Data exception, data is incorrect",
+    "activatArg": "%s has not been activated in the system",
+    "operation": "Operation failed",
+    "error_param_undefined": "【%s】corresponding type 【%d】is undefined",
+    "per_auth": "Permission already assigned, cannot delete",
+    "error_isNull": "Data does not exist: %s",
+    "dept_has": "Department has associated users, cannot delete",
+    "user_not_exist": "User does not exist",
+    "password_error": "Incorrect password",
+    "account_not_activated": "Account not activated",
+    "vehicle_already_in_storage": "Carrier code: %s already exists in storage, please verify the data!",
+    "no_available_location": "No available storage location",
+    "detail_already_allocated": "Current detail has already been allocated a storage location",
+    "no_allocated_location": "This detail has not been allocated a storage location, please allocate first",
+    "main_table_status_must_be_allocated": "Main table status must be allocated!",
+    "no_task_allocation_detail": "No allocation detail found for the task",
+    "no_inbound_bill_detail": "No inbound bill detail record found",
+    "no_inbound_bill": "No inbound bill found",
+    "no_location_in_warehouse": "No storage locations in this warehouse area",
+    "no_vehicle_info": "No carrier number information",
+    "no_suitable_location": "No suitable storage location found",
+    "no_available_warehouse_area": "No available warehouse area found",
+    "cannot_select_suitable_warehouse_area": "Cannot select suitable warehouse area",
+    "captcha_config_error": "Verification code configuration error! Check LoginCodeEnum for correct configuration",
+    "available_quantity_cannot_be_negative": "Available quantity cannot be negative, please check the change quantity! Current available quantity is 【%s】, current change quantity is 【%s】",
+    "operation_failed": "Operation failed",
+    "local_ip": "Local IP address:"
+  },
+  "business": {
+    "InvReminder": "Current allocation strategy, %s has no available locations",
+    "loginPassword": "Login failed, incorrect account or password",
+    "accountUse": "Login failed, account not enabled"
  },
  "common": {
-    "home": "Dashboard",
-    "Layout_setting": "Layout Setting"
+    'home': 'Dashboard',
+    'Layout_setting': 'Layout Setting',
+    'Personal_center': 'Personal Center',
+    'Log_out': 'Log Out',
+    'Personal_information': 'Personal Information',
+    'username': 'UserName',
+    'name': 'Name',
+    'phone': 'Phone Number',
+    'phone2': 'Phone',
+    'sex': 'Sex',
+    'sex_male': 'Male',
+    'sex_female': 'Female',
+    'email': 'E-mail',
+    'Security_settings': 'Security Settings',
+    'Save_settings': 'Save Settings',
+    'Reset_settings': 'Reset Settings',
+    'Change_password': 'Change Password',
+    'New_password': 'New Password',
+    'Old_password': 'Old Password',
+    'Verify_password': 'Verify Password',
+    'User_information': 'User Information',
+    'Operation_log': 'Operation Log',
+    'action': 'Action',
+    'IP_source': 'IP Source',
+    'Browser': 'Browser',
+    'Request_time': 'Request Time',
+    'Creation_date': 'Creation Date',
+    'account': 'Account',
+    'password': 'Password',
+    'verification_code': 'Code',
+    'login_rm': 'Remember Me',
+    'login': 'Login',
+    'login_ing': 'Logging in...',
+    'Create': 'Create',
+    'Update': 'Update',
+    'Delete': 'Delete',
+    'More': 'More',
+    'Export': 'Export',
+    'Editors': 'Editor',
+    'SelectAll': 'SelectAll',
+    'Query': 'Query',
+    'Reset': 'Reset',
+    'Confirm': 'Confirm',
+    'Cancel': 'Cancel',
+    'Yes': 'YES',
+    'No': 'NO',
+    'Success': 'success',
+    'Fail': 'fail',
+    'Please_select': 'Please Select',
+    'Operation_success': 'Successful operation',
+    'Upload_success': 'Upload Success',
+    'Operate': 'Operate',
+    'Refresh': 'Refresh',
+    'Closes': 'Close',
+    'Closes_l': 'Close Left',
+    'Closes_r': 'Close Right',
+    'Closes_o': 'Close Other',
+    'Closes_a': 'Close All',
+    'Theme_style_setting': 'Theme Style Setting',
+    'Theme_color': 'Theme Color',
+    'System_layout_configuration': 'System Layout Configuration',
+    'Open': 'Open',
+    'Fixation': 'Fixation',
+    'Display': 'Display',
+    'Dynamic_titles': 'Dynamic Titles',
+    'crudTip': 'Are you sure to delete this data?',
+    'startDate': 'StartDate',
+    'endDate': 'EndDate',
+    'moreMenu': 'MoreMenu',
+    'browses': 'browse',
+    'fz': 'Full screen zoom',
+    'submit': 'Submit Success',
+    'add': 'Add Success',
+    'edit': 'Edit Success',
+    'del': 'Delete Success',
+    'close': 'Confirm Close',
+    'save': 'Save Success',
+    'datas': 'Data',
+    'Tips': 'Tips',
+    'Tip1': 'Confirm to delete the selected {count} pieces of data?',
+    'Tip3': 'User name not used as login',
+    'Tip4': 'Mobile phone number cannot be duplicate',
+    'Tip5': 'Please enter a phone number',
+    'Tip6': 'Please enter the correct 11 digit phone number',
+    'Tip7': 'Drag and drop the excel file here or',
+    'Tip8': 'The two passwords are different',
+    'Tip9': 'Please enter your password again',
+    'Tip10': 'Please enter your old password',
+    'Tip11': 'Please enter your new password',
+    'Tip12': '{min} to {max} characters in length',
+    'Tip13': 'Are you sure to log out and exit the system?',
+    'Tip14': 'WebSocket connection error',
+    'Tip15': 'Please enter an icon name',
+    'Tip16': 'NOT NULL',
+    'Tip17': 'Please enter what you are searching for',
+    'loading': 'loading...',
+    'Tip18': 'select date time',
+    'Tip19': 'Are you sure to delete the selected data?',
+    'Tip20': 'The login has expired,please log in again!',
+    "name": "Name",
+    "import": "import",
+    "export": "export",
+    "create_name": "Created By",
+    "create_time": "Creation Time",
+    "update_name": "Modified By",
+    "remark": "Remark",
+    "is_used": "Activated",
+    "is_delete": "Deleted",
+    "create_mode": "Creation Method",
+    "input_optname": "Prepared By",
+    "input_time": "Preparation Time",
+    "update_optname": "Modified By",
+    "update_time": "Modification Time",
+    "dis_optname": "Allocated By",
+    "dis_time": "Allocation Time",
+    "confirm_optname": "Confirmed By",
+    "confirm_time": "Confirmation Time",
+    "bill_code": "Document Number",
+    "bill_type": "Document Type",
+    "biz_date": "Business Date",
+    "bill_status": "Document Status",
+    "zh_name": "Chinese Name",
+    "in_name": "Indonesian Name",
+    "en_name": "English Name",
+    "ext_id": "External ID",
+    "request_param_cannot_be_empty": "Request parameters cannot be empty",
+    "yes": "Yes",
+    "no": "No",
+    "user_info_get_fail": "Failed to get user information",
+    "operation_success": "Operation successful",
+    "inputCodeOrName": "input code or name"
+  },
+  "upload": {
+    "load_text1": "Drag file here or",
+    "load_text2": "click to upload",
+    "load_text3": "Only Excel files can be uploaded, and no larger than 10MB",
+    "load_text4": "File is too large, please upload files smaller than 10MB~",
+    "load_text5": "Only one Excel file can be uploaded!"
+  },
+  "gateway": {
+    "picking_point_not_exist": "The picking point you entered does not exist, please enter 1207 or 1210 picking point!",
+    "create_task_fail_empty": "Failed to create task: returned task information is empty, application parameters are",
+    "apply_task_fail": "Task application failed, application parameters are",
+    "check_error_log": "Please check the error log"
+  },
+  "md_me_materialbase": {
+    "material_code": "Material Code",
+        "material_name": "Material Name",
+        "product_series_name": "Product Series",
+        "material_spec": "Material Specification",
+        "material_model": "Material Model"
+  },
+  "md_pb_classstandard": {
+    "class_code": "Class Code",
+        "class_name": "Class Name",
+        "class_desc": "Class Description",
+        "parent_class_id": "Parent Class ID"
+  },
+  "md_pb_measureunit": {
+    "unit_code": "Code",
+    "unit_name": "Name",
+    "qty_precision": "Data Precision",
+    "qty_unit_id": "Base Measurement Unit",
+    "qty_unit_name": "Unit Name"
+  },
+  "md_pb_storagevehicleinfo": {
+    "storagevehicle_code": "Carrier Code",
+    "storagevehicle_name": "Carrier Name",
+    "one_code": "Barcode",
+    "two_code": "QR Code",
+    "storagevehicle_type": "Carrier Type",
+    "vehicle_width": "Carrier Width",
+    "vehicle_long": "Carrier Length",
+    "vehicle_height": "Carrier Height",
+    "weigth": "Pallet Weight",
+    "overstruct_type": "Does Carrier Exceed Location",
+    "occupystruct_qty": "Number of Occupied Locations",
+    "ext_id": "External ID"
+  },
+  "sch_base_point": {
+    "point_code": "Point Code",
+    "point_name": "Point Name",
+    "region_code": "Region Code",
+    "region_name": "Region Name",
+    "point_type": "Point Type",
+    "point_status": "Point Status",
+    "vehicle_type": "Carrier Type",
+    "vehicle_code": "Carrier Code",
+    "vehicle_qty": "Carrier Quantity",
+    "in_order_seq": "Inbound Sequence",
+    "out_order_seq": "Outbound Sequence",
+    "in_empty_seq": "Empty Carrier Inbound Sequence",
+    "out_empty_seq": "Empty Carrier Outbound Sequence",
+    "parent_point_code": "Parent Point Code",
+    "ext_point_code": "External Point Code",
+    "ing_task_code": "Task Code Being Executed",
+    "is_has_workder": "Generate Order",
+    "workshop_code": "Workshop Code",
+    "is_auto": "Auto"
+  },
+  "sch_base_region": {
+    "region_code": "Region Code",
+    "region_name": "Region Name",
+    "point_type_explain": "Point Type Description",
+    "point_status_explain": "Point Status Description",
+    "is_has_workder": "Generate Order",
+    "order_seq": "Sequence",
+    "workshop_code": "Workshop Code"
+  },
+  "sch_base_task": {
+    "task_code": "Task Code",
+    "task_status": "Task Status",
+    "config_code": "Configuration Code",
+    "point_code1": "Point 1",
+    "point_code2": "Point 2",
+    "point_code3": "Point 3",
+    "point_code4": "Point 4",
+    "group_id": "Group ID",
+    "vehicle_type": "Carrier Type",
+    "vehicle_qty": "Carrier Quantity",
+    "vehicle_code": "Carrier Code",
+    "vehicle_code2": "Carrier Code 2",
+    "handle_status": "Processing Status",
+    "car_no": "License Plate Number",
+    "task_group_id": "Task Group ID",
+    "task_group_seq": "Task Group Sequence",
+    "finished_type": "Task Completion Type",
+    "create_mode": "Creation Method",
+    "request_param": "Create Task Request Parameters",
+    "response_param": "Issue Task Request Parameters",
+    "workshop_code": "Workshop Code",
+    "ext_group_data": "Additional Group Information",
+    "priority": "ACS Priority"
+  },
+  "sch_base_taskconfig": {
+    "config_code": "Configuration Code",
+    "config_name": "Configuration Name",
+    "route_plan_code": "Route Planning Code",
+    "task_qf_type": "Task Pick/Drop Type",
+    "acs_task_type": "ACS Task Type",
+    "task_name": "Task Name",
+    "task_type": "Task Type",
+    "task_direction": "Task Direction",
+    "priority": "Priority",
+    "task_create_max_num": "Maximum Number of Tasks Allowed to Create",
+    "task_issue_max_num": "Maximum Number of Tasks Allowed to Issue",
+    "is_auto_issue": "Auto Issue",
+    "start_region_str": "Start Region Configuration",
+    "next_region_str": "End Region Configuration",
+    "start_point_pre": "Start Point Prefix",
+    "next_region_pre": "End Region Prefix",
+    "is_check_workorder": "Check Work Order",
+    "is_check_start_lock": "Evaluate Start Point Lock",
+    "is_immediate_create": "Create Immediately",
+    "is_check_next_lock": "Evaluate End Point Lock",
+    "is_start_auto": "Start Point Auto",
+    "is_next_auto": "End Point Auto",
+    "is_lock_start": "Lock Start Point",
+    "is_lock_next": "Lock End Point",
+    "request_param": "Create Task Request Parameters",
+    "response_param": "Issue Task Request Parameters",
+    "is_group_congrol_issue_seq": "Control Issue Sequence by Group",
+    "unfinish_notify_time": "Task Unfinished Notification Time",
+    "sql_param": "SQL Configuration",
+    "workshop_code": "Workshop Code"
+  },
+  "st_ivt_bsrealstorattr": {
+    "stor_code": "Warehouse Code",
+    "stor_name": "Warehouse Name",
+    "simple_name": "Warehouse Abbreviation",
+    "stor_capacity": "Warehouse Capacity",
+    "total_area": "Total Area",
+    "stor_type_scode": "Warehouse Nature",
+    "is_virtualstore": "Is Virtual Warehouse",
+    "is_semi_finished": "Is Semi-finished Product Warehouse",
+    "is_materialstore": "Is Raw Material Warehouse",
+    "is_productstore": "Is Finished Product Warehouse",
+    "is_attachment": "Is Accessory Warehouse",
+    "is_reversed": "Allow Returns",
+    "is_mvout_auto_cfm": "Auto Confirm Transfer Out Business",
+    "is_mvin_auto_cfm": "Auto Confirm Transfer In Business",
+    "area": "Area",
+    "storea_ddress": "Warehouse Address",
+    "principal": "Person in Charge",
+    "office_phone": "Office Phone",
+    "mobile_no": "Mobile Number",
+    "order_index": "Display Order",
+    "whstate_scode": "Status",
+    "base_class_id": "Material Basic Classification",
+    "sysownerid": "Owner ID",
+    "sysdeptid": "Department ID",
+    "syscompanyid": "Company ID",
+    "ext_id": "External ID",
+    "depart_name": "Department Name",
+    "company_name": "Company Name"
+  },
+  "st_ivt_checkdtl": {
+    "seq_no": "Detail Sequence",
+    "sect_code": "Inventory Area",
+    "struct_code": "Inventory Location",
+    "checkpoint_code": "Inventory Station",
+    "storagevehicle_code": "Storage Carrier Code",
+    "material_id": "Material ID",
+    "pcsn": "Batch",
+    "base_qty": "Inventory Quantity",
+    "status": "Status",
+    "is_down": "Issued",
+    "fac_qty": "Inventory Count Quantity",
+    "check_result": "Inventory Result",
+    "check_optname": "Inventory Person",
+    "check_time": "Inventory Time",
+    "remark": "Detail Remark",
+    "check_code": "Inventory Document Number",
+    "check_type": "Inventory Document Type",
+    "stor_name": "Warehouse Name",
+    "dtl_num": "Detail Quantity",
+    "create_mode": "Creation Method"
+  },
+  "st_ivt_iostor": {
+    "stor_code": "Warehouse Code",
+    "sect_date": "Date",
+    "quality_scode": "Quality Type",
+    "start_num": "Opening Quantity",
+    "in_num": "Inbound Quantity",
+    "out_num": "Outbound Quantity",
+    "total_qty": "Total Quantity",
+    "total_weight": "Total Weight",
+    "io_type": "In/Out Type",
+    "detail_count": "Detail Quantity",
+    "seq_no": "Detail Sequence",
+    "work_status": "Execution Status",
+    "task_id": "Task ID",
+    "storagevehicle_code": "Storage Carrier Code",
+    "is_issued": "Issued",
+    "plan_qty": "Planned Quantity",
+    "real_qty": "Actual Quantity",
+    "point_code": "In/Out Point ID",
+    "assign_qty": "Allocated Quantity",
+    "unassign_qty": "Unallocated Quantity",
+    "mol_code": "Loss Document Number",
+    "mol_inv_type": "Loss Document Type",
+    "mol_type": "Loss Type",
+    "turnout_sect_code": "Transfer Out Area Code",
+    "turnout_struct_code": "Transfer Out Location Code",
+    "turnin_sect_code": "Transfer In Area Code",
+    "turnin_struct_code": "Transfer In Location Code"
+  },
+  "structWarning": {
+    "safe_qty_lower_limit": "Safety Stock Lower Limit",
+    "safe_qty_upper_limit": "Safety Stock Upper Limit",
+    "cron": "Expression",
+    "notify_type": "Notification Type",
+    "overdue_days": "Overdue Days",
+    "safe_days": "Safety Days",
+    "is_read": "Read",
+    "current_qty": "Current Quantity"
+  },
+  "strategy": {
+    "sect_code": "Warehouse Area",
+    "strategy": "Rule",
+    "strategy_type": "1 Inbound Strategy 2 Outbound Strategy",
+    "description": "Description",
+    "strategy_code": "Strategy Code",
+    "strategy_name": "Strategy Name",
+    "class_type": "Processing Type",
+    "param": "Processing Class",
+    "ban": "Prohibit Operation",
+    "form_data": "Restriction Parameters"
+  },
+  "code_rule": {
+    "current_value": "Current Value"
+  },
+  "dept": {
+    "dept_id": "ID",
+    "pid": "Parent Department",
+    "sub_count": "Sub-department Count",
+    "name": "Name",
+    "zh_name": "Chinese Name",
+    "in_name": "Indonesian Name",
+    "en_name": "English Name",
+    "dept_sort": "Sort",
+    "is_used": "Status",
+    "create_name": "Created By",
+    "update_name": "Updated By",
+    "create_time": "Creation Date",
+    "update_time": "Update Time",
+    "code": "Department Code",
+    "ext_id": "External ID"
+  },
+  "dict": {
+    "dict_type": "Dictionary Type",
+    "dict_sort": "Sequence",
+    "label": "Dictionary Label",
+    "value": "Dictionary Value",
+    "para1": "Parameter 1",
+    "para2": "Parameter 2",
+    "para3": "Parameter 3"
+  },
+  "menu": {
+    "home": "home",
+    "menu_id": "Menu ID",
+    "pid": "Parent Menu ID",
+    "sub_count": "Sub-menu Count",
+    "type": "Menu Type",
+    "system_type": "Belonging System",
+    "category": "Menu Category",
+    "title": "Menu Title",
+    "en_title": "English Title",
+    "in_title": "Indonesian Title",
+    "zh_title": "Chinese Title",
+    "component_name": "Component Name",
+    "component": "Component",
+    "menu_sort": "Sort",
+    "icon": "Icon",
+    "path": "Path",
+    "iframe": "Is External Link",
+    "cache": "Is Cached",
+    "hidden": "Is Hidden",
+    "permission": "Permission",
+    "is_pc": "Is PC Menu"
+  },
+  "param": {
+    "code": "Code",
+    "name": "Name",
+    "zh_name": "Name",
+    "en_name": "English Name",
+    "in_name": "Indonesian Name",
+    "value": "Value"
+  },
+  "user": {
+    "user_id": "User ID",
+    "username": "Login Account",
+    "password": "Password",
+    "is_admin": "Is Administrator Account",
+    "person_name": "Full Name",
+    "zh_person_name": "Chinese Full Name",
+    "en_person_name": "English Full Name",
+    "in_person_name": "Indonesian Full Name",
+    "gender": "Gender",
+    "zh_gender": "Chinese Gender",
+    "en_gender": "English Gender",
+    "phone": "Phone",
+    "email": "Email",
+    "avatar_name": "Avatar Path",
+    "avatar_path": "Actual Avatar Path",
+    "extperson_id": "External Person ID",
+    "extuser_id": "External User ID",
+    "pwd_reset_user_id": "Password Reset By",
+    "pwd_reset_time": "Password Reset Time"
+  },
+  "basedata_manage": {
+    "same_warehouse_numbers": "Duplicate warehouse numbers exist",
+    "deleted_or_without_permission_operation_failed": "Deleted or no permission, operation failed!",
+    "same_supplier_code": "Duplicate supplier codes exist",
+    "current_device_code_already_exists": "Current device code already exists 【%s】",
+    "current_supplier_code_already_exists": "Current supplier code already exists 【%s】",
+    "current_cust_code_already_exists": "Current customer code already exists 【%s】",
+    "current_material_code_already_exists": "Current material code already exists 【%s】",
+    "current_sorting_code_already_exists": "Current classification code already exists 【%s】",
+    "current_unit_code_already_exists": "Current measurement unit code already exists 【%s】",
+    "unit_code_not_exists": "Measurement unit code 【%s】 does not exist!",
+    "current_vehicle_group_plate_info_exists": "Current carrier group plate information already exists",
+    "parents_cannot_be_oneself": "Parent cannot be itself",
+    "material_information_not_exists": "Material information 【%s】 does not exist!",
+    "storage_vehicle_code_already_exists": "Current carrier code already exists 【%s】",
+    "vehicle_type_no_dict_config": "This carrier type %s has no dictionary value configured",
+    "storage_vehicle_not_exist": "Carrier with code 【%s】 does not exist!",
+    "parent_class_code_invalid": "Please enter correct parent node code!",
+    "sect_code_already_exists": "Duplicate area codes in the same warehouse",
+    "struct_code_not_exist": "Structure code 【%s】 does not exist",
+    "sect_no_io_rule": "Area 【%s】 has no inbound/outbound strategy configured",
+    "strategy_no_available_struct": "Strategy 【%s】 has no available storage locations, total of %d locations queried",
+    "sect_no_in_rule": "Area 【%s】 has no inbound strategy configured",
+  },
+  "sch_manage": {
+    "task_already_completed": "This task is already completed!",
+    "task_already_cancelled": "This task is already cancelled!",
+    "task_not_exists": "This task does not exist",
+    "only_cancel_generating_tasks": "Can only cancel generating tasks!",
+    "task_status_must_be_create_to_cancel": "Task status must be 'created' to cancel task",
+    "same_point_code_exists": "Duplicate point codes exist",
+    "data_empty": "Data is empty!",
+    "task_config_already_exists": "Task configuration 【%s】 already exists!",
+    "start_and_end_region_cannot_be_empty": "Start region and end region cannot both be empty!",
+    "tray_cannot_be_empty": "Tray cannot be empty"
+  },
+  "decision_manage": {
+    "location_list_empty": "Storage location list is empty",
+    "strategy_type_error": "Strategy type error",
+    "no_available_location": "Current allocation strategy has no available storage locations",
+    "no_available_location_same_block_num": "Current allocation strategy sameBlockNum has no available storage locations",
+    "no_available_aisle": "No available aisle found",
+    "strategy_name_already_exists": "Strategy with same name already exists 【%s】",
+    "strategy_no_instance": "Start failed, current strategy 【%s】 has no corresponding instance information",
+    "alley_ave_no_available_location": "Balancing strategy result: Carrier code: 【%s】 current allocation strategy has no available storage locations",
+    "fifo_rule_inventory_shortage": "Current outbound strategy: FIFO, inventory allocation failed, reason: insufficient inventory!",
+    "depth_priority_location_not_found": " Depth priority strategy: Get deep location with stock and shallow location without stock: Carrier code: 【%s】 failed to get location, number of locations for this strategy is 0!",
+    "limit_storage_vehicle_not_exist": "Limit strategy: Current carrier information does not exist: 【%s】 does not exist",
+    "limit_storage_location_not_found": "Limit strategy: Carrier code: 【%s】 failed to get location, number of locations for this height level is 0!"
+  },
+  "task": {
+    "status": {
+      "created": "Created",
+      "applied": "Applied",
+      "created_completed": "Creation Completed",
+      "issued": "Issued",
+      "executing": "Executing",
+      "completed": "Completed",
+      "cancelled": "Cancelled",
+      "unfinished": "Unfinished"
+    }
+    ,
+    "created_desc": "Create Task",
+    "applied_desc": "Apply Task",
+    "create_completed_desc": "Create Completed Task",
+    "issued_desc": "Issue Task",
+    "executing_desc": "Executing Task",
+    "completed_desc": "Complete Task",
+    "cancelled_desc": "Cancelled Task",
+    "unfinished_desc": "Unfinished Task"
+  },
+  "bind": {
+    "type": {
+      "unbind": "Unbind",
+      "bind": "Bind",
+      "no_operation": "No Operation"
+    }
+  },
+  "vehicle": {
+    "type": {
+      "empty_pallet": "Empty Pallet",
+      "empty_container": "Empty Container"
+    }
+  },
+  "base_data": {
+    "type_not_defined": "Corresponding type 【%s】 is undefined"
+  },
+  "pm_manage": {
+    "no_such_unit_info": "No such measurement unit information",
+    "no_such_warehouse_info": "No such warehouse information",
+    "form_type_param_cannot_be_empty": "Form type parameter cannot be empty",
+    "current_bill_already_merged": "Current document has been merged, resubmission not allowed:【%s】",
+    "current_bill_is_new_merged_bill": "Current document is a new merged document, resubmission not allowed:【%s】",
+    "current_bill_is_not_new_merged_bill": "Current document is not a new merged document, submission not allowed:【%s】"
+  },
+  "warehouse_manage": {
+    "main_table_status_must_be_generate": "Main table status must be generated!",
+    "no_cancel_outbound_alloc_dtl": "No cancellable outbound allocation details exist",
+    "no_selected_outbound_point": "No outbound point selected",
+    "no_selected_floor": "No floor selected",
+    "no_related_outbound_bill": "No related outbound bill found",
+    "no_alloc_dtl_to_set": "Currently no allocation details to set",
+    "main_table_status_must_be_allocated": "Main table status must be allocated!",
+    "cannot_force_confirm_with_unfinished_tasks": "Cannot force confirm with unfinished tasks!",
+    "no_alloc_dtl_for_task": "No allocation detail found for the task",
+    "no_dtl_found": "No detail found",
+    "vehicle_already_in_storage": "Carrier code: 【%s】 already exists in storage, please verify the data!",
+    "detail_already_allocated_location": "Current detail has already been allocated a storage location",
+    "no_available_location": "No available storage location",
+    "detail_not_allocated_location": "This detail has not been allocated a storage location, please allocate first",
+    "cannot_find_allocation_detail_for_task": "No allocation detail found for the task",
+    "cannot_find_inbound_detail_record": "No inbound bill detail record found",
+    "cannot_find_inbound_order": "No inbound order found",
+    "no_location_in_sector": "No storage locations in this warehouse area",
+    "no_carrier_info": "No carrier number information",
+    "cannot_find_suitable_location": "No suitable storage location found",
+    "cannot_find_available_sector": "No available warehouse area found",
+    "cannot_select_suitable_sector": "Cannot select suitable warehouse area",
+    "outbill_qty_zero": "Quantity cannot be zero",
+    "outbill_sect_empty": "Allocation warehouse area cannot be empty",
+    "outbill_not_found": "Cannot find outbound bill information",
+    "outbill_no_details": "Current order has no allocatable outbound details",
+    "outbill_no_cancelable_details": "No cancellable outbound allocation details exist",
+    "outbill_allocated": "Fully allocated, unallocated quantity is 0",
+    "storagevehicle_no_inventory": "Current carrier 【%s】 has no related material batch inventory, please check data!",
+    "frozen_quantity_cannot_be_negative": "Frozen quantity cannot be negative, please check the change quantity! Current frozen quantity is 【%s】, current change quantity is 【%d】",
+  },
+  "pda_manage": {
+    "change_type_cannot_be_empty": "Change type cannot be empty!",
+    "carrier_code_cannot_be_empty": "Carrier code cannot be empty!",
+    "material_id_cannot_be_empty": "Material ID cannot be empty!",
+    "unit_id_cannot_be_empty": "Measurement unit ID cannot be empty!",
+    "unit_name_cannot_be_empty": "Measurement unit name cannot be empty!",
+    "change_qty_cannot_be_empty": "Change quantity cannot be empty!",
+    "carrier_already_has_inventory": "Current carrier already has inventory materials, please check data!",
+    "material_info_cannot_be_empty": "Material information cannot be empty!",
+    "vehicle_info_cannot_be_empty": "Carrier information cannot be empty!",
+    "vehicle_already_has_group_plate_info": "Carrier code: 【%s】 already has group plate information, please verify the data!",
+    "vehicle_already_in_storage": "Carrier code: 【%s】 already exists in storage:【%d】, please verify the data!",
+    "dtllist_cannot_be_empty": "dtlList cannot be empty",
+    "vehicle_not_group_plated": "This carrier is not group plated, please check!",
+    "vehicle_not_in_group_plate_status": "This carrier is not in group plate status, please check!",
+    "point_not_exists": "Point does not exist:【%s】",
+    "no_materials_available_for_storage": "Currently no materials available for storage!",
+    "move_in_location_cannot_be_empty": "Move-in location cannot be empty!",
+    "material_detail_cannot_be_empty": "Material detail cannot be empty!",
+    "vehicle_not_exist_in_system": "Carrier does not exist in the system!",
+    "move_in_location_not_exist_in_system": "Move-in location does not exist in the system!",
+    "location_and_vehicle_code_cannot_be_empty": "Location code and carrier code cannot both be empty!",
+    "vehicle_code_empty": "Carrier code cannot be empty",
+    "point_code_empty": "Point code cannot be empty",
+    "point_not_found": "Point 【%s】 does not exist",
+    "point_already_binded": "Point 【%s】 is already bound to carrier 【%d】",
+    "vehicle_already_binded": "Carrier 【%s】 is already bound to point 【%d】",
+    "point_no_vehicle_need_unbind": "Point 【%s】 has no bound carrier 【%d】, no need to unbind",
+    "start_point_not_exist": "Start point does not exist",
+    "end_point_not_exist": "End point does not exist",
+    "site_code_empty": "Point code cannot be empty",
+    "site_not_exist": "Point 【%s】 does not exist"
+  },
+  "acs": {
+    "connection_failed": "ACS connection failed"
+  },
+  "status": {
+    "published": "Published",
+    "unpublished": "Unpublished",
+    "started": "Started",
+    "stopped": "Stopped",
+    "production_in": "Production Inbound",
+    "purchase_in": "Purchase Inbound",
+    "other_in": "Other Inbound",
+    "production_out": "Production Outbound",
+    "sales_out": "Sales Outbound",
+    "other_out": "Other Outbound",
+    "generated": "Generated",
+    "allocated": "Allocated",
+    "type_not_defined": "Corresponding type 【%s】 is undefined",
+    "code_not_defined_r": "Corresponding code 【%s】 has no R data defined",
+    "code_not_defined_x": "Corresponding code 【%s】 has no x data defined",
+    "node_completed": "Node Completed",
+    "abnormal_completed": "Abnormally Completed",
+    "manual_in": "Manual Inbound",
+    "material_out": "Material Outbound",
+    "manual_out": "Manual Outbound",
+    "move_storage": "Move Storage",
+    "abnormal_move": "Abnormal Move",
+    "inventory": "Inventory",
+    "transfer": "Transfer",
+    "inventory_loss": "Inventory Loss",
+    "inventory_profit": "Inventory Profit",
+    "physical_inventory": "Physical Inventory",
+    "receipt_notice": "Receipt Notice",
+    "sales_order": "Sales Order",
+    "production_inbound": "Production Inbound",
+    "purchase_inbound": "Purchase Inbound",
+    "sales_return_inbound": "Sales Return Inbound",
+    "purchase_return_outbound": "Purchase Return Outbound",
+    "subcontract_material_list": "Subcontract Material List",
+    "production_material_list": "Production Material List",
+    "production_picking": "Production Picking",
+    "simple_production_picking": "Simple Production Picking",
+    "transfer_outbound": "Transfer Outbound",
+    "other_outbound": "Other Outbound",
+    "lowest": "Lowest Priority",
+    "normal": "Normal Priority",
+    "higher": "Higher Priority",
+    "urgent": "Urgent Priority",
+    "warehouse": "Warehouse Task",
+    "agv_task": "AGV Task",
+    "ctu_task": "CTU Task",
+    "third_floor_ctu": "Third Floor CTU",
+    "xian_gong": "Xian Gong System",
+    "hairou_ctu": "HaiRou CTU",
+    "hikvision_ctu": "Hikvision CTU",
+    "inbound": "Inbound",
+    "outbound": "Outbound",
+    "in_out_bound": "In/Out Bound",
+    "first_floor_workshop": "First Floor Workshop",
+    "second_floor_workshop": "Second Floor Workshop",
+    "third_floor_workshop": "Third Floor Workshop",
+    "main_storage_picking_platform": "Main Storage Picking Platform",
+    "first_floor_io_conveyor": "First Floor I/O Conveyor",
+    "second_floor_io_conveyor": "Second Floor I/O Conveyor",
+    "second_floor_ctu_shelf_docking": "Second Floor CTU Shelf Docking Position",
+    "second_floor_agv_production_line_docking": "Second Floor AGV Production Line Docking Position",
+    "second_floor_empty_shelf_buffer": "Second Floor Empty Shelf Buffer",
+    "pallet_warehouse": "Pallet Warehouse",
+    "container_warehouse": "Container Warehouse",
+    "virtual_warehouse": "Virtual Warehouse",
+    "second_floor_ctu_buffer": "Second Floor CTU Buffer",
+    "second_floor_shelf_buffer": "Second Floor Shelf Buffer",
+    "ascending": "Ascending",
+    "descending": "Descending",
+    "unbind": "Unbind",
+    "bind": "Bind",
+    "no_operation": "No Operation",
+    "empty_tray": "Empty Tray",
+    "empty_container": "Empty Container",
+    "start": "Start",
+    "pause": "Pause",
+    "completed": "Completed",
+    "force_completed": "Force Completed",
+    "cancelled": "Cancelled"
+  },
+  "error": {
+    "param_undefined": "Parameter 【%s】 undefined 【%s】",
+    "ParamExist": "Parameter 【%s】 already exists",
+    "Update": "Update failed",
+    "Detele": "Delete failed",
+    "NullPoint": "Null pointer exception",
+    "SystemAuthError": "System authorization error",
+    "File_3": "File upload failed",
+    "isNull": "Parameter 【%s】 cannot be empty",
+    "Send": "Send failed"
+  },
+  "role": {
+    "Check_1": "Role name cannot be empty",
+    "level": "Role level"
+  },
+  "quartz": {
+    "ip_different": "Local IP 【%s】 differs from scheduler IP 【%s】",
+    "create_job_failure": "Failed to create scheduled task"
+  },
+  "system_manage": {
+    "username_password_error": "Incorrect username or password",
+    "account_not_activated": "Account not activated",
+    "param_empty": "Parameters cannot be empty",
+    "code_rule_not_exist": "Missing configuration related to 【%s】",
+    "menu_no_permission": "No menu permission",
+    "current_business_executing": "Current business: 【%s】 is being executed, please try again later"
+  },
+  "login": {
+    "childError": "Child node menu cannot be set as directory"
  }
-}
+}
--- a/nladmin-system/nlsso-server/src/main/resources/language/i18n/in.js
+++ b/nladmin-system/nlsso-server/src/main/resources/language/i18n/in.js
@@ -1,13 +0,0 @@
-var config = {
-  "lang": "English222",
-  "platform": {
-    "title": "NOBLELIFT Platform",
-    "tip1": "The user name cannot be empty",
-    "tip2": "The password cannot be empty",
-    "tip3": "The verification code cannot be empty"
-  },
-  "common": {
-    "home": "Dashboard",
-    "Layout_setting": "Layout Setting"
-  }
-}
--- a/nladmin-system/nlsso-server/src/main/resources/language/i18n/ja.js
+++ b/nladmin-system/nlsso-server/src/main/resources/language/i18n/ja.js
@@ -1,13 +0,0 @@
-var config = {
-  "lang": "English222",
-  "platform": {
-    "title": "NOBLELIFT Platform",
-    "tip1": "The user name cannot be empty",
-    "tip2": "The password cannot be empty",
-    "tip3": "The verification code cannot be empty"
-  },
-  "common": {
-    "home": "Dashboard",
-    "Layout_setting": "Layout Setting"
-  }
-}
--- a/nladmin-system/nlsso-server/src/main/resources/language/i18n/vi.js
+++ b/nladmin-system/nlsso-server/src/main/resources/language/i18n/vi.js
@@ -44,7 +44,108 @@ var config = {
        "accountUse": "Đăng nhập thất bại, tài khoản chưa được kích hoạt"
    },
    "common": {
+        'home': 'Trang chủ', // Trang chủ
+        'Layout_setting': 'Cài đặt bố cục',
+        'Personal_center': 'Trung tâm cá nhân',
+        'Log_out': 'Đăng xuất',
+        'Personal_information': 'Thông tin cá nhân',
+        'username': 'Tên người dùng',
+        'name': 'Họ tên',
+        'phone': 'Số điện thoại',
+        'phone2': 'Số điện thoại',
+        'sex': 'Giới tính',
+        'sex_male': 'Nam',
+        'sex_female': 'Nữ',
+        'email': 'Email người dùng',
+        'Security_settings': 'Cài đặt bảo mật',
+        'Save_settings': 'Lưu cài đặt',
+        'Reset_settings': 'Đặt lại cài đặt',
+        'Change_password': 'Đổi mật khẩu',
+        'New_password': 'Mật khẩu mới',
+        'Old_password': 'Mật khẩu cũ',
+        'Verify_password': 'Xác nhận mật khẩu',
+        'User_information': 'Thông tin người dùng',
+        'Operation_log': 'Nhật ký hoạt động',
+        'action': 'Hành động',
+        'IP_source': 'Nguồn IP',
+        'Browser': 'Trình duyệt',
+        'Request_time': 'Thời gian xử lý yêu cầu',
+        'Creation_date': 'Ngày tạo',
+        'account': 'Tài khoản',
+        'password': 'Mật khẩu',
+        'verification_code': 'Mã xác minh',
+        'login_rm': 'Ghi nhớ đăng nhập',
+        'login': 'Đăng nhập',
+        'login_ing': 'Đang đăng nhập...',
+        'Create': 'Thêm mới',
+        'Update': 'Chỉnh sửa',
+        'Delete': 'Xóa',
+        'More': 'Thêm',
+        'Export': 'Xuất',
+        'Editors': 'Biên tập',
+        'SelectAll': 'Chọn tất cả',
+        'Query': 'Truy vấn',
+        'Reset': 'Đặt lại',
+        'Confirm': 'Xác nhận',
+        'Cancel': 'Hủy',
+        'Yes': 'Có',
+        'No': 'Không',
+        'Success': 'Thành công',
+        'Fail': 'Thất bại',
+        'Please_select': 'Vui lòng chọn',
+        'Operation_success': 'Thao tác thành công',
+        'Upload_success': 'Tải lên thành công',
+        'Operate': 'Thao tác',
+        'Refresh': 'Làm mới',
+        'Closes': 'Đóng',
+        'Closes_l': 'Đóng bên trái',
+        'Closes_r': 'Đóng bên phải',
+        'Closes_o': 'Đóng khác',
+        'Closes_a': 'Đóng tất cả',
+        'Theme_style_setting': 'Cài đặt kiểu giao diện',
+        'Theme_color': 'Màu chủ đề',
+        'System_layout_configuration': 'Cấu hình bố cục hệ thống',
+        'Open': 'Mở',
+        'Fixation': 'Cố định',
+        'Display': 'Hiển thị',
+        'Dynamic_titles': 'Tiêu đề động',
+        'crudTip': 'Xác nhận xóa dữ liệu này?',
+        'startDate': 'Ngày bắt đầu',
+        'endDate': 'Ngày kết thúc',
+        'moreMenu': 'Menu thêm',
+        'browses': 'Duyệt',
+        'fz': 'Thu phóng toàn màn hình',
+        'submit': 'Gửi thành công',
+        'add': 'Thêm thành công',
+        'edit': 'Chỉnh sửa thành công',
+        'del': 'Xóa thành công',
+        'close': 'Xác nhận đóng',
+        'save': 'Lưu thành công',
+        'datas': 'Dữ liệu',
+        'Tips': 'Gợi ý',
+        'Tip1': 'Xác nhận xóa {count} dữ liệu đã chọn?',
+        'Tip3': 'Tên người dùng không dùng để đăng nhập',
+        'Tip4': 'Số điện thoại không được trùng lặp',
+        'Tip5': 'Vui lòng nhập số điện thoại',
+        'Tip6': 'Vui lòng nhập đúng 11 chữ số điện thoại',
+        'Tip7': 'Kéo thả file excel vào đây hoặc',
+        'Tip8': 'Mật khẩu nhập hai lần không khớp',
+        'Tip9': 'Vui lòng nhập lại mật khẩu',
+        'Tip10': 'Vui lòng nhập mật khẩu cũ',
+        'Tip11': 'Vui lòng nhập mật khẩu mới',
+        'Tip12': 'Độ dài từ {min} đến {max} ký tự',
+        'Tip13': 'Xác nhận đăng xuất khỏi hệ thống?',
+        'Tip14': 'Kết nối WebSocket xảy ra lỗi',
+        'Tip15': 'Vui lòng nhập tên biểu tượng',
+        'Tip16': 'Không được để trống',
+        'Tip17': 'Vui lòng nhập nội dung tìm kiếm',
+        'loading': 'Dữ liệu đang tải...',
+        'Tip18': 'Chọn ngày giờ',
+        'Tip19': 'Bạn có chắc chắn xóa dữ liệu đã chọn?',
+        'Tip20': 'Trạng thái đăng nhập hiện tại đã hết hạn, vui lòng đăng nhập lại!',
        "name": "Tên",
+        "import": "Nhập",
+        "export": "Xuất",
        "create_name": "Người tạo",
        "create_time": "Thời gian tạo",
        "update_name": "Người sửa đổi",
@@ -72,7 +173,15 @@ var config = {
        "yes": "Có",
        "no": "Không",
        "user_info_get_fail": "Lấy thông tin người dùng thất bại",
-        "operation_success": "Thao tác thành công"
+        "operation_success": "Thao tác thành công",
+        "inputCodeOrName": "Nhập mã hoặc tên"
+    },
+    "upload": {
+        "load_text1": "Kéo file vào đây, hoặc",
+        "load_text2": "nhấp để tải lên",
+        "load_text3": "Chỉ có thể tải lên file Excel và không vượt quá 10MB",
+        "load_text4": "File quá lớn, vui lòng tải lên file nhỏ hơn 10MB~",
+        "load_text5": "Chỉ có thể tải lên một file excel!"
    },
    "gateway": {
        "picking_point_not_exist": "Vị trí chọn bạn nhập không tồn tại, vui lòng nhập vị trí chọn 1207 hoặc 1210!",
@@ -80,6 +189,19 @@ var config = {
        "apply_task_fail": "Ứng dụng tác vụ thất bại, tham số ứng dụng là",
        "check_error_log": "Vui lòng kiểm tra nhật ký lỗi"
    },
+    "md_me_materialbase": {
+    "material_code": "Mã vật liệu",
+        "material_name": "Tên vật liệu",
+        "product_series_name": "Dòng sản phẩm",
+        "material_spec": "Quy cách vật liệu",
+        "material_model": "Model vật liệu"
+    },
+    "md_pb_classstandard": {
+    "class_code": "Mã phân loại",
+        "class_name": "Tên phân loại",
+        "class_desc": "Mô tả phân loại",
+        "parent_class_id": "ID phân loại cấp trên"
+    },
    "md_pb_measureunit": {
        "unit_code": "Mã",
        "unit_name": "Tên",
@@ -321,6 +443,7 @@ var config = {
        "para3": "Tham số 3"
    },
    "menu": {
+        "home": "home",
        "menu_id": "ID menu",
        "pid": "ID menu cấp trên",
        "sub_count": "Số lượng menu con",
--- a/nladmin-system/nlsso-server/src/main/resources/language/i18n/zh.js
+++ b/nladmin-system/nlsso-server/src/main/resources/language/i18n/zh.js
@@ -44,7 +44,108 @@ var config = {
        "accountUse": "登入失败，账号未启用"
    },
    "common": {
+        'home': '首页', // 首页
+        'Layout_setting': '布局设置',
+        'Personal_center': '个人中心',
+        'Log_out': '退出登录',
+        'Personal_information': '个人信息',
+        'username': '用户姓名',
+        'name': '姓名',
+        'phone': '手机号码',
+        'phone2': '手机号',
+        'sex': '性别',
+        'sex_male': '男',
+        'sex_female': '女',
+        'email': '用户邮箱',
+        'Security_settings': '安全设置',
+        'Save_settings': '保存配置',
+        'Reset_settings': '重置配置',
+        'Change_password': '修改密码',
+        'New_password': '新密码',
+        'Old_password': '旧密码',
+        'Verify_password': '确认密码',
+        'User_information': '用户资料',
+        'Operation_log': '操作日志',
+        'action': '行为',
+        'IP_source': 'IP来源',
+        'Browser': '浏览器',
+        'Request_time': '请求耗时',
+        'Creation_date': '创建日期',
+        'account': '账号',
+        'password': '密码',
+        'verification_code': '验证码',
+        'login_rm': '记住我',
+        'login': '登 录',
+        'login_ing': '登 录 中...',
+        'Create': '新增',
+        'Update': '修改',
+        'Delete': '删除',
+        'More': '更多',
+        'Export': '导出',
+        'Editors': '编辑',
+        'SelectAll': '全选',
+        'Query': '查询',
+        'Reset': '重置',
+        'Confirm': '确认',
+        'Cancel': '取消',
+        'Yes': '是',
+        'No': '否',
+        'Success': '成功',
+        'Fail': '失败',
+        'Please_select': '请选择',
+        'Operation_success': '操作成功',
+        'Upload_success': '上传成功',
+        'Operate': '操作',
+        'Refresh': '刷新',
+        'Closes': '关闭',
+        'Closes_l': '关闭左侧',
+        'Closes_r': '关闭右侧',
+        'Closes_o': '关闭其他',
+        'Closes_a': '关闭全部',
+        'Theme_style_setting': '主题风格设置',
+        'Theme_color': '主题颜色',
+        'System_layout_configuration': '系统布局配置',
+        'Open': '开启',
+        'Fixation': '固定',
+        'Display': '显示',
+        'Dynamic_titles': '动态标题',
+        'crudTip': '确定删除本条数据吗？',
+        'startDate': '开始日期',
+        'endDate': '结束日期',
+        'moreMenu': '更多菜单',
+        'browses': '浏览',
+        'fz': '全屏缩放',
+        'submit': '提交成功',
+        'add': '新增成功',
+        'edit': '编辑成功',
+        'del': '删除成功',
+        'close': '确认关闭',
+        'save': '保存成功',
+        'datas': '数据',
+        'Tips': '提示',
+        'Tip1': '确认删除选中的{count}条数据?',
+        'Tip3': '用户姓名不作为登录使用',
+        'Tip4': '手机号码不能重复',
+        'Tip5': '请输入电话号码',
+        'Tip6': '请输入正确的11位手机号码',
+        'Tip7': '拖拽excel文件到此处 或者',
+        'Tip8': '两次输入的密码不一致',
+        'Tip9': '请再次输入密码',
+        'Tip10': '请输入旧密码',
+        'Tip11': '请输入新密码',
+        'Tip12': '长度在 {min} 到 {max} 个字符',
+        'Tip13': '确定注销并退出系统吗？',
+        'Tip14': 'WebSocket连接发生错误',
+        'Tip15': '请输入图标名称',
+        'Tip16': '不能为空',
+        'Tip17': '请输入你要搜索的内容',
+        'loading': '数据加载中...',
+        'Tip18': '选择日期时间',
+        'Tip19': '你确定删除选中的数据吗?',
+        'Tip20': '当前登录状态已过期，请重新登录！',
        "name": "名称",
+        "import": "导入",
+        "export": "导出",
        "create_name": "创建人",
        "create_time": "创建时间",
        "update_name": "修改人",
@@ -72,7 +173,15 @@ var config = {
        "yes": "是",
        "no": "否",
        "user_info_get_fail": "用户信息获取失败",
-        "operation_success": "操作成功"
+        "operation_success": "操作成功",
+        "inputCodeOrName": "输入编码或名称"
+    },
+    "upload":{
+        "load_text1":"将文件拖到此处，或",
+        "load_text2":"点击上传",
+        "load_text3":"只能上传Excel文件，且不超过10MB",
+        "load_text4":"文件过大，请上传小于10MB的文件〜",
+        "load_text5":"只能上传一个excel文件！",
    },
    "gateway": {
        "picking_point_not_exist": "您输入的拣选位不存在，请输入1207或1210拣选位!",
@@ -80,6 +189,19 @@ var config = {
        "apply_task_fail": "任务申请失败，申请参数为",
        "check_error_log": "请查看错误日志"
    },
+    "md_me_materialbase": {
+        "material_code": "物料编码",
+        "material_name": "物料名称",
+        "material_spec": "物料规格",
+        "material_model": "物料型号"
+    },
+    "md_pb_classstandard": {
+        "class_code": "分类编码",
+        "class_name": "分类名称",
+        "class_desc": "分类描述",
+        "product_series_name": "系列",
+        "parent_class_id": "上级分类标识"
+    },
    "md_pb_measureunit": {
        "unit_code": "编码",
        "unit_name": "名称",
@@ -321,6 +443,7 @@ var config = {
        "para3": "参数3"
    },
    "menu": {
+        "home": "首页面",
        "menu_id": "菜单ID",
        "pid": "上级菜单ID",
        "sub_count": "子菜单数量",
--- a/nladmin-system/nlsso-server/src/main/resources/language/login/login.properties
+++ b/nladmin-system/nlsso-server/src/main/resources/language/login/login.properties
@@ -1,7 +0,0 @@
-login_CodeError=验证码配置信息错误！
-login_CodeNull=验证码不存在或者过期
-login_account=账号未激活
-login_childError=上级不能为自己或自己的下级
-login_pwd=账号或者密码不正确
-login_pwd_1=修改失败，旧密码错误
-login_pwd_2=新密码不能与旧密码相同
--- a/nladmin-system/nlsso-server/src/main/resources/language/login/login_en_US.properties
+++ b/nladmin-system/nlsso-server/src/main/resources/language/login/login_en_US.properties
@@ -1,7 +0,0 @@
-login_CodeError=Verification code configuration information error\! 
-login_CodeNull=The verification code does not exist or has expired  
-login_account=Account not activated  
-login_childError=The superior cannot act for themselves  
-login_pwd=Incorrect account or password  
-login_pwd_1=Modification failed, old password error  
-login_pwd_2=The new password cannot be the same as the old password  
--- a/nladmin-system/nlsso-server/src/main/resources/language/login/login_id_ID.properties
+++ b/nladmin-system/nlsso-server/src/main/resources/language/login/login_id_ID.properties
@@ -1,7 +0,0 @@
-login_CodeError=Galat konfigurasi kode verifikasi\!
-login_CodeNull=Kode verifikasi tidak ada atau sudah habis  
-login_account=Akaun tidak diaktifkan  
-login_childError=Atasan tidak bisa bertindak untuk diri mereka sendiri  
-login_pwd=Akaun atau kata sandi yang salah  
-login_pwd_1=Modifikasi gagal, kesalahan kata sandi lama  
-login_pwd_2=Kata sandi baru tidak dapat sama dengan kata sandi lama  
--- a/nladmin-system/nlsso-server/src/main/resources/language/login/login_in_ID.properties
+++ b/nladmin-system/nlsso-server/src/main/resources/language/login/login_in_ID.properties
@@ -1,7 +0,0 @@
-login_CodeError=Galat konfigurasi kode verifikasi\!
-login_CodeNull=Kode verifikasi tidak ada atau sudah habis  
-login_account=Akaun tidak diaktifkan  
-login_childError=Atasan tidak bisa bertindak untuk diri mereka sendiri  
-login_pwd=Akaun atau kata sandi yang salah  
-login_pwd_1=Modifikasi gagal, kesalahan kata sandi lama  
-login_pwd_2=Kata sandi baru tidak dapat sama dengan kata sandi lama  
--- a/nladmin-system/nlsso-server/src/main/resources/language/login/login_zh_CN.properties
+++ b/nladmin-system/nlsso-server/src/main/resources/language/login/login_zh_CN.properties
@@ -1,7 +0,0 @@
-login_CodeError=验证码配置信息错误！
-login_CodeNull=验证码不存在或者过期
-login_account=账号未激活
-login_childError=上级不能为自己或自己的下级
-login_pwd=账号或者密码不正确
-login_pwd_1=修改失败，旧密码错误
-login_pwd_2=新密码不能与旧密码相同
--- a/nladmin-system/nlsso-server/src/main/resources/language/task/CallEmpReelTask.properties
+++ b/nladmin-system/nlsso-server/src/main/resources/language/task/CallEmpReelTask.properties
@@ -1,9 +0,0 @@
-CallEmpReelTask_createTaskTip1=请求参数不能为空
-CallEmpReelTask_createTaskTip2=业务类型不能为空
-CallEmpReelTask_createTaskTip3=载具号不能为空
-CallEmpReelTask_createTaskTip4=起点不能为空
-CallEmpReelTask_createTaskTip5=下一点不能为空
-CallEmpReelTask_forceFinish=CallEmpReelTask任务取消接口任务号为空!
-CallEmpReelTask_forceCancel=CallEmpReelTask任务取消接口任务号为空!
-CallEmpReelTask_update1=CallEmpReelTask任务更新接口任务号为空
-CallEmpReelTask_update2=CallEmpReelTask任务已执行不能取消
--- a/nladmin-system/nlsso-server/src/main/resources/language/task/CallEmpReelTask_en_US.properties
+++ b/nladmin-system/nlsso-server/src/main/resources/language/task/CallEmpReelTask_en_US.properties
@@ -1,9 +0,0 @@
-CallEmpReelTask_createTaskTip1=Request parameters cannot be empty
-CallEmpReelTask_createTaskTip2=Business type cannot be empty
-CallEmpReelTask_createTaskTip3=The vehicle number cannot be empty
-CallEmpReelTask_createTaskTip4=The starting point cannot be empty
-CallEmpReelTask_createTaskTip5=The next point cannot be empty
-CallEmpReelTask_forceFinish=CallEmpReelTask task cancellation interface task number is empty!
-CallEmpReelTask_forceCancel=CallEmpReelTask task cancellation interface task number is empty!
-CallEmpReelTask_update1=CallEmpReelTask task update interface task number is empty
-CallEmpReelTask_update2=The CallEmpReelTask task has been executed and cannot be canceled
--- a/nladmin-system/nlsso-server/src/main/resources/language/task/CallEmpReelTask_id_ID.properties
+++ b/nladmin-system/nlsso-server/src/main/resources/language/task/CallEmpReelTask_id_ID.properties
@@ -1,9 +0,0 @@
-CallEmpReelTask_createTaskTip1=Parameter permintaan tidak boleh kosong
-CallEmpReelTask_createTaskTip2=Jenis bisnis tidak boleh kosong
-CallEmpReelTask_createTaskTip3=Nomor kendaraan tidak boleh kosong
-CallEmpReelTask_createTaskTip4=Titik awal tidak boleh kosong
-CallEmpReelTask_createTaskTip5=Poin selanjutnya tidak boleh kosong
-CallEmpReelTask_forceFinish=Nomor tugas antarmuka pembatalan tugas CallEmpReelTask kosong!
-CallEmpReelTask_forceCancel=Nomor tugas antarmuka pembatalan tugas CallEmpReelTask kosong!
-CallEmpReelTask_update1=Nomor tugas antarmuka pembaruan tugas CallEmpReelTask kosong
-CallEmpReelTask_update2=Tugas CallEmpReelTask telah dijalankan dan tidak dapat dibatalkan
--- a/nladmin-system/nlsso-server/src/main/resources/language/task/CallEmpReelTask_in_ID.properties
+++ b/nladmin-system/nlsso-server/src/main/resources/language/task/CallEmpReelTask_in_ID.properties
@@ -1,9 +0,0 @@
-CallEmpReelTask_createTaskTip1=Parameter permintaan tidak boleh kosong
-CallEmpReelTask_createTaskTip2=Jenis bisnis tidak boleh kosong
-CallEmpReelTask_createTaskTip3=Nomor kendaraan tidak boleh kosong
-CallEmpReelTask_createTaskTip4=Titik awal tidak boleh kosong
-CallEmpReelTask_createTaskTip5=Poin selanjutnya tidak boleh kosong
-CallEmpReelTask_forceFinish=Nomor tugas antarmuka pembatalan tugas CallEmpReelTask kosong!
-CallEmpReelTask_forceCancel=Nomor tugas antarmuka pembatalan tugas CallEmpReelTask kosong!
-CallEmpReelTask_update1=Nomor tugas antarmuka pembaruan tugas CallEmpReelTask kosong
-CallEmpReelTask_update2=Tugas CallEmpReelTask telah dijalankan dan tidak dapat dibatalkan
--- a/nladmin-system/nlsso-server/src/main/resources/language/task/CallEmpReelTask_zh_CN.properties
+++ b/nladmin-system/nlsso-server/src/main/resources/language/task/CallEmpReelTask_zh_CN.properties
@@ -1,9 +0,0 @@
-CallEmpReelTask_createTaskTip1=请求参数不能为空
-CallEmpReelTask_createTaskTip2=业务类型不能为空
-CallEmpReelTask_createTaskTip3=载具号不能为空
-CallEmpReelTask_createTaskTip4=起点不能为空
-CallEmpReelTask_createTaskTip5=下一点不能为空
-CallEmpReelTask_forceFinish=CallEmpReelTask任务取消接口任务号为空!
-CallEmpReelTask_forceCancel=CallEmpReelTask任务取消接口任务号为空!
-CallEmpReelTask_update1=CallEmpReelTask任务更新接口任务号为空
-CallEmpReelTask_update2=CallEmpReelTask任务已执行不能取消
--- a/nladmin-system/nlsso-server/src/main/resources/language/task/common.properties
+++ b/nladmin-system/nlsso-server/src/main/resources/language/task/common.properties
@@ -1,3 +0,0 @@
-common_configTip=找不到配置文件，请确认[{0}]配置是否存在！
-common_maxTaskTip={0}该点位申请的任务未完成数已超过上限，无法申请任务！
-common_taskCreatedTip=点位[{0}]已经创建过任务
--- a/nladmin-system/nlsso-server/src/main/resources/language/task/common_en_US.properties
+++ b/nladmin-system/nlsso-server/src/main/resources/language/task/common_en_US.properties
@@ -1,3 +0,0 @@
-common_configTip=The configuration file cannot be found, please confirm whether the [{0}] configuration exists!
-common_maxTaskTip={0}The number of unfinished tasks applied for at this point has exceeded the upper limit, and the task cannot be applied!
-common_taskCreatedTip=Point[{0}] has already created a task
--- a/nladmin-system/nlsso-server/src/main/resources/language/task/common_id_ID.properties
+++ b/nladmin-system/nlsso-server/src/main/resources/language/task/common_id_ID.properties
@@ -1,3 +0,0 @@
-common_configTip=File konfigurasi tidak dapat ditemukan, harap konfirmasi apakah konfigurasi [{0}] ada!
-common_maxTaskTip={0}Jumlah tugas yang belum selesai yang diajukan pada saat ini telah melampaui batas atas, dan tugas tersebut tidak dapat diterapkan!
-common_taskCreatedTip=Point[{0}] telah membuat tugas
--- a/nladmin-system/nlsso-server/src/main/resources/language/task/common_in_ID.properties
+++ b/nladmin-system/nlsso-server/src/main/resources/language/task/common_in_ID.properties
@@ -1,3 +0,0 @@
-common_configTip=File konfigurasi tidak dapat ditemukan, harap konfirmasi apakah konfigurasi [{0}] ada!
-common_maxTaskTip={0}Jumlah tugas yang belum selesai yang diajukan pada saat ini telah melampaui batas atas, dan tugas tersebut tidak dapat diterapkan!
-common_taskCreatedTip=Point[{0}] telah membuat tugas
--- a/nladmin-system/nlsso-server/src/main/resources/language/task/common_zh_CN.properties
+++ b/nladmin-system/nlsso-server/src/main/resources/language/task/common_zh_CN.properties
@@ -1,3 +0,0 @@
-common_configTip=找不到配置文件，请确认[{0}]配置是否存在！
-common_maxTaskTip={0}该点位申请的任务未完成数已超过上限，无法申请任务！
-common_taskCreatedTip=点位[{0}]已经创建过任务
--- a/nladmin-ui/package-lock.json
+++ b/nladmin-ui/package-lock.json
@@ -4878,6 +4878,19 @@
      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
      "dev": true
    },
+    "node_modules/@vue/cli-plugin-unit-jest/node_modules/node-notifier": {
+      "version": "5.4.5",
+      "resolved": "https://registry.npmmirror.com/node-notifier/-/node-notifier-5.4.5.tgz",
+      "integrity": "sha512-tVbHs7DyTLtzOiN78izLA85zRqB9NvEXkAf014Vx3jtSvn/xBl6bR8ZYifj+dFcFrKI21huSQgJZ6ZtL3B4HfQ==",
+      "dev": true,
+      "dependencies": {
+        "growly": "^1.3.0",
+        "is-wsl": "^1.1.0",
+        "semver": "^5.5.0",
+        "shellwords": "^0.1.1",
+        "which": "^1.3.0"
+      }
+    },
    "node_modules/@vue/cli-plugin-unit-jest/node_modules/normalize-path": {
      "version": "2.1.1",
      "resolved": "https://registry.npmmirror.com/normalize-path/-/normalize-path-2.1.1.tgz",
@@ -13850,6 +13863,22 @@
        "node": ">=0.10.0"
      }
    },
+    "node_modules/is-docker": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmmirror.com/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "optional": true,
+      "peer": true,
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
    "node_modules/is-dotfile": {
      "version": "1.0.3",
      "resolved": "https://registry.npmmirror.com/is-dotfile/-/is-dotfile-1.0.3.tgz",
@@ -14352,7 +14381,7 @@
      "version": "1.1.0",
      "resolved": "https://registry.npmmirror.com/is-wsl/-/is-wsl-1.1.0.tgz",
      "integrity": "sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==",
-      "devOptional": true,
+      "dev": true,
      "engines": {
        "node": ">=4"
      }
@@ -18888,16 +18917,70 @@
      }
    },
    "node_modules/node-notifier": {
-      "version": "5.4.5",
-      "resolved": "https://registry.npmmirror.com/node-notifier/-/node-notifier-5.4.5.tgz",
-      "integrity": "sha512-tVbHs7DyTLtzOiN78izLA85zRqB9NvEXkAf014Vx3jtSvn/xBl6bR8ZYifj+dFcFrKI21huSQgJZ6ZtL3B4HfQ==",
-      "devOptional": true,
+      "version": "10.0.1",
+      "resolved": "https://registry.npmmirror.com/node-notifier/-/node-notifier-10.0.1.tgz",
+      "integrity": "sha512-YX7TSyDukOZ0g+gmzjB6abKu+hTGvO8+8+gIFDsRCU2t8fLV/P2unmt+LGFaIa4y64aX98Qksa97rgz4vMNeLQ==",
+      "optional": true,
+      "peer": true,
      "dependencies": {
        "growly": "^1.3.0",
-        "is-wsl": "^1.1.0",
-        "semver": "^5.5.0",
+        "is-wsl": "^2.2.0",
+        "semver": "^7.3.5",
        "shellwords": "^0.1.1",
-        "which": "^1.3.0"
+        "uuid": "^8.3.2",
+        "which": "^2.0.2"
+      }
+    },
+    "node_modules/node-notifier/node_modules/is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmmirror.com/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "is-docker": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/node-notifier/node_modules/semver": {
+      "version": "7.7.3",
+      "resolved": "https://registry.npmmirror.com/semver/-/semver-7.7.3.tgz",
+      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
+      "optional": true,
+      "peer": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/node-notifier/node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmmirror.com/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "optional": true,
+      "peer": true,
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/node-notifier/node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmmirror.com/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
      }
    },
    "node_modules/node-plop": {
@@ -27711,7 +27794,7 @@
      "version": "1.3.1",
      "resolved": "https://registry.npmmirror.com/which/-/which-1.3.1.tgz",
      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "devOptional": true,
+      "dev": true,
      "dependencies": {
        "isexe": "^2.0.0"
      },
@@ -32023,6 +32106,19 @@
          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
          "dev": true
        },
+        "node-notifier": {
+          "version": "5.4.5",
+          "resolved": "https://registry.npmmirror.com/node-notifier/-/node-notifier-5.4.5.tgz",
+          "integrity": "sha512-tVbHs7DyTLtzOiN78izLA85zRqB9NvEXkAf014Vx3jtSvn/xBl6bR8ZYifj+dFcFrKI21huSQgJZ6ZtL3B4HfQ==",
+          "dev": true,
+          "requires": {
+            "growly": "^1.3.0",
+            "is-wsl": "^1.1.0",
+            "semver": "^5.5.0",
+            "shellwords": "^0.1.1",
+            "which": "^1.3.0"
+          }
+        },
        "normalize-path": {
          "version": "2.1.1",
          "resolved": "https://registry.npmmirror.com/normalize-path/-/normalize-path-2.1.1.tgz",
@@ -39259,6 +39355,13 @@
      "integrity": "sha512-yVChGzahRFvbkscn2MlwGismPO12i9+znNruC5gVEntG3qu0xQMzsGg/JFbrsqDOHtHFPci+V5aP5T9I+yeKqw==",
      "dev": true
    },
+    "is-docker": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmmirror.com/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "optional": true,
+      "peer": true
+    },
    "is-dotfile": {
      "version": "1.0.3",
      "resolved": "https://registry.npmmirror.com/is-dotfile/-/is-dotfile-1.0.3.tgz",
@@ -39602,7 +39705,7 @@
      "version": "1.1.0",
      "resolved": "https://registry.npmmirror.com/is-wsl/-/is-wsl-1.1.0.tgz",
      "integrity": "sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==",
-      "devOptional": true
+      "dev": true
    },
    "isarray": {
      "version": "1.0.0",
@@ -43056,16 +43159,54 @@
      }
    },
    "node-notifier": {
-      "version": "5.4.5",
-      "resolved": "https://registry.npmmirror.com/node-notifier/-/node-notifier-5.4.5.tgz",
-      "integrity": "sha512-tVbHs7DyTLtzOiN78izLA85zRqB9NvEXkAf014Vx3jtSvn/xBl6bR8ZYifj+dFcFrKI21huSQgJZ6ZtL3B4HfQ==",
-      "devOptional": true,
+      "version": "10.0.1",
+      "resolved": "https://registry.npmmirror.com/node-notifier/-/node-notifier-10.0.1.tgz",
+      "integrity": "sha512-YX7TSyDukOZ0g+gmzjB6abKu+hTGvO8+8+gIFDsRCU2t8fLV/P2unmt+LGFaIa4y64aX98Qksa97rgz4vMNeLQ==",
+      "optional": true,
+      "peer": true,
      "requires": {
        "growly": "^1.3.0",
-        "is-wsl": "^1.1.0",
-        "semver": "^5.5.0",
+        "is-wsl": "^2.2.0",
+        "semver": "^7.3.5",
        "shellwords": "^0.1.1",
-        "which": "^1.3.0"
+        "uuid": "^8.3.2",
+        "which": "^2.0.2"
+      },
+      "dependencies": {
+        "is-wsl": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmmirror.com/is-wsl/-/is-wsl-2.2.0.tgz",
+          "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "is-docker": "^2.0.0"
+          }
+        },
+        "semver": {
+          "version": "7.7.3",
+          "resolved": "https://registry.npmmirror.com/semver/-/semver-7.7.3.tgz",
+          "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
+          "optional": true,
+          "peer": true
+        },
+        "uuid": {
+          "version": "8.3.2",
+          "resolved": "https://registry.npmmirror.com/uuid/-/uuid-8.3.2.tgz",
+          "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+          "optional": true,
+          "peer": true
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmmirror.com/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
      }
    },
    "node-plop": {
@@ -50160,7 +50301,7 @@
      "version": "1.3.1",
      "resolved": "https://registry.npmmirror.com/which/-/which-1.3.1.tgz",
      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "devOptional": true,
+      "dev": true,
      "requires": {
        "isexe": "^2.0.0"
      }
--- a/nladmin-ui/public/screen/index.html
+++ b/nladmin-ui/public/screen/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"><title>欧伦可视化看板</title><link href=./static/css/app.7eb34c7823b484f76dbdbf24cd625cff.css rel=stylesheet></head><body class=clearfix><div id=app></div><script type=text/javascript src=./static/js/manifest.7b7124d31a251fc046ff.js></script><script type=text/javascript src=./static/js/app.12b9502b60b1dab9d8a5.js></script></body></html>
--- a/nladmin-ui/src/api/i18n.js
+++ b/nladmin-ui/src/api/i18n.js
@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+// 国际化开发：3。增加文件获取接口
+export function fetchMessages(locale) {
+  return request({
+    url: '/api/language/js/' + locale,
+    method: 'get'
+  })
+}
+
+export default { fetchMessages }
--- a/nladmin-ui/src/i18n/index.js
+++ b/nladmin-ui/src/i18n/index.js
@@ -1,27 +1,19 @@
 import Vue from 'vue'
 import VueI18n from 'vue-i18n'
-import locale from 'element-ui/lib/locale'
-import zh from './langs/chinese'
-import en from './langs/english'
-import indonesian from './langs/indonesian'
+// 国际化开发：5。i18n index文件修改
 Vue.use(VueI18n)
-const messages = {
-  en: {
-    ...en
-  },
-  zh: {
-    ...zh
-  },
-  in: {
-    ...indonesian
-  }
-}
+
+// 准备默认的语言环境消息（可以是空对象，也可以是一些基本消息）
+const defaultLocale = 'zh'
+const fallbackLocale = 'zh'
+
+// 创建i18n实例
 const i18n = new VueI18n({
-  locale: localStorage.lang || 'zh',
-  messages,
+  locale: defaultLocale, // 设置当前语言
+  fallbackLocale, // 设置回退语言
  silentTranslationWarn: true, // 解决vue-i18n黄色警告"value of key 'xxx' is not a string"和"cannot translate the value of keypath 'xxx'.use the value of keypath as default",可忽略
-  globalInjection: true, // 全局注入
-  fallbackLocale: 'zh'
+  globalInjection: true,
+  messages: {} // 初始化为空，稍后从接口获取
 })
-locale.i18n((key, value) => i18n.t(key, value))
 export default i18n
+
--- a/nladmin-ui/src/i18n/langs/chinese.js
+++ b/nladmin-ui/src/i18n/langs/chinese.js
@@ -1,37 +0,0 @@
-import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
-import zh from './zh-CN'
-import menu from '../../views/system/menu/locale/zh'
-import param from '../../views/system/param/locale/zh'
-import user from '../../views/system/user/locale/zh'
-import scheduler from '../../views/system/timing/locale/zh'
-import dept from '../../views/system/dept/locale/zh'
-import dict from '../../views/system/dict/locale/zh'
-import redis from '../../views/system/redis/locale/zh'
-import log from '../../views/monitor/log/locale/zh'
-import notice from '../../views/system/notice/locale/zh'
-import errorLog from '../../views/monitor/log/locale/error/zh'
-import online from '../../views/monitor/online/locale/zh'
-import role from '../../views/system/role/locale/zh'
-import corn from '../../views/system/timing/locale/corn/zh'
-import codegen from '../../views/tools/codeGen/locale/zh'
-import storage from '../../views/tools/storage/locale/zh'
-
-export default {
-  ...zhLocale,
-  ...zh,
-  ...menu,
-  ...param,
-  ...user,
-  ...scheduler,
-  ...dept,
-  ...dict,
-  ...redis,
-  ...log,
-  ...notice,
-  ...errorLog,
-  ...online,
-  ...role,
-  ...corn,
-  ...codegen,
-  ...storage
-}
--- a/nladmin-ui/src/i18n/langs/en.js
+++ b/nladmin-ui/src/i18n/langs/en.js
@@ -1,134 +0,0 @@
-export default {
-  'lang': 'English',
-  // 平台
-  'platform': {
-    'title': 'NOBLELIFT Platform',
-    'tip1': 'The user name cannot be empty',
-    'tip2': 'The password cannot be empty',
-    'tip3': 'The verification code cannot be empty'
-  },
-  'common': {
-    'home': 'Dashboard',
-    'Layout_setting': 'Layout Setting',
-    'Personal_center': 'Personal Center',
-    'Log_out': 'Log Out',
-    'Personal_information': 'Personal Information',
-    'username': 'UserName',
-    'name': 'Name',
-    'phone': 'Phone Number',
-    'phone2': 'Phone',
-    'sex': 'Sex',
-    'sex_male': 'Male',
-    'sex_female': 'Female',
-    'email': 'E-mail',
-    'Security_settings': 'Security Settings',
-    'Save_settings': 'Save Settings',
-    'Reset_settings': 'Reset Settings',
-    'Change_password': 'Change Password',
-    'New_password': 'New Password',
-    'Old_password': 'Old Password',
-    'Verify_password': 'Verify Password',
-    'User_information': 'User Information',
-    'Operation_log': 'Operation Log',
-    'action': 'Action',
-    'IP_source': 'IP Source',
-    'Browser': 'Browser',
-    'Request_time': 'Request Time',
-    'Creation_date': 'Creation Date',
-    'account': 'Account',
-    'password': 'Password',
-    'verification_code': 'Code',
-    'login_rm': 'Remember Me',
-    'login': 'Login',
-    'login_ing': 'Logging in...',
-    'Create': 'Create',
-    'Update': 'Update',
-    'Delete': 'Delete',
-    'More': 'More',
-    'Export': 'Export',
-    'Editors': 'Editor',
-    'SelectAll': 'SelectAll',
-    'Query': 'Query',
-    'Reset': 'Reset',
-    'Confirm': 'Confirm',
-    'Cancel': 'Cancel',
-    'Yes': 'YES',
-    'No': 'NO',
-    'Success': 'success',
-    'Fail': 'fail',
-    'Please_select': 'Please Select',
-    'Operation_success': 'Successful operation',
-    'Upload_success': 'Upload Success',
-    'Operate': 'Operate',
-    'Refresh': 'Refresh',
-    'Closes': 'Close',
-    'Closes_l': 'Close Left',
-    'Closes_r': 'Close Right',
-    'Closes_o': 'Close Other',
-    'Closes_a': 'Close All',
-    'Theme_style_setting': 'Theme Style Setting',
-    'Theme_color': 'Theme Color',
-    'System_layout_configuration': 'System Layout Configuration',
-    'Open': 'Open',
-    'Fixation': 'Fixation',
-    'Display': 'Display',
-    'Dynamic_titles': 'Dynamic Titles',
-    'crudTip': 'Are you sure to delete this data?',
-    'startDate': 'StartDate',
-    'endDate': 'EndDate',
-    'moreMenu': 'MoreMenu',
-    'browses': 'browse',
-    'fz': 'Full screen zoom',
-    'submit': 'Submit Success',
-    'add': 'Add Success',
-    'edit': 'Edit Success',
-    'del': 'Delete Success',
-    'close': 'Confirm Close',
-    'save': 'Save Success',
-    'datas': 'Data',
-    'Tips': 'Tips',
-    'Tip1': 'Confirm to delete the selected {count} pieces of data?',
-    'Tip3': 'User name not used as login',
-    'Tip4': 'Mobile phone number cannot be duplicate',
-    'Tip5': 'Please enter a phone number',
-    'Tip6': 'Please enter the correct 11 digit phone number',
-    'Tip7': 'Drag and drop the excel file here or',
-    'Tip8': 'The two passwords are different',
-    'Tip9': 'Please enter your password again',
-    'Tip10': 'Please enter your old password',
-    'Tip11': 'Please enter your new password',
-    'Tip12': '{min} to {max} characters in length',
-    'Tip13': 'Are you sure to log out and exit the system?',
-    'Tip14': 'WebSocket connection error',
-    'Tip15': 'Please enter an icon name',
-    'Tip16': 'NOT NULL',
-    'Tip17': 'Please enter what you are searching for',
-    'loading': 'loading...',
-    'Tip18': 'select date time',
-    'Tip19': 'Are you sure to delete the selected data?',
-    'Tip20': 'The login has expired,please log in again!'
-  },
-  'WorkOrder': {
-    'form': {
-      'WorkOrderCode': 'WorkOrderCode'
-    },
-    'placeholder': {
-      'WorkOrderCode': 'Please enter the code'
-    }
-  },
-  'monitor': {
-    'sys': 'System',
-    'day': 'Running Day',
-    'status': 'Status',
-    'core': 'Core',
-    'cpu': 'CPU Utilization',
-    'memory': 'Memory Utilization',
-    'tality': 'Tality',
-    'used': 'Used',
-    'leisure': 'Leisure',
-    'exchange': 'Exchange Utilization',
-    'disk': 'Disk Utilization',
-    'cpu_monitoring': 'Cpu Utilization Monitoring',
-    'memory_monitoring': 'Memory Utilization Monitoring'
-  }
-}
--- a/nladmin-ui/src/i18n/langs/english.js
+++ b/nladmin-ui/src/i18n/langs/english.js
@@ -1,37 +0,0 @@
-import enLocale from 'element-ui/lib/locale/lang/en'
-import en from './en'
-import menu from '../../views/system/menu/locale/en'
-import param from '../../views/system/param/locale/en'
-import user from '../../views/system/user/locale/en'
-import scheduler from '../../views/system/timing/locale/en'
-import dept from '../../views/system/dept/locale/en'
-import dict from '../../views/system/dict/locale/en'
-import redis from '../../views/system/redis/locale/en'
-import log from '../../views/monitor/log/locale/en'
-import notice from '../../views/system/notice/locale/en'
-import errorLog from '../../views/monitor/log/locale/error/en'
-import online from '../../views/monitor/online/locale/en'
-import role from '../../views/system/role/locale/en'
-import corn from '../../views/system/timing/locale/corn/en'
-import codegen from '../../views/tools/codeGen/locale/en'
-import storage from '../../views/tools/storage/locale/en'
-
-export default {
-  ...enLocale,
-  ...en,
-  ...menu,
-  ...param,
-  ...user,
-  ...scheduler,
-  ...dept,
-  ...dict,
-  ...redis,
-  ...log,
-  ...notice,
-  ...errorLog,
-  ...online,
-  ...role,
-  ...corn,
-  ...codegen,
-  ...storage
-}
--- a/nladmin-ui/src/i18n/langs/in.js
+++ b/nladmin-ui/src/i18n/langs/in.js
@@ -1,134 +0,0 @@
-export default {
-  'lang': 'in',
-  // 平台
-  'platform': {
-    'title': 'NOBLELIFT Platform',
-    'tip1': 'Nama pengguna tidak dapat kosong',
-    'tip2': 'Kata sandi tidak dapat kosong',
-    'tip3': 'Kode verifikasi tidak dapat kosong'
-  },
-  'common': {
-    'home': 'rumah', // 首页
-    'Layout_setting': 'Pengaturan Bentangan',
-    'Personal_center': 'Pusat Pribadi',
-    'Log_out': 'Log Out',
-    'Personal_information': 'Informasi Pribadi',
-    'username': 'Nama Pengguna',
-    'name': 'Nama',
-    'phone': 'Nomor Ponsel',
-    'phone2': 'Ponsel',
-    'sex': 'Gender',
-    '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',
-    'Verify_password': 'Konfirmasi Sandi',
-    'User_information': 'Informasi Pengguna',
-    'Operation_log': 'Log Operasi',
-    'action': 'Perilaku',
-    'Browser': 'Pelayar',
-    'IP_source': 'IP Sumber',
-    'Request_time': 'Meminta Konsumsi Waktu',
-    'Creation_date': 'Dicipta Pada',
-    'account': 'Akaun',
-    'password': 'Sandi',
-    'verification_code': 'Kode',
-    'login_rm': 'Ingat aku',
-    'login': 'Login',
-    'login_ing': 'Daftar masuk',
-    'Create': 'Buat',
-    'Update': 'Kemaskini',
-    'Delete': 'Hapus',
-    'More': 'Lebih',
-    'Export': 'Ekspor',
-    'Editors': 'Editor',
-    'SelectAll': 'Pilih Semua',
-    'Query': 'Pertanyaan',
-    'Reset': 'Reset',
-    'Confirm': 'konfirmasi',
-    'Cancel': 'Batalkan',
-    'Yes': 'Ya',
-    'No': 'Tidak',
-    'Success': 'sukses',
-    'Fail': 'gagal',
-    'Please_select': 'Silakan pilih',
-    'Operation_success': 'Operasi berhasil',
-    'Upload_success': 'Unggah Berhasil',
-    'Operate': 'Operasi',
-    'Refresh': 'Segar',
-    'Closes': 'Tutup',
-    'Closes_l': 'Tutup Sisi Kiri',
-    'Closes_r': 'Tutup Sisi Kanan',
-    'Closes_o': 'Tutup Lain',
-    'Closes_a': 'Tutup Semua',
-    'Theme_style_setting': 'Pengaturan Gaya Tema',
-    'Theme_color': 'Warna Tema',
-    'System_layout_configuration': 'Konfigurasi layout sistem',
-    'Open': 'Buka',
-    'Fixation': 'Tetap',
-    'Display': 'Tampilan',
-    'Dynamic_titles': 'Tajuk Dinamik',
-    'crudTip': 'Apakah Anda yakin untuk menghapus data ini?',
-    'startDate': 'TarikhAwal',
-    'endDate': 'TarikhAkhir',
-    'moreMenu': 'LebihBanyakMenu',
-    'browses': 'melayar',
-    'fz': 'Zum layar penuh',
-    'submit': 'Mengirim Sukses',
-    'add': 'Tambah Sukses',
-    'edit': 'Sunting Sukses',
-    'del': 'Hapus Sukses',
-    'close': 'Konfirmasi Tutup',
-    'save': 'Simpan Sukses',
-    'datas': 'Data',
-    'Tips': 'Prompt',
-    'Tip1': 'Konfirmasikan untuk menghapus {count} data yang dipilih?',
-    'Tip3': 'Nama pengguna tidak digunakan sebagai daftar masuk',
-    'Tip4': 'Nomor telepon ponsel tidak dapat duplikasi',
-    'Tip5': 'Silakan masukkan nomor telepon',
-    'Tip6': 'Silakan masukkan nomor telepon 11 digit yang benar',
-    'Tip7': 'Seret dan jatuhkan berkas Excel di sini atau',
-    'Tip8': 'Kata sandi yang dimasukkan dua kali tidak cocok',
-    'Tip9': 'Silakan masukkan sandi lagi',
-    'Tip10': 'Silakan masukkan kata sandi lama Anda',
-    'Tip11': 'Silakan masukkan sandi baru',
-    'Tip12': 'Antara {min} dan {max} karakter dalam panjang',
-    'Tip13': 'Apakah Anda yakin untuk log keluar dan keluar dari sistem?',
-    'Tip14': 'Koneksi WebSocket error',
-    'Tip15': 'Silakan masukkan nama ikon',
-    'Tip16': 'TIDAK NULL',
-    'Tip17': 'Silakan masukkan apa yang Anda cari',
-    'loading': 'Memuatkan Data...',
-    'Tip18': 'pilih tanggal waktu',
-    'Tip19': 'Apakah Anda yakin untuk menghapus data yang dipilih?',
-    'Tip20': 'Log masuk telah habis,silakan log masuk lagi!'
-  },
-  'WorkOrder': {
-    'form': {
-      'WorkOrderCode': 'Kode Perintah Kerja'
-    },
-    'placeholder': {
-      'WorkOrderCode': 'Silakan masukkan kode perintah kerja'
-    }
-  },
-  'monitor': {
-    'sys': 'Sistem',
-    'day': 'Proyek ini telah berjalan terus menerus',
-    'status': 'Keadaan',
-    'core': 'Inti',
-    'cpu': 'Kadar penggunaan CPU',
-    'memory': 'Kadar penggunaan ingatan',
-    'tality': 'Total',
-    'used': 'Digunakan',
-    'leisure': 'Bebas',
-    'exchange': 'Kadar penggunaan area pertukaran',
-    'disk': 'Kadar penggunaan disk',
-    'cpu_monitoring': 'Monitor penggunaan CPU',
-    'memory_monitoring': 'Monitor penggunaan memori'
-  }
-}
--- a/nladmin-ui/src/i18n/langs/indonesian.js
+++ b/nladmin-ui/src/i18n/langs/indonesian.js
@@ -1,37 +0,0 @@
-import idLocale from 'element-ui/lib/locale/lang/id'
-import id from './in'
-import menu from '../../views/system/menu/locale/in'
-import param from '../../views/system/param/locale/in'
-import user from '../../views/system/user/locale/in'
-import scheduler from '../../views/system/timing/locale/in'
-import dept from '../../views/system/dept/locale/in'
-import dict from '../../views/system/dict/locale/in'
-import redis from '../../views/system/redis/locale/in'
-import log from '../../views/monitor/log/locale/in'
-import notice from '../../views/system/notice/locale/in'
-import errorLog from '../../views/monitor/log/locale/error/in'
-import online from '../../views/monitor/online/locale/in'
-import role from '../../views/system/role/locale/in'
-import corn from '../../views/system/timing/locale/corn/in'
-import codegen from '../../views/tools/codeGen/locale/in'
-import storage from '../../views/tools/storage/locale/in'
-
-export default {
-  ...idLocale,
-  ...id,
-  ...menu,
-  ...param,
-  ...user,
-  ...scheduler,
-  ...dept,
-  ...dict,
-  ...redis,
-  ...log,
-  ...notice,
-  ...errorLog,
-  ...online,
-  ...role,
-  ...corn,
-  ...codegen,
-  ...storage
-}
--- a/nladmin-ui/src/i18n/langs/zh-CN.js
+++ b/nladmin-ui/src/i18n/langs/zh-CN.js
@@ -1,134 +0,0 @@
-export default {
-  'lang': 'zh',
-  // 平台
-  'platform': {
-    'title': '富佳WMS',
-    'tip1': '用户名不能为空',
-    'tip2': '密码不能为空',
-    'tip3': '验证码不能为空'
-  },
-  'common': {
-    'home': '首页', // 首页
-    'Layout_setting': '布局设置',
-    'Personal_center': '个人中心',
-    'Log_out': '退出登录',
-    'Personal_information': '个人信息',
-    'username': '用户姓名',
-    'name': '姓名',
-    'phone': '手机号码',
-    'phone2': '手机号',
-    'sex': '性别',
-    'sex_male': '男',
-    'sex_female': '女',
-    'email': '用户邮箱',
-    'Security_settings': '安全设置',
-    'Save_settings': '保存配置',
-    'Reset_settings': '重置配置',
-    'Change_password': '修改密码',
-    'New_password': '新密码',
-    'Old_password': '旧密码',
-    'Verify_password': '确认密码',
-    'User_information': '用户资料',
-    'Operation_log': '操作日志',
-    'action': '行为',
-    'IP_source': 'IP来源',
-    'Browser': '浏览器',
-    'Request_time': '请求耗时',
-    'Creation_date': '创建日期',
-    'account': '账号',
-    'password': '密码',
-    'verification_code': '验证码',
-    'login_rm': '记住我',
-    'login': '登 录',
-    'login_ing': '登 录 中...',
-    'Create': '新增',
-    'Update': '修改',
-    'Delete': '删除',
-    'More': '更多',
-    'Export': '导出',
-    'Editors': '编辑',
-    'SelectAll': '全选',
-    'Query': '查询',
-    'Reset': '重置',
-    'Confirm': '确认',
-    'Cancel': '取消',
-    'Yes': '是',
-    'No': '否',
-    'Success': '成功',
-    'Fail': '失败',
-    'Please_select': '请选择',
-    'Operation_success': '操作成功',
-    'Upload_success': '上传成功',
-    'Operate': '操作',
-    'Refresh': '刷新',
-    'Closes': '关闭',
-    'Closes_l': '关闭左侧',
-    'Closes_r': '关闭右侧',
-    'Closes_o': '关闭其他',
-    'Closes_a': '关闭全部',
-    'Theme_style_setting': '主题风格设置',
-    'Theme_color': '主题颜色',
-    'System_layout_configuration': '系统布局配置',
-    'Open': '开启',
-    'Fixation': '固定',
-    'Display': '显示',
-    'Dynamic_titles': '动态标题',
-    'crudTip': '确定删除本条数据吗？',
-    'startDate': '开始日期',
-    'endDate': '结束日期',
-    'moreMenu': '更多菜单',
-    'browses': '浏览',
-    'fz': '全屏缩放',
-    'submit': '提交成功',
-    'add': '新增成功',
-    'edit': '编辑成功',
-    'del': '删除成功',
-    'close': '确认关闭',
-    'save': '保存成功',
-    'datas': '数据',
-    'Tips': '提示',
-    'Tip1': '确认删除选中的{count}条数据?',
-    'Tip3': '用户姓名不作为登录使用',
-    'Tip4': '手机号码不能重复',
-    'Tip5': '请输入电话号码',
-    'Tip6': '请输入正确的11位手机号码',
-    'Tip7': '拖拽excel文件到此处 或者',
-    'Tip8': '两次输入的密码不一致',
-    'Tip9': '请再次输入密码',
-    'Tip10': '请输入旧密码',
-    'Tip11': '请输入新密码',
-    'Tip12': '长度在 {min} 到 {max} 个字符',
-    'Tip13': '确定注销并退出系统吗？',
-    'Tip14': 'WebSocket连接发生错误',
-    'Tip15': '请输入图标名称',
-    'Tip16': '不能为空',
-    'Tip17': '请输入你要搜索的内容',
-    'loading': '数据加载中...',
-    'Tip18': '选择日期时间',
-    'Tip19': '你确定删除选中的数据吗?',
-    'Tip20': '当前登录状态已过期，请重新登录！'
-  },
-  'WorkOrder': {
-    'form': {
-      'WorkOrderCode': '工单编码'
-    },
-    'placeholder': {
-      'WorkOrderCode': '请输入工单编码'
-    }
-  },
-  'monitor': {
-    'sys': '系统',
-    'day': '项目已不间断运行',
-    'status': '状态',
-    'cpu': 'CPU使用率',
-    'core': '核心',
-    'memory': '内存使用率',
-    'tality': '总量',
-    'used': '已使用',
-    'leisure': '空闲',
-    'exchange': '交换区使用率',
-    'disk': '磁盘使用率',
-    'cpu_monitoring': 'CPU使用率监控',
-    'memory_monitoring': '内存使用率监控'
-  }
-}
--- a/nladmin-ui/src/layout/components/Navbar.vue
+++ b/nladmin-ui/src/layout/components/Navbar.vue
@@ -50,10 +50,11 @@
        <span class="el-dropdown-link" style="font-size: 18px">
          {{ language }} <i class="el-icon-caret-bottom" />
        </span>
+        <!-- 国际化开发：1.修改语言列表-->
        <el-dropdown-menu slot="dropdown">
          <el-dropdown-item divided command="zh">简体中文</el-dropdown-item>
          <el-dropdown-item divided command="en">English</el-dropdown-item>
-          <el-dropdown-item divided command="in">Indonesian</el-dropdown-item>
+          <el-dropdown-item divided command="vi">Vietnamese</el-dropdown-item>
        </el-dropdown-menu>
      </el-dropdown>
    </div>
@@ -137,13 +138,14 @@ export default {
      this.setLang(command)
      location.reload()
    },
+    // 国际化开发：2.设置
    setLang(command) {
      if (command === 'en') {
        this.language = 'English'
      } else if (command === 'zh') {
        this.language = '简体中文'
-      } else if (command === 'in') {
-        this.language = 'Indonesian'
+      } else if (command === 'vi') {
+        this.language = 'Vietnamese'
      }
    },
    toggleSideBar() {
--- a/nladmin-ui/src/main.js
+++ b/nladmin-ui/src/main.js
@@ -33,7 +33,11 @@ import './router/index' // permission control
 import 'echarts-gl'

 import 'jquery'
-
+// add-xy start
+import { fetchMessages } from '@/api/i18n' // 有一个API模块来获取语言文件
+// 当前语言，可以从本地存储、用户设置或URL参数中获取
+const currentLocale = localStorage.getItem('lang')
+// add-xy end
 // 全局引入LogicFlow
 import LogicFlow from '@logicflow/core'
 import { Menu } from '@logicflow/extension'
@@ -100,3 +104,12 @@ new Vue({
  i18n,
  render: h => h(App)
 })
+
+// add-xy start
+// 国际化开发：3.调用接口异步获取语言文件，增加api文件
+fetchMessages(currentLocale).then(messages => {
+  // 将获取到的消息设置到i18n实例
+  i18n.setLocaleMessage(currentLocale, messages.content)
+  // 设置当前语言
+  i18n.locale = currentLocale
+})
--- a/nladmin-ui/src/router/routers.js
+++ b/nladmin-ui/src/router/routers.js
@@ -42,7 +42,7 @@ export const constantRouterMap = [
        path: 'dashboard',
        component: (resolve) => require(['@/views/system/redis/index'], resolve),
        name: 'Dashboard',
-        meta: { title: i18n.t('menu.home'), icon: 'index', affix: true, noCache: true }
+        meta: { title: i18n.t('common.home'), icon: 'index', affix: true, noCache: true }
        // meta: { title: '首页', icon: 'index', affix: true, noCache: true }
      }
    ]
--- a/nladmin-ui/src/views/login.vue
+++ b/nladmin-ui/src/views/login.vue
@@ -28,14 +28,15 @@
          </el-checkbox>
        </el-col>
        <el-col :span="12">
-          <el-dropdown style="display: flex; justify-content: right; color: #409EFF;" trigger="click" @command="langChange">
+          <el-dropdown style="display: flex; justify-content: right; color: #409EFF;" trigger="click" @command="changeLanguage">
            <span class="el-dropdown-link">
              {{ language }}
            </span>
+            <!-- 国际化开发：1.修改语言列表-->
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item divided command="zh">简体中文</el-dropdown-item>
              <el-dropdown-item divided command="en">English</el-dropdown-item>
-              <el-dropdown-item divided command="in">Indonesian</el-dropdown-item>
+              <el-dropdown-item divided command="vi">Vietnamese</el-dropdown-item>
            </el-dropdown-menu>
          </el-dropdown>
        </el-col>
@@ -63,6 +64,7 @@ import { getCodeImg } from '@/api/login'
 import Cookies from 'js-cookie'
 import Background from '@/assets/images/background.jpg'
 import i18n from '@/i18n'
+import { fetchMessages } from '@/api/i18n'
 export default {
  name: 'Login',
  data() {
@@ -108,19 +110,33 @@ export default {
  },
  methods: {
    // 中英文切换
+    // 语言切换-x
+    async changeLanguage(locale) {
+      // 如果已经加载过该语言，可以直接设置，避免重复请求
+      if (!this.$i18n.getLocaleMessage(locale)) {
+        const messages = await fetchMessages(locale)
+        this.$i18n.setLocaleMessage(locale, messages.content)
+      }
+      this.$i18n.locale = locale
+      // 可以将当前语言保存到本地存储，以便下次使用
+      localStorage.setItem('lang', locale)
+      this.setLang(locale)
+      location.reload()
+    },
    langChange(command) {
      this.$i18n.locale = command
      localStorage.setItem('lang', command)
      this.setLang(command)
      location.reload()
    },
+    // 国际化开发：2.设置
    setLang(command) {
      if (command === 'en') {
        this.language = 'English'
      } else if (command === 'zh') {
        this.language = '简体中文'
-      } else if (command === 'in') {
-        this.language = 'Indonesian'
+      } else if (command === 'vi') {
+        this.language = 'Vietnamese'
      }
    },
    getCode() {
--- a/nladmin-ui/src/views/monitor/server/index.vue
+++ b/nladmin-ui/src/views/monitor/server/index.vue
@@ -4,9 +4,9 @@
      src="/screen/index.html"
      width="100%"
      height="100%"
-      frameborder="0"
-      allowfullscreen
-    ></iframe>
+      frameBorder="0"
+      allowFullScreen
+    />
  </div>
 </template>

@@ -14,6 +14,7 @@
 import ECharts from 'vue-echarts'
 import 'echarts/lib/chart/line'
 import 'echarts/lib/component/polar'
+
 export default {
  name: 'ServerMonitor',
  components: {
@@ -94,12 +95,12 @@ export default {
    }
  },
  created() {
-    /* this.init()
+    this.init()
    this.monitor = window.setInterval(() => {
      setTimeout(() => {
        this.init()
      }, 2)
-    }, 3500)*/
+    }, 3500)
  },
  destroyed() {
    clearInterval(this.monitor)
@@ -126,41 +127,47 @@ export default {
 </script>

 <style rel="stylesheet/scss" lang="scss" scoped>
- ::v-deep .box-card {
-    margin-bottom: 5px;
-    span {
-      margin-right: 28px;
-    }
-    .el-icon-refresh {
-      margin-right: 10px;
-      float: right;
-      cursor:pointer;
-    }
+::v-deep .box-card {
+  margin-bottom: 5px;
+
+  span {
+    margin-right: 28px;
  }
-  .cpu, .memory, .swap, .disk  {
-    width: 20%;
-    float: left;
-    padding-bottom: 20px;
-    margin-right: 5%;
-  }
- .title {
-   text-align: center;
-   font-size: 15px;
-   font-weight: 500;
-   color: #999;
-   margin-bottom: 16px;
- }
- .footer {
-    text-align: center;
-    font-size: 15px;
-    font-weight: 500;
-    color: #999;
-    margin-top: -5px;
-    margin-bottom: 10px;
-  }
-  .content {
-    text-align: center;
-    margin-top: 5px;
-    margin-bottom: 5px;
+
+  .el-icon-refresh {
+    margin-right: 10px;
+    float: right;
+    cursor: pointer;
  }
+}
+
+.cpu, .memory, .swap, .disk {
+  width: 20%;
+  float: left;
+  padding-bottom: 20px;
+  margin-right: 5%;
+}
+
+.title {
+  text-align: center;
+  font-size: 15px;
+  font-weight: 500;
+  color: #999;
+  margin-bottom: 16px;
+}
+
+.footer {
+  text-align: center;
+  font-size: 15px;
+  font-weight: 500;
+  color: #999;
+  margin-top: -5px;
+  margin-bottom: 10px;
+}
+
+.content {
+  text-align: center;
+  margin-top: 5px;
+  margin-bottom: 5px;
+}
 </style>
--- a/nladmin-ui/src/views/system/redis/index.vue
+++ b/nladmin-ui/src/views/system/redis/index.vue
@@ -1,267 +1,173 @@
 <template>
-  <div class="app-container">
-    <el-row>
-      <el-col :span="24" class="card-box">
-        <el-card>
-          <div slot="header">
-            <span>{{ $t('Redis.title1') }}</span>
-          </div>
-          <div class="el-table el-table--enable-row-hover el-table--medium">
-            <table cellspacing="0" style="width: 100%">
-              <tbody>
-                <tr>
-                  <td><div class="cell">{{ $t('Redis.redis_version') }}:</div></td>
-                  <td><div v-if="cache.info" class="cell">{{ cache.info.redis_version }}</div></td>
-                  <td><div class="cell">{{ $t('Redis.redis_mode') }}:</div></td>
-                  <td><div v-if="cache.info" class="cell">{{ cache.info.redis_mode == "standalone" ? $t('Redis.standalone') : $t('Redis.cluster') }}</div></td>
-                  <td><div class="cell">{{ $t('Redis.tcp_port') }}:</div></td>
-                  <td><div v-if="cache.info" class="cell">{{ cache.info.tcp_port }}</div></td>
-                  <td><div class="cell">{{ $t('Redis.connected_clients') }}:</div></td>
-                  <td><div v-if="cache.info" class="cell">{{ cache.info.connected_clients }}</div></td>
-                </tr>
-                <tr>
-                  <td><div class="cell">{{ $t('Redis.running') }}:</div></td>
-                  <td><div v-if="cache.info" class="cell">{{ cache.info.uptime_in_days }}</div></td>
-                  <td><div class="cell">{{ $t('Redis.memory_use') }}:</div></td>
-                  <td><div v-if="cache.info" class="cell">{{ cache.info.used_memory_human }}</div></td>
-                  <td><div class="cell">{{ $t('Redis.cpu') }}:</div></td>
-                  <td><div v-if="cache.info" class="cell">{{ parseFloat(cache.info.used_cpu_user_children).toFixed(2) }}</div></td>
-                  <td><div class="cell">{{ $t('Redis.memory') }}:</div></td>
-                  <td><div v-if="cache.info" class="cell">{{ cache.info.maxmemory_human }}</div></td>
-                </tr>
-                <tr>
-                  <td><div class="cell">{{ $t('Redis.AOF') }}:</div></td>
-                  <td><div v-if="cache.info" class="cell">{{ cache.info.aof_enabled === "0" ? $t('common.No') : $t('common.Yes') }}</div></td>
-                  <td><div class="cell">{{ $t('Redis.RDB') }}:</div></td>
-                  <td><div v-if="cache.info" class="cell">{{ cache.info.rdb_last_bgsave_status }}</div></td>
-                  <td><div class="cell">{{ $t('Redis.keys') }}:</div></td>
-                  <td><div v-if="cache.dbSize" class="cell">{{ cache.dbSize }} </div></td>
-                  <td><div class="cell">{{ $t('Redis.io') }}:</div></td>
-                  <td><div v-if="cache.info" class="cell">{{ cache.info.instantaneous_input_kbps }}kps/{{ cache.info.instantaneous_output_kbps }}kps</div></td>
-                </tr>
-              </tbody>
-            </table>
-          </div>
-        </el-card>
-      </el-col>
-
-      <el-col :span="12" class="card-box">
-        <el-card>
-          <div slot="header"><span>{{ $t('Redis.left_title') }}</span></div>
-          <div class="el-table el-table--enable-row-hover el-table--medium">
-            <div ref="commandstats" style="height: 420px" />
-          </div>
-        </el-card>
-      </el-col>
-
-      <el-col :span="12" class="card-box">
-        <el-card>
-          <div slot="header">
-            <span>{{ $t('Redis.right_title') }}</span>
-          </div>
-          <div class="el-table el-table--enable-row-hover el-table--medium">
-            <div ref="usedmemory" style="height: 420px" />
-          </div>
-        </el-card>
-      </el-col>
-
-      <el-col :span="24" class="card-box">
-        <el-card>
-          <el-button size="mini" :disabled="delBtlStatu" type="danger" style="margin-bottom: 10px" @click="batchDel">
-            {{ $t('Redis.batch_del') }}</el-button>
-          <el-table
-            :data="keyAndValues"
-            row-key="id"
-            :header-cell-style="{'text-align':'center'}"
-            @selection-change="handleSelectionChange"
-          >
-            <el-table-column type="selection" width="55" align="center" />
-            <el-table-column prop="key" label="Key" width="200" :show-overflow-tooltip="true" />
-            <el-table-column prop="dataType" :label="$t('Redis.key_type')" width="100" />
-            <el-table-column prop="value" :label="$t('Redis.value2')" :show-overflow-tooltip="true" />
-            <el-table-column prop="expire" :label="$t('Redis.expiration')" width="200">
-              <template slot-scope="scope">
-                <el-tag>
-                  <span v-if="scope.row.expire === -1">
-                    {{ $t('Redis.no_expired') }}
-                  </span>
-                  <span v-else-if="scope.row.expire === -2">
-                    {{ $t('Redis.expired') }}
-                  </span>
-                  <span v-else>
-                    {{ scope.row.expire }}{{ $t('Redis.unit') }}
-                  </span>
-                </el-tag>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('common.Operate')" width="150px" align="center">
-              <template slot-scope="scope">
-                <el-button type="danger" size="mini" @click="clearRedisData(scope.row)">{{ $t('Redis.clear') }}</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-card>
-      </el-col>
-    </el-row>
+  <div style="height:1000px">
+    <iframe
+      src="/screen/index.html"
+      width="100%"
+      height="100%"
+      frameBorder="0"
+      allowFullScreen
+    />
  </div>
 </template>

 <script>
-import { getCache, getKeyDefineList, getKeyValueList, batch } from '@/views/system/redis/redis'
-import echarts from 'echarts'
-import i18n from '@/i18n'
+import ECharts from 'vue-echarts'
+import 'echarts/lib/chart/line'
+import 'echarts/lib/component/polar'
+
 export default {
-  name: 'Redis',
+  name: 'ServerMonitor',
+  components: {
+    'v-chart': ECharts
+  },
  data() {
    return {
-      // 统计命令信息
-      commandstats: null,
-      // 使用内存
-      usedmemory: null,
-      // cache 信息
-      cache: [],
-      // key 列表
-      keyDefineListLoad: true,
-      keyDefineList: [],
-      // 模块弹出框
-      open: false,
-      keyTemplate: '',
-      cacheKeys: [],
-      cacheForm: {},
-      keyAndValues: [],
-      multipleSelection: [], // 多选数据
-      delBtlStatu: true
+      show: false,
+      monitor: null,
+      url: 'api/monitor',
+      data: {},
+      cpuInfo: {
+        tooltip: {
+          trigger: 'axis'
+        },
+        xAxis: {
+          type: 'category',
+          boundaryGap: false,
+          data: []
+        },
+        yAxis: {
+          type: 'value',
+          min: 0,
+          max: 100,
+          interval: 20
+        },
+        series: [{
+          data: [],
+          type: 'line',
+          areaStyle: {
+            normal: {
+              color: 'rgb(32, 160, 255)' // 改变区域颜色
+            }
+          },
+          itemStyle: {
+            normal: {
+              color: '#6fbae1',
+              lineStyle: {
+                color: '#6fbae1' // 改变折线颜色
+              }
+            }
+          }
+        }]
+      },
+      memoryInfo: {
+        tooltip: {
+          trigger: 'axis'
+        },
+        xAxis: {
+          type: 'category',
+          boundaryGap: false,
+          data: []
+        },
+        yAxis: {
+          type: 'value',
+          min: 0,
+          max: 100,
+          interval: 20
+        },
+        series: [{
+          data: [],
+          type: 'line',
+          areaStyle: {
+            normal: {
+              color: 'rgb(32, 160, 255)' // 改变区域颜色
+            }
+          },
+          itemStyle: {
+            normal: {
+              color: '#6fbae1',
+              lineStyle: {
+                color: '#6fbae1' // 改变折线颜色
+              }
+            }
+          }
+        }]
+      }
    }
  },
  created() {
-    this.getList()
+    this.init()
+    this.monitor = window.setInterval(() => {
+      setTimeout(() => {
+        this.init()
+      }, 2)
+    }, 3500)
+  },
+  destroyed() {
+    clearInterval(this.monitor)
  },
  methods: {
-    // 获取redis的信息
-    getList() {
-      getCache().then(res => {
-        // console.log(res)
-        this.cache = res.info
-        // this.$model.closeLoading()
-        this.commandstats = echarts.init(this.$refs.commandstats, 'macarons')
-        const commandStats = [] // 指令状态数据
-        res.info.commandStats.forEach(row => {
-          commandStats.push({
-            name: row.command,
-            value: row.calls
-          })
-        })
-        this.commandstats.setOption({
-          tooltip: {
-            trigger: 'item',
-            formatter: '{a} <br/>{b} : {c} ({d}%)'
-          },
-          series: [
-            {
-              name: i18n.t('Redis.command'),
-              type: 'pie',
-              roseType: 'radius',
-              radius: [15, 95],
-              center: ['50%', '38%'],
-              data: commandStats,
-              animationEasing: 'cubicInOut',
-              animationDuration: 1000
-            }
-          ]
-        })
-        // 使用内存信息
-        this.usedmemory = echarts.init(this.$refs.usedmemory, 'macarons')
-        this.usedmemory.setOption({
-          tooltip: {
-            formatter: '{b} <br/>{a} : ' + this.cache.info.used_memory_human
-          },
-          series: [
-            {
-              name: i18n.t('Redis.pake'),
-              type: 'gauge',
-              min: 0,
-              max: 1000,
-              detail: {
-                formatter: this.cache.info.used_memory_human
-              },
-              data: [
-                {
-                  value: parseFloat(this.cache.info.used_memory_human),
-                  name: i18n.t('Redis.memory_consumption')
-                }
-              ]
-            }
-          ]
-        })
-      })
-      // 查询 Redis Key 模板列表
-      getKeyDefineList().then(res => {
-        this.keyDefineList = res.info
-        this.keyDefineListLoad = false
-      })
-      getKeyValueList().then(res => {
-        console.log('keyAndValue', res)
-        this.keyAndValues = res
-      })
-    },
-    clearRedisData(row) {
-      this.$confirm(i18n.t('Redis.msg1'), i18n.t('common.Tips'), {
-        confirmButtonText: i18n.t('common.Confirm'),
-        cancelButtonText: i18n.t('common.Cancel'),
-        type: 'warning'
-      }).then(() => {
-        const ids = []
-        ids.push(row.key)
-        batch(ids).then(res => {
-          this.$message({
-            type: 'success',
-            message: i18n.t('common.Operation_success')
-          })
-          location.reload()
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: i18n.t('Redis.msg2')
-        })
-      })
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-      this.delBtlStatu = val.length == 0
-    },
-    batchDel() {
-      this.$confirm(i18n.t('common.Tip1', { count: this.multipleSelection.length }), i18n.t('common.Tips'), {
-        confirmButtonText: i18n.t('common.Confirm'),
-        cancelButtonText: i18n.t('common.Cancel'),
-        type: 'warning'
-      }).then(() => {
-        const ids = []
-        for (const i in this.multipleSelection) {
-          ids.push(this.multipleSelection[i].key)
-        }
-        batch(ids).then(res => {
-          this.$message({
-            type: 'success',
-            message: i18n.t('common.Operation_success')
-          })
-          location.reload()
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: i18n.t('Redis.msg2')
-        })
-      })
-    }
+    // init() {
+    //   initData(this.url, {}).then(data => {
+    //     this.data = data
+    //     this.show = true
+    //     if (this.cpuInfo.xAxis.data.length >= 8) {
+    //       this.cpuInfo.xAxis.data.shift()
+    //       this.memoryInfo.xAxis.data.shift()
+    //       this.cpuInfo.series[0].data.shift()
+    //       this.memoryInfo.series[0].data.shift()
+    //     }
+    //     this.cpuInfo.xAxis.data.push(data.time)
+    //     this.memoryInfo.xAxis.data.push(data.time)
+    //     this.cpuInfo.series[0].data.push(parseFloat(data.cpu.used))
+    //     this.memoryInfo.series[0].data.push(parseFloat(data.memory.usageRate))
+    //   })
+    // }
  }
 }
 </script>

-<style scoped lang="scss">
-.card-box {
-  padding-right: 15px;
-  padding-left: 15px;
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .box-card {
+  margin-bottom: 5px;
+
+  span {
+    margin-right: 28px;
+  }
+
+  .el-icon-refresh {
+    margin-right: 10px;
+    float: right;
+    cursor: pointer;
+  }
+}
+
+.cpu, .memory, .swap, .disk {
+  width: 20%;
+  float: left;
+  padding-bottom: 20px;
+  margin-right: 5%;
+}
+
+.title {
+  text-align: center;
+  font-size: 15px;
+  font-weight: 500;
+  color: #999;
+  margin-bottom: 16px;
+}
+
+.footer {
+  text-align: center;
+  font-size: 15px;
+  font-weight: 500;
+  color: #999;
+  margin-top: -5px;
  margin-bottom: 10px;
 }
+
+.content {
+  text-align: center;
+  margin-top: 5px;
+  margin-bottom: 5px;
+}
 </style>
--- a/nladmin-ui/src/views/wms/basedata/material/MaterialDialog.vue
+++ b/nladmin-ui/src/views/wms/basedata/material/MaterialDialog.vue
@@ -1,6 +1,6 @@
 <template>
  <el-dialog
-    title="物料选择"
+    :title="$t('common.Please_select')"
    append-to-body
    :visible.sync="dialogVisible"
    destroy-on-close
@@ -15,12 +15,12 @@
      label-width="80px"
      label-suffix=":"
    >
-      <el-form-item label="物料名称">
+      <el-form-item :label="$t('md_me_materialbase.material_name')">
        <el-input
          v-model="query.search"
          clearable
          size="mini"
-          placeholder="物料名称"
+          :placeholder="$t('md_me_materialbase.material_name')"
          @keyup.enter.native="crud.toQuery"
        />
      </el-form-item>
@@ -42,25 +42,25 @@
      @current-change="clickChange"
    >
      <el-table-column v-if="!isSingle" type="selection" width="55" />
-      <el-table-column v-if="isSingle" label="选择" width="55">
+      <el-table-column v-if="isSingle" :label="$t('common.Please_select')" width="55">
        <template slot-scope="scope">
          <el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
        </template>
      </el-table-column>
-      <el-table-column prop="material_code" label="物料编码" width="140" />
-      <el-table-column prop="material_name" label="物料名称" width="170" show-overflow-tooltip />
-      <el-table-column prop="material_spec" label="物料规格" width="170" show-overflow-tooltip/>
-      <el-table-column prop="class_name" label="物料分类" width="140" />
-      <el-table-column prop="unit_name" label="计量单位" />
-      <el-table-column prop="product_series_name" label="系列" />
-      <el-table-column prop="update_optname" label="修改人" />
-      <el-table-column prop="update_time" label="修改时间" width="135" />
+      <el-table-column prop="material_code" :label="$t('md_me_materialbase.material_code')" width="140" />
+      <el-table-column prop="material_name" :label="$t('md_me_materialbase.material_name')" width="170" show-overflow-tooltip />
+      <el-table-column prop="material_spec" :label="$t('md_me_materialbase.material_spec')" width="170" show-overflow-tooltip />
+      <el-table-column prop="class_name" :label="$t('md_pb_classstandard.class_name')" width="140" />
+      <el-table-column prop="unit_name" :label="$t('md_pb_measureunit.unit_name')" />
+      <el-table-column prop="product_series_name" :label="$t('md_me_materialbase.product_series_name')" />
+      <el-table-column prop="update_optname" :label="$t('common.update_optname')" />
+      <el-table-column prop="update_time" :label="$t('common.update_time')" width="135" />
    </el-table>
    <!--分页组件-->
    <pagination />
    <span slot="footer" class="dialog-footer">
-      <el-button @click="dialogVisible = false">取 消</el-button>
-      <el-button type="primary" @click="submit">确 定</el-button>
+      <el-button @click="dialogVisible = false">{{ $t('common.Cancel') }}</el-button>
+      <el-button type="primary" @click="submit">{{ $t('common.Confirm') }}</el-button>
    </span>
  </el-dialog>
 </template>
@@ -71,13 +71,14 @@ import CRUD, { header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import pagination from '@crud/Pagination'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import i18n from '@/i18n'

 export default {
  name: 'MaterialDialog',
  components: { rrOperation, pagination },
  dicts: ['is_used'],
  cruds() {
-    return CRUD({ title: '物料选择', url: 'api/Materia', optShow: {}})
+    return CRUD({ title: i18n.t('common.Please_select'), url: 'api/Materia', optShow: {}})
  },
  mixins: [presenter(), header()],
  props: {
@@ -135,7 +136,7 @@ export default {
      }
      this.rows = this.$refs.table.selection
      if (this.rows.length <= 0) {
-        this.$message('请先勾选物料')
+        this.$message(i18n.t('common.Please_select'))
        return
      }
      this.crud.resetQuery(false)
--- a/nladmin-ui/src/views/wms/basedata/material/UploadDialog.vue
+++ b/nladmin-ui/src/views/wms/basedata/material/UploadDialog.vue
@@ -1,6 +1,6 @@
 <template>
  <el-dialog
-    title="导入Excel文件"
+    :title="$t('common.import')"
    append-to-body
    :visible.sync="dialogVisible"
    destroy-on-close
@@ -25,14 +25,14 @@
    >
      <i class="el-icon-upload" />
      <div class="el-upload__text">
-        将文件拖到此处，或
-        <em>点击上传</em>
+        {{ $t('upload.load_text1') }}
+        <em>{{ $t('upload.load_text2') }}</em>
      </div>
-      <div slot="tip" class="el-upload__tip">只能上传Excel文件，且不超过10MB</div>
+      <div slot="tip" class="el-upload__tip">{{ $t('upload.load_text3') }}</div>
    </el-upload>
    <span slot="footer" class="dialog-footer">
-      <el-button @click="dialogVisible = false">取 消</el-button>
-      <el-button type="primary" @click="submit">确 定</el-button>
+      <el-button @click="dialogVisible = false">{{ $t('common.Cancel') }}</el-button>
+      <el-button type="primary" @click="submit">{{ $t('common.Confirm') }}</el-button>
    </span>
  </el-dialog>
 </template>
@@ -42,6 +42,7 @@ import crudMaterial from './material'
 import CRUD, { crud } from '@crud/crud'
 import { download2 } from '@/api/data'
 import { downloadFile } from '@/utils'
+import i18n from '@/i18n'

 export default {
  name: 'UploadDialog',
@@ -82,7 +83,7 @@ export default {
      this.$emit('update:dialogShow', false)
    },
    is_one() {
-      this.crud.notify('只能上传一个excel文件！', CRUD.NOTIFICATION_TYPE.WARNING)
+      this.crud.notify(i18n.t('upload.load_text5'), CRUD.NOTIFICATION_TYPE.WARNING)
    },
    // 文件校验方法
    beforeAvatarUpload(file) {
@@ -104,19 +105,18 @@ export default {
        formdata.append('file', this.file1.raw)
        // excelImport：请求接口 formdata：传递参数
        crudMaterial.excelImport(formdata).then((res) => {
-          this.crud.notify('导入成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+          this.crud.notify(i18n.t('common.Success'), CRUD.NOTIFICATION_TYPE.SUCCESS)
          this.$emit('tableChanged3', '')
          this.$emit('update:dialogShow', false)
        }).catch(err => {
-
          const list = err.response.data.message
          download2('/api/produceWorkorder/download', list).then(result => {
-            downloadFile(result, '错误信息汇总', 'xlsx')
+            downloadFile(result, i18n.t('gateway.check_error_log'), 'xlsx')
            crud.downloadLoading = false
          })
        })
      } else {
-        this.crud.notify('文件过大，请上传小于10MB的文件〜', CRUD.NOTIFICATION_TYPE.WARNING)
+        this.crud.notify(i18n.t('upload.load_text4'), CRUD.NOTIFICATION_TYPE.WARNING)
      }
    }
  }
--- a/nladmin-ui/src/views/wms/basedata/material/index.vue
+++ b/nladmin-ui/src/views/wms/basedata/material/index.vue
@@ -4,13 +4,13 @@
    <div class="head-container">
      <el-row>
        <el-col :span="8">
-          模糊查询：
+          {{ $t('common.Query') }}:
          <el-input
            v-model="query.search"
            clearable
            style="width: 200px"
            size="mini"
-            placeholder="输入物料编码或名称"
+            :placeholder="$t('common.inputCodeOrName')"
            prefix-icon="el-icon-search"
            class="filter-item"
          />
@@ -29,7 +29,7 @@
          size="mini"
          @click="uploadShow = true"
        >
-          导入
+          {{ $t('common.import') }}
        </el-button>
      </crudOperation>
      <!--表单组件-->
@@ -43,65 +43,63 @@
        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="110px">
          <el-row>
            <el-col :span="8">
-              <el-form-item label="物料编码" prop="material_code" >
+              <el-form-item :label="$t('md_me_materialbase.material_code')" prop="material_code">
                <el-input v-model="form.material_code" style="width: 200px;" :disabled="crud.status.edit > 0" />
              </el-form-item>
            </el-col>
            <el-col :span="8">
-              <el-form-item label="物料名称" prop="material_name">
+              <el-form-item :label="$t('md_me_materialbase.material_name')" prop="material_name">
                <el-input v-model="form.material_name" style="width: 200px;" />
              </el-form-item>
            </el-col>
            <el-col :span="8">

-              <el-form-item label="物料规格" prop="material_spec">
-                <label slot="label">物料规格</label>
+              <el-form-item :label="$t('md_me_materialbase.material_spec')" prop="material_spec">
                <el-input v-model="form.material_spec" style="width: 200px;" />
              </el-form-item>
            </el-col>
          </el-row>
          <el-row>
            <el-col :span="8">
-              <el-form-item label="物料型号" prop="material_model">
-                <label slot="label">物料型号</label>
+              <el-form-item :label="$t('md_me_materialbase.material_model')" prop="material_model">
                <el-input v-model="form.material_model" style="width: 200px;" />
              </el-form-item>
            </el-col>
            <el-col :span="8">

-              <el-form-item label="物料分类" prop="material_type_id">
+              <el-form-item :label="$t('md_me_materialbase.material_model')" prop="material_type_id">
                <treeselect
                  v-model="form.material_type_id"
                  :load-options="loadClass"
                  :options="classes"
                  style="width: 200px;"
-                  placeholder="请选择"
+                  :placeholder="$t('common.Please_select')"
                />
              </el-form-item>
            </el-col>
            <el-col :span="8">
-              <el-form-item label="外部标识" prop="ext_id">
+              <el-form-item :label="$t('common.ext_id')" prop="ext_id">
                <el-input v-model="form.ext_id" style="width: 200px;" />
              </el-form-item>
            </el-col>
          </el-row>
          <el-row>
            <el-col :span="8">
-              <el-form-item label="是否启用" prop="is_used">
-                <el-radio v-model="form.is_used" label="0">否</el-radio>
-                <el-radio v-model="form.is_used" label="1" >是</el-radio>
+              <el-form-item :label="$t('common.is_used')" prop="is_used">
+                <el-radio v-model="form.is_used" label="0">{{ $t('common.No') }}</el-radio>
+                <el-radio v-model="form.is_used" label="1">{{ $t('common.Yes') }}</el-radio>
              </el-form-item>
            </el-col>
            <el-col :span="8">
-              <el-form-item label="备注" prop="remark">
-                <el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea"  />
+              <el-form-item :label="$t('common.remark')" prop="remark">
+                <el-input v-model="form.remark" style="width: 380px;" rows="2" 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>
      <!--表格渲染-->
@@ -113,12 +111,12 @@
        style="width: 100%;"
        @selection-change="crud.selectionChangeHandler"
      >
-        <el-table-column prop="material_code" label="物料编码" width="160" />
-        <el-table-column prop="material_name" label="物料名称" width="180" show-overflow-tooltip />
-        <el-table-column prop="material_spec" label="物料规格" width="140" />
-        <el-table-column prop="material_model" label="物料型号" />
-        <el-table-column prop="class_name" label="物料分类" width="140" :formatter="bill_typeFormat" />
-        <el-table-column label="启用" align="center" prop="is_used">
+        <el-table-column prop="material_code" :label="$t('md_me_materialbase.material_code')" width="160" />
+        <el-table-column prop="material_name" :label="$t('md_me_materialbase.material_name')" width="180" show-overflow-tooltip />
+        <el-table-column prop="material_spec" :label="$t('md_me_materialbase.material_spec')" width="140" />
+        <el-table-column prop="material_model" :label="$t('md_me_materialbase.material_model')" />
+        <el-table-column prop="class_name" :label="$t('md_pb_classstandard.class_name')" width="140" :formatter="bill_typeFormat" />
+        <el-table-column :label="$t('common.is_used')" align="center" prop="is_used">
          <template slot-scope="scope">
            <el-switch
              v-model="scope.row.is_used"
@@ -130,9 +128,9 @@
            />
          </template>
        </el-table-column>
-        <el-table-column prop="remark" label="备注" width="140" />
-        <el-table-column prop="update_optname" label="修改人" />
-        <el-table-column prop="update_time" label="修改时间" width="135" />
+        <el-table-column prop="remark" :label="$t('common.remark')" width="140" />
+        <el-table-column prop="update_optname" :label="$t('common.update_optname')" />
+        <el-table-column prop="update_time" :label="$t('common.update_time')" width="135" />
        <el-table-column
          v-permission="['admin','Materialbase:edit','Materialbase:del']"
          fixed="right"
@@ -151,7 +149,7 @@
      <!--分页组件-->
      <pagination />
    </div>
-    <UploadDialog :dialog-show.sync="uploadShow"/>
+    <UploadDialog :dialog-show.sync="uploadShow" />
  </div>
 </template>

@@ -167,6 +165,7 @@ import crudClassstandard from '@/views/wms/basedata/class/classstandard'
 import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import crudMaterialbase from '@/views/wms/basedata/material/material'
+import i18n from '@/i18n'

 const defaultForm = {
  material_id: null,
--- a/nladmin-ui/src/views/wms/basedata/storagevehicleinfo/index.vue
+++ b/nladmin-ui/src/views/wms/basedata/storagevehicleinfo/index.vue
@@ -11,12 +11,12 @@
          label-width="80px"
          label-suffix=":"
        >
-          <el-form-item label="载具类型">
+          <el-form-item :label="$t('md_pb_storagevehicleinfo.storagevehicle_type')">
            <el-select
              v-model="query.vehicle_type"
              clearable
              size="mini"
-              placeholder="请选择"
+              :placeholder="$t('common.Please_select')"
              class="filter-item"
              style="width: 180px;"
              @change="hand"
@@ -29,18 +29,17 @@
            </el-select>
          </el-form-item>

-          <el-form-item label="载具号">
+          <el-form-item :label="$t('md_pb_storagevehicleinfo.storagevehicle_code')">
            <el-input
              v-model="query.vehicle_code"
              clearable
              size="mini"
-              placeholder="载具号"
              style="width: 110px;"
              class="filter-item"
              @keyup.enter.native="crud.toQuery"
            />
          </el-form-item>
-          <rrOperation/>
+          <rrOperation />
        </el-form>

      </div>
@@ -67,30 +66,34 @@
      >
        <el-form ref="form" :model="materialForm" :rules="rules" size="mini" label-width="110px">
          <el-form-item label="载具编码" prop="vehicle_code">
-            <el-input v-model="materialForm.vehicle_code" disabled style="width: 370px;"/>
+            <el-input v-model="materialForm.vehicle_code" disabled style="width: 370px;" />
          </el-form-item>
          <el-form-item label="物料编码" prop="material_code">
            <template slot-scope="scope">
-              <el-input v-model="materialForm.material_code" clearable style="width: 370px"
-                        @clear="materialForm.material_id='',materialForm.material_code='',materialForm.material_name='',materialForm.material_spec=''">
-                <el-button slot="append" icon="el-icon-plus" @click="queryMater"/>
+              <el-input
+                v-model="materialForm.material_code"
+                clearable
+                style="width: 370px"
+                @clear="materialForm.material_id='',materialForm.material_code='',materialForm.material_name='',materialForm.material_spec=''"
+              >
+                <el-button slot="append" icon="el-icon-plus" @click="queryMater" />
              </el-input>
            </template>
          </el-form-item>
          <el-form-item label="物料规格" prop="material_spec">
-            <el-input v-model="materialForm.material_spec" disabled style="width: 370px;"/>
+            <el-input v-model="materialForm.material_spec" disabled style="width: 370px;" />
          </el-form-item>
          <el-form-item label="批    次" prop="pcsn">
-            <el-input v-model="materialForm.pcsn" clearable style="width: 370px;"/>
+            <el-input v-model="materialForm.pcsn" clearable style="width: 370px;" />
          </el-form-item>
          <el-form-item label="物料数量" prop="qty">
-            <el-input v-model="materialForm.qty" clearable style="width: 370px;"/>
+            <el-input v-model="materialForm.qty" clearable style="width: 370px;" />
          </el-form-item>
          <el-form-item label="冻结数量" prop="frozen_qty">
-            <el-input v-model="materialForm.frozen_qty" clearable style="width: 370px;"/>
+            <el-input v-model="materialForm.frozen_qty" clearable style="width: 370px;" />
          </el-form-item>
          <el-form-item label="流程实例" prop="proc_inst_id">
-            <el-input v-model="materialForm.proc_inst_id" clearable style="width: 370px;"/>
+            <el-input v-model="materialForm.proc_inst_id" clearable style="width: 370px;" />
          </el-form-item>
        </el-form>
        <div slot="footer" class="dialog-footer">
@@ -108,11 +111,11 @@
        <el-form ref="form" :model="updateForm" :rules="rules" size="mini" label-width="110px">
          <el-form-item label="载具编号" prop="vehicle_code">
            <template slot-scope="scope">
-              <el-input v-model="updateForm.vehicle_code" clearable/>
+              <el-input v-model="updateForm.vehicle_code" clearable />
            </template>
          </el-form-item>
          <el-form-item label="载具重量(g)" prop="vehicle_weight">
-            <el-input-number v-model="updateForm.vehicle_weight" clearable style="width: 370px;"/>
+            <el-input-number v-model="updateForm.vehicle_weight" clearable style="width: 370px;" />
          </el-form-item>
        </el-form>
        <div slot="footer" class="dialog-footer">
@@ -129,22 +132,22 @@
      >
        <el-form ref="form" :model="printForm" size="mini" label-width="150px">
          <el-form-item label="纸张高度(mm)" prop="pageh">
-            <el-input v-model="printForm.pageh" :precision="0" style="width: 150px;"/>
+            <el-input v-model="printForm.pageh" :precision="0" style="width: 150px;" />
          </el-form-item>
          <el-form-item label="纸张宽度(mm)" prop="pagew">
-            <el-input v-model="printForm.pagew" :precision="0" style="width: 150px;"/>
+            <el-input v-model="printForm.pagew" :precision="0" style="width: 150px;" />
          </el-form-item>
          <el-form-item label="页边距top(mm)" prop="pagetop">
-            <el-input v-model="printForm.pagetop" :precision="0" style="width: 150px;"/>
+            <el-input v-model="printForm.pagetop" :precision="0" style="width: 150px;" />
          </el-form-item>
          <el-form-item label="页边距right(mm)" prop="pageright">
-            <el-input v-model="printForm.pageright" :precision="0" style="width: 150px;"/>
+            <el-input v-model="printForm.pageright" :precision="0" style="width: 150px;" />
          </el-form-item>
          <el-form-item label="页边距down(mm)" prop="pagedown">
-            <el-input v-model="printForm.pagedown" :precision="0" style="width: 150px;"/>
+            <el-input v-model="printForm.pagedown" :precision="0" style="width: 150px;" />
          </el-form-item>
          <el-form-item label="页边距left(mm)" prop="pageleft">
-            <el-input v-model="printForm.pageleft" :precision="0" style="width: 150px;"/>
+            <el-input v-model="printForm.pageleft" :precision="0" style="width: 150px;" />
          </el-form-item>
          <br>
        </el-form>
@@ -180,22 +183,22 @@
          </el-form-item>
          <br>
          <el-form-item label="起始载具号" prop="vehicle_code">
-            <el-input v-model="form.vehicle_code" :disabled="true" style="width: 250px;"/>
+            <el-input v-model="form.vehicle_code" :disabled="true" style="width: 250px;" />
          </el-form-item>
          <el-form-item label="载具数量" prop="num">
-            <el-input-number v-model="form.num" :precision="0" style="width: 150px;"/>
+            <el-input-number v-model="form.num" :precision="0" style="width: 150px;" />
          </el-form-item>
          <el-form-item label="高度(mm)" prop="h">
-            <el-input-number v-model="form.h" :precision="0" style="width: 150px;"/>
+            <el-input-number v-model="form.h" :precision="0" style="width: 150px;" />
          </el-form-item>
          <el-form-item label="宽度(mm)" prop="w">
-            <el-input-number v-model="form.w" :precision="0" style="width: 150px;"/>
+            <el-input-number v-model="form.w" :precision="0" style="width: 150px;" />
          </el-form-item>
          <el-form-item label="深度(mm)" prop="l">
-            <el-input-number v-model="form.l" :precision="0" style="width: 150px;"/>
+            <el-input-number v-model="form.l" :precision="0" style="width: 150px;" />
          </el-form-item>
          <el-form-item label="重量(g)" prop="weight">
-            <el-input-number v-model="form.weight" :precision="0" style="width: 150px;"/>
+            <el-input-number v-model="form.weight" :precision="0" style="width: 150px;" />
          </el-form-item>
          <el-form-item label="是否启用">
            <el-radio v-model="form.is_used" label="0">否</el-radio>
@@ -236,8 +239,8 @@
            />
          </template>
        </el-table-column>
-        <el-table-column prop="create_name" label="创建人"/>
-        <el-table-column prop="create_time" label="创建时间" width="150px"/>
+        <el-table-column prop="create_name" label="创建人" />
+        <el-table-column prop="create_time" label="创建时间" width="150px" />
        <el-table-column
          v-permission="['admin','storagevehicleinfo:edit','storagevehicleinfo:del']"
          label="操作"
@@ -254,7 +257,7 @@
        </el-table-column>
      </el-table>
      <!--      分页组件-->
-      <pagination/>
+      <pagination />
    </div>
    <MaterDtl
      :dialog-show.sync="materialShow"
@@ -275,7 +278,6 @@ import pagination from '@crud/Pagination'
 import { getLodop } from '@/assets/js/lodop/LodopFuncs'
 import MaterDtl from '@/views/wms/basedata/material/MaterialDialog'

-
 const defaultForm = {
  vehicle_code: null,
  vehicle_name: null,
@@ -298,7 +300,7 @@ const defaultForm = {
 }
 export default {
  name: 'Storagevehicleinfo',
-  dicts: ['storagevehicle_type', "VEHICLE_OVER_TYPE"],
+  dicts: ['storagevehicle_type', 'VEHICLE_OVER_TYPE'],
  components: { pagination, crudOperation, rrOperation, udOperation, MaterDtl },
  mixins: [presenter(), header(), form(defaultForm), crud()],
  cruds() {
@@ -347,23 +349,23 @@ export default {
      permission: {},
      rules: {
        vehicle_code: [
-          {required: true, message: '不能为空', trigger: 'blur'}
+          { required: true, message: '不能为空', trigger: 'blur' }
        ],
        is_delete: [
-          {required: true, message: '不能为空', trigger: 'blur'}
+          { required: true, message: '不能为空', trigger: 'blur' }
        ],
        is_used: [
-          {required: true, message: '不能为空', trigger: 'blur'}
+          { required: true, message: '不能为空', trigger: 'blur' }
        ],
        vehicle_type: [
-          {required: true, message: '不能为空', trigger: 'blur'}
+          { required: true, message: '不能为空', trigger: 'blur' }
        ],
        overstruct_type: [
-          {required: true, message: '不能为空', trigger: 'blur'}
+          { required: true, message: '不能为空', trigger: 'blur' }
        ],
        num: [
-          {required: true, message: '不能为空', trigger: 'blur'},
-          {validator: numberOne}
+          { required: true, message: '不能为空', trigger: 'blur' },
+          { validator: numberOne }
        ]
      }
    }
				`@@ -0,0 +1 @@`
				<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"><title>欧伦可视化看板</title><link href=./static/css/app.7eb34c7823b484f76dbdbf24cd625cff.css rel=stylesheet></head><body class=clearfix><div id=app></div><script type=text/javascript src=./static/js/manifest.7b7124d31a251fc046ff.js></script><script type=text/javascript src=./static/js/app.12b9502b60b1dab9d8a5.js></script></body></html>