diff --git a/lms/nladmin-ui/src/i18n/langs/baseclass/en.js b/lms/nladmin-ui/src/i18n/langs/baseclass/en.js index 671b4f1..b9e491c 100644 --- a/lms/nladmin-ui/src/i18n/langs/baseclass/en.js +++ b/lms/nladmin-ui/src/i18n/langs/baseclass/en.js @@ -1,13 +1,32 @@ export default { 'BasicClassification': { + 'title': 'Base Type', 'table': { 'code': 'code', 'name': 'name', - 'values': 'value', - 'description': 'remark' + 'description': 'description', + 'create_time': 'create time', + 'create_user': 'create user', + 'update_time': 'update time', + 'update_user': 'update user', + 'is_modify': 'modify', + 'isTop': 'top category', + 'parent_class_id': 'superior category' }, 'rules': { 'NotNull': 'Cannot be empty' + }, + 'msg': { + 'm1': 'Are you sure to delete it? If there are lower-level nodes, delete them together. This operation cannot be undone!' + }, + 'button': { + 'all_open': 'Expand All', + 'bu1': 'Add Sibling', + 'bu2': 'Add Child' + }, + 'placeholder': { + 'p1': 'Please select a category name', + 'p2': 'Select the parent category' } } } diff --git a/lms/nladmin-ui/src/i18n/langs/baseclass/in.js b/lms/nladmin-ui/src/i18n/langs/baseclass/in.js index 546552e..16fbd1f 100644 --- a/lms/nladmin-ui/src/i18n/langs/baseclass/in.js +++ b/lms/nladmin-ui/src/i18n/langs/baseclass/in.js @@ -1,13 +1,32 @@ export default { 'BasicClassification': { + 'title': 'Tipe Dasar', 'table': { 'code': 'kode', 'name': 'nama', - 'values': 'nilai', - 'description': 'Catatan' + 'description': 'keterangan', + 'create_time': 'tarikh penciptaan', + 'create_user': 'pencipta', + 'update_time': 'tanggal modifikasi', + 'update_user': 'diubah oleh', + 'is_modify': 'memodifikasi', + 'isTop': 'kategori teratas', + 'parent_class_id': 'kategori unggul' }, 'rules': { 'NotNull': 'Tidak dapat kosong' + }, + 'msg': { + 'm1': 'Apakah Anda yakin akan menghapusnya? Jika ada node tingkat rendah, hapus semuanya. Operasi ini tidak dapat dibatalkan!' + }, + 'button': { + 'all_open': 'Melebarkan Semua', + 'bu1': 'Tambahkan Saudara', + 'bu2': 'Tambahkan Anak' + }, + 'placeholder': { + 'p1': 'Silakan pilih nama kategori', + 'p2': 'Pilih kategori induk' } } } diff --git a/lms/nladmin-ui/src/i18n/langs/baseclass/zh.js b/lms/nladmin-ui/src/i18n/langs/baseclass/zh.js index 4d56b4a..0bf9414 100644 --- a/lms/nladmin-ui/src/i18n/langs/baseclass/zh.js +++ b/lms/nladmin-ui/src/i18n/langs/baseclass/zh.js @@ -1,13 +1,32 @@ export default { 'BasicClassification': { + 'title': '基础类别', 'table': { - 'code': '编码', - 'name': '名称', - 'values': '值', - 'description': '备注' + 'code': '分类编码', + 'name': '分类名称', + 'description': '分类描述', + 'create_time': '创建日期', + 'create_user': '创建人', + 'update_time': '修改日期', + 'update_user': '修改人', + 'is_modify': '是否可修改', + 'isTop': '顶级类目', + 'parent_class_id': '上级类目' }, 'rules': { 'NotNull': '不能为空' + }, + 'msg': { + 'm1': '确定删除吗,如果存在下级节点则一并删除,此操作不能撤销!' + }, + 'button': { + 'all_open': '全部展开', + 'bu1': '新增同级', + 'bu2': '新增子级' + }, + 'placeholder': { + 'p1': '请选择分类名称', + 'p2': '选择上级类目' } } } diff --git a/lms/nladmin-ui/src/i18n/langs/chinese.js b/lms/nladmin-ui/src/i18n/langs/chinese.js index e828e1d..7724f5c 100644 --- a/lms/nladmin-ui/src/i18n/langs/chinese.js +++ b/lms/nladmin-ui/src/i18n/langs/chinese.js @@ -13,6 +13,9 @@ import redis from './redis/zh' import log from './log/zh' import notice from './notice/zh' import record from './record/zh' +import errorLog from './log/error/zh' +import online from './online/zh' +import classification from './baseclass/zh' export default { ...zhLocale, @@ -29,5 +32,8 @@ export default { ...redis, ...log, ...notice, - ...record + ...record, + ...errorLog, + ...online, + ...classification } diff --git a/lms/nladmin-ui/src/i18n/langs/en.js b/lms/nladmin-ui/src/i18n/langs/en.js index 717bd0f..6385d3d 100644 --- a/lms/nladmin-ui/src/i18n/langs/en.js +++ b/lms/nladmin-ui/src/i18n/langs/en.js @@ -88,6 +88,7 @@ export default { 'Tip14': 'WebSocket connection error', 'Tip15': 'Please enter an icon name', 'Tip16': 'NOT NULL', + 'Tip17': 'Please enter what you are searching for', 'loading': 'loading...' }, 'WorkOrder': { diff --git a/lms/nladmin-ui/src/i18n/langs/english.js b/lms/nladmin-ui/src/i18n/langs/english.js index 6688045..f9e60d3 100644 --- a/lms/nladmin-ui/src/i18n/langs/english.js +++ b/lms/nladmin-ui/src/i18n/langs/english.js @@ -13,6 +13,9 @@ import redis from './redis/en' import log from './log/en' import notice from './notice/en' import record from './record/en' +import errorLog from './log/error/en' +import online from './online/en' +import classification from './baseclass/en' export default { ...enLocale, @@ -29,5 +32,8 @@ export default { ...redis, ...log, ...notice, - ...record + ...record, + ...errorLog, + ...online, + ...classification } diff --git a/lms/nladmin-ui/src/i18n/langs/in.js b/lms/nladmin-ui/src/i18n/langs/in.js index ab32b16..f620b4a 100644 --- a/lms/nladmin-ui/src/i18n/langs/in.js +++ b/lms/nladmin-ui/src/i18n/langs/in.js @@ -88,6 +88,7 @@ export default { 'Tip14': 'Koneksi WebSocket error', 'Tip15': 'Silakan masukkan nama ikon', 'Tip16': 'TIDAK NULL', + 'Tip17': 'Silakan masukkan apa yang Anda cari', 'loading': 'Memuatkan Data...' }, 'WorkOrder': { diff --git a/lms/nladmin-ui/src/i18n/langs/indonesian.js b/lms/nladmin-ui/src/i18n/langs/indonesian.js index 1d909b4..a3761e3 100644 --- a/lms/nladmin-ui/src/i18n/langs/indonesian.js +++ b/lms/nladmin-ui/src/i18n/langs/indonesian.js @@ -13,6 +13,9 @@ import redis from './redis/in' import log from './log/in' import notice from './notice/in' import record from './record/in' +import errorLog from './log/error/in' +import online from './online/in' +import classification from './baseclass/in' export default { ...idLocale, @@ -29,5 +32,8 @@ export default { ...redis, ...log, ...notice, - ...record + ...record, + ...errorLog, + ...online, + ...classification } diff --git a/lms/nladmin-ui/src/i18n/langs/log/error/en.js b/lms/nladmin-ui/src/i18n/langs/log/error/en.js new file mode 100644 index 0000000..775f4d3 --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/log/error/en.js @@ -0,0 +1,20 @@ +export default { + 'ErrorLog': { + 'table': { + 'method': 'method', + 'params': 'params', + 'username': 'username', + 'address': 'IP source', + 'description': 'description', + 'browser': 'browser', + 'create_time': 'create time', + 'err_del': 'exception details', + 'see_del': 'view details', + 'time': 'request time', + 'clear': 'Clear' + }, + 'msg': { + 'm1': 'Are you sure to clear all operation logs?' + } + } +} diff --git a/lms/nladmin-ui/src/i18n/langs/log/error/in.js b/lms/nladmin-ui/src/i18n/langs/log/error/in.js new file mode 100644 index 0000000..a98350f --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/log/error/in.js @@ -0,0 +1,20 @@ +export default { + 'ErrorLog': { + 'table': { + 'method': 'metode', + 'params': 'param', + 'username': 'nama belakang', + 'address': 'sumber IP', + 'description': 'keterangan', + 'browser': 'peramban', + 'create_time': 'menciptakan waktu', + 'err_del': 'detail pengecualian', + 'see_del': 'melihat rincian', + 'time': 'waktu permintaan', + 'clear': 'Jernih' + }, + 'msg': { + 'm1': 'Apakah Anda yakin untuk menghapus semua log operasi?' + } + } +} diff --git a/lms/nladmin-ui/src/i18n/langs/log/error/zh.js b/lms/nladmin-ui/src/i18n/langs/log/error/zh.js new file mode 100644 index 0000000..54e3400 --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/log/error/zh.js @@ -0,0 +1,20 @@ +export default { + 'ErrorLog': { + 'table': { + 'method': '请求方法', + 'params': '请求参数', + 'username': '用户名', + 'address': 'IP来源', + 'description': '描述', + 'browser': '浏览器', + 'create_time': '创建日期', + 'err_del': '异常详情', + 'see_del': '查看详情', + 'time': '请求耗时', + 'clear': '清空' + }, + 'msg': { + 'm1': '确认清空所有操作日志吗?' + } + } +} diff --git a/lms/nladmin-ui/src/i18n/langs/online/en.js b/lms/nladmin-ui/src/i18n/langs/online/en.js new file mode 100644 index 0000000..c05936b --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/online/en.js @@ -0,0 +1,21 @@ +export default { + 'Online': { + 'title': 'Online User', + 'table': { + 'userName': 'userName', + 'nickName': 'nickName', + 'dept': 'department', + 'ip': 'IP', + 'address': 'login location', + 'browser': 'browser', + 'loginTime': 'login time', + 'forced': 'Force Quit' + }, + 'msg': { + 'm1': 'Are you sure you want to force logout on this use?', + 'm2': 'Successful forced withdrawal!', + 'm3_1': 'Confirm the forcibly unselected', + 'm3_2': 'users?' + } + } +} diff --git a/lms/nladmin-ui/src/i18n/langs/online/in.js b/lms/nladmin-ui/src/i18n/langs/online/in.js new file mode 100644 index 0000000..6f2e36c --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/online/in.js @@ -0,0 +1,21 @@ +export default { + 'Online': { + 'title': 'Pengguna Daring', + 'table': { + 'userName': 'nama belakang', + 'nickName': 'nama panggilan', + 'dept': 'departemen', + 'ip': 'IP', + 'address': 'lokasi masuk', + 'browser': 'peramban', + 'loginTime': 'waktu masuk', + 'forced': 'Keluar Paksa' + }, + 'msg': { + 'm1': 'Apakah Anda yakin ingin memaksa logout pada penggunaan ini?', + 'm2': 'Penarikan paksa yang berhasil!', + 'm3_1': 'Konfirmasikan yang tidak dipilih secara paksa', + 'm3_2': 'pengguna?' + } + } +} diff --git a/lms/nladmin-ui/src/i18n/langs/online/zh.js b/lms/nladmin-ui/src/i18n/langs/online/zh.js new file mode 100644 index 0000000..ce21612 --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/online/zh.js @@ -0,0 +1,21 @@ +export default { + 'Online': { + 'title': '在线用户', + 'table': { + 'userName': '用户名', + 'nickName': '用户姓名', + 'dept': '部门', + 'ip': '登录IP', + 'address': '登录地点', + 'browser': '浏览器', + 'loginTime': '登录时间', + 'forced': '强退' + }, + 'msg': { + 'm1': '确定强制退出该用户吗?', + 'm2': '强退成功!', + 'm3_1': '确认强退选中的', + 'm3_2': '个用户?' + } + } +} diff --git a/lms/nladmin-ui/src/i18n/langs/zh-CN.js b/lms/nladmin-ui/src/i18n/langs/zh-CN.js index 95e7497..9e36a23 100644 --- a/lms/nladmin-ui/src/i18n/langs/zh-CN.js +++ b/lms/nladmin-ui/src/i18n/langs/zh-CN.js @@ -88,6 +88,7 @@ export default { 'Tip14': 'WebSocket连接发生错误', 'Tip15': '请输入图标名称', 'Tip16': '不能为空', + 'Tip17': '请输入你要搜索的内容', 'loading': '数据加载中...' }, 'WorkOrder': { diff --git a/lms/nladmin-ui/src/views/monitor/log/errorLog.vue b/lms/nladmin-ui/src/views/monitor/log/errorLog.vue index fbee23f..abbd67a 100644 --- a/lms/nladmin-ui/src/views/monitor/log/errorLog.vue +++ b/lms/nladmin-ui/src/views/monitor/log/errorLog.vue @@ -12,7 +12,7 @@ :loading="crud.delAllLoading" @click="confirmDelAll()" > - 清空 + {{ $t('ErrorLog.table.clear') }} @@ -21,32 +21,32 @@ - + {{ props.row.method }} - + {{ props.row.params }} - + - - - - + + + + {{ parseTime(scope.row.create_time) }} - + - 查看详情 + {{ $t('ErrorLog.table.see_del') }} - + diff --git a/lms/nladmin-ui/src/views/monitor/log/index.vue b/lms/nladmin-ui/src/views/monitor/log/index.vue index f37d57a..751d15e 100644 --- a/lms/nladmin-ui/src/views/monitor/log/index.vue +++ b/lms/nladmin-ui/src/views/monitor/log/index.vue @@ -12,7 +12,7 @@ :loading="crud.delAllLoading" @click="confirmDelAll()" > - 清空 + {{ $t('ErrorLog.table.clear') }} @@ -21,28 +21,28 @@ - + {{ props.row.method }} - + {{ props.row.params }} - + - - - - + + + + {{ scope.row.time }}ms {{ scope.row.time }}ms {{ scope.row.time }}ms - + {{ parseTime(scope.row.create_time) }} @@ -59,6 +59,7 @@ import { delAllInfo } from '@/api/monitor/log' import CRUD, { presenter } from '@crud/crud' import crudOperation from '@crud/CRUD.operation' import pagination from '@crud/Pagination' +import i18n from "@/i18n"; export default { name: 'Log', @@ -77,9 +78,9 @@ export default { }, methods: { confirmDelAll() { - this.$confirm(`确认清空所有操作日志吗?`, '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', + this.$confirm(i18n.t('ErrorLog.msg.m1'), i18n.t('common.Operate'), { + confirmButtonText: i18n.t('common.Confirm'), + cancelButtonText: i18n.t('common.Cancel'), type: 'warning' }).then(() => { this.crud.delAllLoading = true diff --git a/lms/nladmin-ui/src/views/monitor/log/search.vue b/lms/nladmin-ui/src/views/monitor/log/search.vue index cc9f175..9a29c77 100644 --- a/lms/nladmin-ui/src/views/monitor/log/search.vue +++ b/lms/nladmin-ui/src/views/monitor/log/search.vue @@ -4,7 +4,7 @@ v-model="query.blurry" clearable size="mini" - placeholder="请输入你要搜索的内容" + :placeholder="$t('common.Tip17')" style="width: 200px;" class="filter-item" /> diff --git a/lms/nladmin-ui/src/views/monitor/online/index.vue b/lms/nladmin-ui/src/views/monitor/online/index.vue index 0b3ec34..c7f0487 100644 --- a/lms/nladmin-ui/src/views/monitor/online/index.vue +++ b/lms/nladmin-ui/src/views/monitor/online/index.vue @@ -16,38 +16,38 @@ :disabled="crud.selections.length === 0" @click="doDelete(crud.selections)" > - 强退 + {{ $t('Online.table.forced') }} - - - - - - - + + + + + + + {{ parseTime(scope.row.loginTime) }} - + - 确定强制退出该用户吗? + {{ $t('Online.msg.m1') }} - 取消 - 确定 + {{ $t('common.Cancel') }} + {{ $t('common.Confirm') }} - 强退 + {{ $t('Online.table.forced') }} @@ -63,12 +63,13 @@ import CRUD, { presenter, header, crud } from '@crud/crud' import rrOperation from '@crud/RR.operation' import crudOperation from '@crud/CRUD.operation' import pagination from '@crud/Pagination' +import i18n from "@/i18n"; export default { name: 'OnlineUser', components: { pagination, crudOperation, rrOperation }, cruds() { - return CRUD({ url: 'auth/online', title: '在线用户' }) + return CRUD({ url: 'auth/online', title: i18n.t('Online.title') }) }, mixins: [presenter(), header(), crud()], data() { @@ -78,7 +79,7 @@ export default { } }, created() { - this.crud.msg.del = '强退成功!' + this.crud.msg.del = i18n.t('Online.msg.m2') this.crud.optShow = { add: false, edit: false, @@ -88,9 +89,9 @@ export default { }, methods: { doDelete(datas) { - this.$confirm(`确认强退选中的${datas.length}个用户?`, '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', + this.$confirm(i18n.t('Online.m3_1') + `${datas.length}` + i18n.t('Online.m3_1'), i18n.t('common.Tips'), { + confirmButtonText: i18n.t('common.Confirm'), + cancelButtonText: i18n.t('common.Cancel'), type: 'warning' }).then(() => { this.delMethod(datas) diff --git a/lms/nladmin-ui/src/views/wms/basedata/master/classification/index.vue b/lms/nladmin-ui/src/views/wms/basedata/master/classification/index.vue index dfb4837..1e78c80 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/master/classification/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/master/classification/index.vue @@ -11,10 +11,10 @@ label-width="90px" label-suffix=":" > - + - 全部展开 + {{ $t('BasicClassification.button.all_open') }} @@ -52,37 +52,37 @@ :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" - width="500px" + :width="computedLabelWidth" > - - + + - + - + - + - 是 - 否 + {{ $t('common.Yes') }} + {{ $t('common.No') }} - + @@ -98,19 +98,19 @@ @select-all="crud.selectAllChange" @selection-change="crud.selectionChangeHandler" > - - - - - - + + + + + + - {{scope.row.is_modify?'是':'否'}} + {{ scope.row.is_modify ? $t('common.Yes') : $t('common.No') }} @@ -121,10 +121,14 @@ :permission="permission" :disabled-edit="scope.row.is_modify === '0'" :disabled-dle="scope.row.is_modify === '0'" - msg="确定删除吗,如果存在下级节点则一并删除,此操作不能撤销!" + :msg="$t('BasicClassification.msg.m1')" /> - 新增同级 - 新增子级 + + {{ $t('BasicClassification.button.bu1') }} + + + {{ $t('BasicClassification.button.bu2') }} + @@ -143,6 +147,7 @@ import crudOperation from '@crud/CRUD.operation.vue' import udOperation from '@crud/UD.operation.vue' import rrOperation from '@crud/RR.operation.vue' import pagination from '@crud/Pagination.vue' +import i18n from "@/i18n"; let defaultForm = { id: null, @@ -175,7 +180,7 @@ export default { mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { return CRUD({ - title: '基础类别', + title: i18n.t('BasicClassification.title'), url: 'api/Classstandard', idField: 'class_id', sort: 'class_id,desc', @@ -193,38 +198,54 @@ export default { permission: {}, rules: { class_id: [ - { required: true, message: '不能为空', trigger: 'blur' } + { required: true, message: i18n.t('BasicClassification.rules.NotNull'), trigger: 'blur' } ], path_code: [ - { required: true, message: '不能为空', trigger: 'blur' } + { required: true, message: i18n.t('BasicClassification.rules.NotNull'), trigger: 'blur' } ], class_code: [ - { required: true, message: '不能为空', trigger: 'blur' } + { required: true, message: i18n.t('BasicClassification.rules.NotNull'), trigger: 'blur' } ], class_name: [ - { required: true, message: '不能为空', trigger: 'blur' } + { required: true, message: i18n.t('BasicClassification.rules.NotNull'), trigger: 'blur' } ], is_leaf: [ - { required: true, message: '不能为空', trigger: 'blur' } + { required: true, message: i18n.t('BasicClassification.rules.NotNull'), trigger: 'blur' } ], is_modify: [ - { required: true, message: '不能为空', trigger: 'blur' } + { required: true, message: i18n.t('BasicClassification.rules.NotNull'), trigger: 'blur' } ], is_delete: [ - { required: true, message: '不能为空', trigger: 'blur' } + { required: true, message: i18n.t('BasicClassification.rules.NotNull'), trigger: 'blur' } ], create_id: [ - { required: true, message: '不能为空', trigger: 'blur' } + { required: true, message: i18n.t('BasicClassification.rules.NotNull'), trigger: 'blur' } ], create_name: [ - { required: true, message: '不能为空', trigger: 'blur' } + { required: true, message: i18n.t('BasicClassification.rules.NotNull'), trigger: 'blur' } ], create_time: [ - { required: true, message: '不能为空', trigger: 'blur' } + { required: true, message: i18n.t('BasicClassification.rules.NotNull'), trigger: 'blur' } ] } } }, + computed: { + computedLabelWidth() { + const item = localStorage.getItem('lang') + if (item === 'zh') { + return `500px` + } + return `600px` + }, + computedFormLabelWidth() { + const item = localStorage.getItem('lang') + if (item === 'zh') { + return `80px` + } + return `140px` + } + }, created() { this.getClassNames() // 获取分类 },
确定强制退出该用户吗?
{{ $t('Online.msg.m1') }}