From ffcb8b0b52a51bd3e16cd2b0135399392164c3d4 Mon Sep 17 00:00:00 2001
From: zhang <2012681011@qq.com>
Date: Wed, 25 Dec 2024 16:21:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../language/master/master_en_US.properties   |   7 ++
 .../language/master/master_in_ID.properties   |   7 ++
 .../language/master/master_zh_CN.properties   |   7 ++
 .../src/components/Crud/CRUD.operation.vue    |   2 +-
 .../src/components/Crud/UD.operation.vue      |   3 +-
 lms/nladmin-ui/src/components/Crud/crud.js    |  11 +-
 lms/nladmin-ui/src/i18n/langs/en.js           |   3 +-
 lms/nladmin-ui/src/i18n/langs/in.js           |   7 +-
 lms/nladmin-ui/src/i18n/langs/indonesian.js   | 104 +++++++++---------
 lms/nladmin-ui/src/i18n/langs/zh-CN.js        |   3 +-
 lms/nladmin-ui/src/mixins/crud.js             |  17 +--
 11 files changed, 101 insertions(+), 70 deletions(-)

diff --git a/lms/nladmin-system/src/main/resources/language/master/master_en_US.properties b/lms/nladmin-system/src/main/resources/language/master/master_en_US.properties
index 67f3b85..7d07394 100644
--- a/lms/nladmin-system/src/main/resources/language/master/master_en_US.properties
+++ b/lms/nladmin-system/src/main/resources/language/master/master_en_US.properties
@@ -1,2 +1,9 @@
 master_operation_permissions=Deleted or without permission, operation failed!
 master_exists=Same encoding exists
+master_code_notNull=The code cannot be empty!
+master_vehicle=Please select the correct type of vehicle
+master_area_exists=There are salespeople in the same area!
+master_jk_exists=Duplicate interface!
+master_parentCode_notNull=The parent node number cannot be empty!
+master_parentCode_input=Please enter the correct parent node number!
+master_error_ParamExist={0}Already exists
diff --git a/lms/nladmin-system/src/main/resources/language/master/master_in_ID.properties b/lms/nladmin-system/src/main/resources/language/master/master_in_ID.properties
index 12a5d25..ab87560 100644
--- a/lms/nladmin-system/src/main/resources/language/master/master_in_ID.properties
+++ b/lms/nladmin-system/src/main/resources/language/master/master_in_ID.properties
@@ -1,3 +1,10 @@
 master_operation_permissions=Dihapus atau tanpa izin, operasi gagal!
 master_exists=Pengekodan yang sama ada
+master_code_notNull=Kodenya tidak bisa kosong!
+master_vehicle=Silakan pilih tipe kendaraan yang tepat
+master_area_exists=There are salespeople in the same area!
+master_jk_exists=Duplikasi antarmuka!
+master_parentCode_notNull=Nomor node induk tidak dapat kosong!
+master_parentCode_input=Silakan masukkan nomor node induk yang benar!
+master_error_ParamExist={0}Sudah ada
 
diff --git a/lms/nladmin-system/src/main/resources/language/master/master_zh_CN.properties b/lms/nladmin-system/src/main/resources/language/master/master_zh_CN.properties
index a850444..b0f0c9a 100644
--- a/lms/nladmin-system/src/main/resources/language/master/master_zh_CN.properties
+++ b/lms/nladmin-system/src/main/resources/language/master/master_zh_CN.properties
@@ -1,2 +1,9 @@
 master_operation_permissions=被删除或无权限，操作失败!
 master_exists=存在相同的编码
+master_code_notNull=编码不能为空!
+master_vehicle=请选择正确的载具类型
+master_area_exists=存在相同区域的业务员!
+master_jk_exists=接口重复!
+master_parentCode_notNull=父节点编号不能为空!
+master_parentCode_input=请输入正确的父节点编号!
+master_error_ParamExist={0}已存在
diff --git a/lms/nladmin-ui/src/components/Crud/CRUD.operation.vue b/lms/nladmin-ui/src/components/Crud/CRUD.operation.vue
index 00bda68..28b724b 100644
--- a/lms/nladmin-ui/src/components/Crud/CRUD.operation.vue
+++ b/lms/nladmin-ui/src/components/Crud/CRUD.operation.vue
@@ -12,7 +12,7 @@
         icon="el-icon-plus"
         @click="crud.toAdd"
       >
-        新增
+        {{ $t('auto.common.Create') }}
       </el-button>
       <el-button
         v-if="crud.optShow.edit"
diff --git a/lms/nladmin-ui/src/components/Crud/UD.operation.vue b/lms/nladmin-ui/src/components/Crud/UD.operation.vue
index 66bf9b6..8a5ce88 100644
--- a/lms/nladmin-ui/src/components/Crud/UD.operation.vue
+++ b/lms/nladmin-ui/src/components/Crud/UD.operation.vue
@@ -14,6 +14,7 @@
 </template>
 <script>
 import CRUD, { crud } from '@crud/crud'
+import i18n from '@/i18n'
 export default {
   mixins: [crud()],
   props: {
@@ -43,7 +44,7 @@ export default {
     },
     msg: {
       type: String,
-      default: '确定删除本条数据吗？'
+      default: i18n.t('auto.common.crudTip')
     }
   },
   data() {
diff --git a/lms/nladmin-ui/src/components/Crud/crud.js b/lms/nladmin-ui/src/components/Crud/crud.js
index afb5221..b26a08d 100644
--- a/lms/nladmin-ui/src/components/Crud/crud.js
+++ b/lms/nladmin-ui/src/components/Crud/crud.js
@@ -1,6 +1,7 @@
 import { download, initData } from '@/api/data'
 import { downloadFile, parseTime } from '@/utils/index'
 import Vue from 'vue'
+import i18n from '@/i18n'
 
 /**
  * CRUD配置
@@ -84,14 +85,14 @@ function CRUD(options) {
       },
       // 标题
       get title() {
-        return this.add > CRUD.STATUS.NORMAL ? `新增${crud.title}` : this.edit > CRUD.STATUS.NORMAL ? `编辑${crud.title}` : this.view > CRUD.STATUS.NORMAL ? `${crud.title}详情` : crud.title
+        return this.add > CRUD.STATUS.NORMAL ? i18n.t('auto.common.Create') + `${crud.title}` : this.edit > CRUD.STATUS.NORMAL ? i18n.t('auto.common.Editors') + `${crud.title}` : this.view > CRUD.STATUS.NORMAL ? `${crud.title}` + i18n.t('auto.common.details') : crud.title
       }
     },
     msg: {
-      submit: '提交成功',
-      add: '新增成功',
-      edit: '编辑成功',
-      del: '删除成功'
+      submit: i18n.t('auto.common.submit_msg'),
+      add: i18n.t('auto.common.add_msg'),
+      edit: i18n.t('auto.common.edit_msg'),
+      del: i18n.t('auto.common.del_msg')
     },
     page: {
       // 页码
diff --git a/lms/nladmin-ui/src/i18n/langs/en.js b/lms/nladmin-ui/src/i18n/langs/en.js
index 31229cb..7cdd36b 100644
--- a/lms/nladmin-ui/src/i18n/langs/en.js
+++ b/lms/nladmin-ui/src/i18n/langs/en.js
@@ -103,7 +103,8 @@ export default {
       'submit_msg': 'Submitted successfully',
       'add_msg': 'Added successfully',
       'edit_msg': 'Edited successfully',
-      'del_msg': 'Delete successfully'
+      'del_msg': 'Delete successfully',
+      'details': 'details'
     },
     'monitor': {
       'sys': 'System',
diff --git a/lms/nladmin-ui/src/i18n/langs/in.js b/lms/nladmin-ui/src/i18n/langs/in.js
index 462b10b..255930c 100644
--- a/lms/nladmin-ui/src/i18n/langs/in.js
+++ b/lms/nladmin-ui/src/i18n/langs/in.js
@@ -99,7 +99,12 @@ export default {
       'true': 'Ada',
       'false': 'Tidak',
       'Running': 'Menjalankan',
-      'Paused': 'Berhenti'
+      'Paused': 'Berhenti',
+      'details': 'rincian',
+      'submit_msg': 'Submitted successfully',
+      'add_msg': 'Added successfully',
+      'edit_msg': 'Edited successfully',
+      'del_msg': 'Delete successfully'
     },
     'monitor': {
       'sys': 'Sistem',
diff --git a/lms/nladmin-ui/src/i18n/langs/indonesian.js b/lms/nladmin-ui/src/i18n/langs/indonesian.js
index 833ee78..eed5554 100644
--- a/lms/nladmin-ui/src/i18n/langs/indonesian.js
+++ b/lms/nladmin-ui/src/i18n/langs/indonesian.js
@@ -1,10 +1,10 @@
 import idLocale from 'element-ui/lib/locale/lang/id'
 import id from './in'
-// import dataPermission from './dataPermission/in'
-// import workshop from './basedata/workshop/in'
-// import vehicle from './basedata/vehicle/in'
+import dataPermission from './dataPermission/in'
+import workshop from './basedata/workshop/in'
+import vehicle from './basedata/vehicle/in'
 import material from './basedata/master/material/in'
-// import classification from './basedata/classification/in'
+import classification from './basedata/classification/in'
 import classstandard from './basedata/master/classstandard/in'
 import customer from './basedata/master/customer/in'
 import faultdevice from './basedata/master/faultdevice/in'
@@ -13,40 +13,40 @@ import measure from './basedata/master/measure/in'
 import sales from './basedata/master/sales/in'
 import storagevehicleinfo from './basedata/master/storagevehicleinfo/in'
 import transport from './basedata/master/transport/in'
-// import taskConfig from './sch/task/in'
-// import taskManage from './sch/task_manage/in'
-// import SchBasePoint from './sch/point/in'
-// import regionManage from './sch/region/in'
-// import sys_redis from './system/redis/in'
-// import notice from './system/notice/in'
-// import search from './lucene/search/in'
-// import lucene from './lucene/in'
-// import record from './record/in'
-// import login from './login/in'
-// import operation_log from './operationLog/in'
-// import online from './online/in'
-// import error_log from './errorLog/in'
-// import menu from './menu/in'
-// import param from './param/in'
+import taskConfig from './sch/task/in'
+import taskManage from './sch/task_manage/in'
+import SchBasePoint from './sch/point/in'
+import regionManage from './sch/region/in'
+import sys_redis from './system/redis/in'
+import notice from './system/notice/in'
+import search from './lucene/search/in'
+import lucene from './lucene/in'
+import record from './record/in'
+import login from './login/in'
+import operation_log from './operationLog/in'
+import online from './online/in'
+import error_log from './errorLog/in'
+import menu from './menu/in'
+import param from './param/in'
 import instruction from './instruction/in'
 import task from './task/in'
 import history from './history/in'
 import device from './device/in'
 import opc from './opc/in'
 import protocol from './protocol/in'
-// import address from './address/in'
+import address from './address/in'
 import storageCell from './storageCell/in'
 import route from './route/in'
 import auto from './auto/in'
-// import monitor from './monitor/in'
-// import timing from './timing/in'
+import monitor from './monitor/in'
+import timing from './timing/in'
 import config from './config/in'
 import customPolicy from './customPolicy/in'
 import deviceErrorInfo from './deviceErrorInfo/in'
-// import user from './user/in'
-// import role from './role/in'
-// import department from './department/in'
-// import dict from './dict/in'
+import user from './user/in'
+import role from './role/in'
+import department from './department/in'
+import dict from './dict/in'
 import angle from './angle/in'
 import regional from './regional/in'
 import stage from './stage/in'
@@ -54,45 +54,45 @@ import stage from './stage/in'
 export default {
   ...idLocale,
   ...id,
-  // ...dataPermission,
-  // ...menu,
-  // ...workshop,
-  // ...vehicle,
+  ...dataPermission,
+  ...menu,
+  ...workshop,
+  ...vehicle,
   ...material,
-  // ...notice,
-  // ...classification,
-  // ...login,
-  // ...error_log,
-  // ...online,
-  // ...operation_log,
-  // ...taskConfig,
-  // ...record,
-  // ...taskManage,
-  // ...SchBasePoint,
-  // ...regionManage,
-  // ...sys_redis,
-  // ...search,
-  // ...lucene,
-  // ...param,
+  ...notice,
+  ...classification,
+  ...login,
+  ...error_log,
+  ...online,
+  ...operation_log,
+  ...taskConfig,
+  ...record,
+  ...taskManage,
+  ...SchBasePoint,
+  ...regionManage,
+  ...sys_redis,
+  ...search,
+  ...lucene,
+  ...param,
   ...instruction,
   ...task,
   ...history,
   ...device,
   ...opc,
   ...protocol,
-  // ...address,
+  ...address,
   ...storageCell,
   ...route,
   ...auto,
   ...customPolicy,
-  // ...monitor,
-  // ...timing,
+  ...monitor,
+  ...timing,
   ...config,
   ...deviceErrorInfo,
-  // ...user,
-  // ...role,
-  // ...department,
-  // ...dict,
+  ...user,
+  ...role,
+  ...department,
+  ...dict,
   ...angle,
   ...regional,
   ...stage,
diff --git a/lms/nladmin-ui/src/i18n/langs/zh-CN.js b/lms/nladmin-ui/src/i18n/langs/zh-CN.js
index 85c69e6..8146d38 100644
--- a/lms/nladmin-ui/src/i18n/langs/zh-CN.js
+++ b/lms/nladmin-ui/src/i18n/langs/zh-CN.js
@@ -103,7 +103,8 @@ export default {
       'submit_msg': '提交成功',
       'add_msg': '新增成功',
       'edit_msg': '编辑成功',
-      'del_msg': '删除成功'
+      'del_msg': '删除成功',
+      'details': '详情'
     },
     'monitor': {
       'sys': '系统',
diff --git a/lms/nladmin-ui/src/mixins/crud.js b/lms/nladmin-ui/src/mixins/crud.js
index 0ccbde2..7f3163e 100644
--- a/lms/nladmin-ui/src/mixins/crud.js
+++ b/lms/nladmin-ui/src/mixins/crud.js
@@ -7,6 +7,7 @@ import {
   downloadFile
 } from '@/utils/index'
 import checkPermission from '@/utils/permission'
+import i18n from '@/i18n'
 
 export default {
   data() {
@@ -115,28 +116,28 @@ export default {
      */
     submitSuccessNotify() {
       this.$notify({
-        title: '提交成功',
+        title: i18n.t('auto.common.submit_msg'),
         type: 'success',
         duration: 2500
       })
     },
     addSuccessNotify() {
       this.$notify({
-        title: '新增成功',
+        title: i18n.t('auto.common.add_msg'),
         type: 'success',
         duration: 2500
       })
     },
     editSuccessNotify() {
       this.$notify({
-        title: '编辑成功',
+        title: i18n.t('auto.common.edit_msg'),
         type: 'success',
         duration: 2500
       })
     },
     delSuccessNotify() {
       this.$notify({
-        title: '删除成功',
+        title: i18n.t('auto.common.del_msg'),
         type: 'success',
         duration: 2500
       })
@@ -179,9 +180,9 @@ export default {
      * 多选删除提示
      */
     beforeDelAllMethod() {
-      this.$confirm('你确定删除选中的数据吗？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm(i18n.t('auto.common.crudTip'), i18n.t('auto.common.Tips'), {
+        confirmButtonText: i18n.t('auto.common.Confirm'),
+        cancelButtonText: i18n.t('auto.common.Cancel'),
         type: 'warning'
       }).then(() => {
         this.delAllMethod()
@@ -202,7 +203,7 @@ export default {
         this.dleChangePage(ids.length)
         this.init()
         this.$notify({
-          title: '删除成功',
+          title: i18n.t('auto.common.del_msg'),
           type: 'success',
           duration: 2500
         })