Browse Source

Merge remote-tracking branch 'origin/admin' into lms_v1.0.0

master
李永德 8 months ago
parent
commit
b366e7f4c5
  1. 23
      nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/wms/PointStatusEnum.java
  2. 12
      nladmin-system/nlsso-server/src/main/resources/banner.txt
  3. 25
      nladmin-system/nlsso-server/src/main/resources/config/application.yml
  4. 3
      nladmin-system/nlsso-server/src/main/resources/logback-spring.xml
  5. BIN
      nladmin-ui/src/assets/images/logo.png
  6. BIN
      nladmin-ui/src/assets/images/nl.png
  7. BIN
      nladmin-ui/src/assets/logo/logo.63028018.png
  8. BIN
      nladmin-ui/src/assets/logo/logo.png
  9. BIN
      nladmin-ui/src/assets/wms/1.png
  10. BIN
      nladmin-ui/src/assets/wms/2.png
  11. BIN
      nladmin-ui/src/assets/wms/3.png
  12. BIN
      nladmin-ui/src/assets/wms/4.png
  13. 8
      nladmin-ui/src/components/Crud/crud.js
  14. 20
      nladmin-ui/src/i18n/langs/en.js
  15. 20
      nladmin-ui/src/i18n/langs/in.js
  16. 20
      nladmin-ui/src/i18n/langs/zh-CN.js
  17. 2
      nladmin-ui/src/layout/components/Sidebar/Logo.vue
  18. 21
      nladmin-ui/src/mixins/crud.js
  19. 13
      nladmin-ui/src/views/login.vue
  20. 2
      nladmin-ui/src/views/system/user/center/updatePass.vue
  21. 48
      nladmin-ui/src/views/system/user/index.vue
  22. 12
      nladmin-ui/src/views/system/user/locale/en.js
  23. 12
      nladmin-ui/src/views/system/user/locale/in.js
  24. 12
      nladmin-ui/src/views/system/user/locale/zh.js

23
nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/wms/PointStatusEnum.java

@ -1,23 +0,0 @@
package org.nl.common.enums.wms;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* @Author: lyd
* @Description:
* @Date: 2023/5/15
*/
@Getter
@AllArgsConstructor
public enum PointStatusEnum {
// 空位
EMPTY_PLACE("1", "空位"),
// 有料
FULL_MATERIAL("2", "有料"),
// 空载具
EMPTY_VEHICLE("3", "空载具");
private final String value;
private final String description;
}

12
nladmin-system/nlsso-server/src/main/resources/banner.txt

@ -1,8 +1,8 @@
_ _ ___________ _ _____ _ ___________ _____
| \ | | _ | ___ \ | | ___| | | ___| ___|_ _|
| \| | | | | |_/ / | | |__ | | | |__ | |_ | |
| . ` | | | | ___ \ | | __|| | | __|| _| | |
| |\ \ \_/ / |_/ / |____| |___| |____| |___| | | |
\_| \_/\___/\____/\_____/\____/\_____/\____/\_| \_/
_ _ ___________ _ _____ _ ___________ _____
| \ | | _ | ___ \ | | ___| | |_ _| ___|_ _|
| \| | | | | |_/ / | | |__ | | | | | |_ | |
| . ` | | | | ___ \ | | __|| | | | | _| | |
| |\ \ \_/ / |_/ / |____| |___| |_____| |_| | | |
\_| \_/\___/\____/\_____/\____/\_____/\___/\_| \_/
:: Spring Boot :: (v2.1.0.RELEASE)

25
nladmin-system/nlsso-server/src/main/resources/config/application.yml

@ -4,6 +4,8 @@ server:
relaxed-path-chars: [ '|','{','}','[',']' ] #字符问题: https://blog.csdn.net/weixin_41996632/article/details/90715118
spring:
messages:
basename: language/login/login,language/error/error,language/buss/buss,language/task/task
datasource:
druid:
initial-size: 5 #初始化时建立物理连接的个数
@ -184,3 +186,26 @@ jetcache:
lucene:
index:
path: D:\lucene\index
sa-token:
# token 名称 (同时也是cookie名称)
token-name: Authorization
# token 有效期,单位s 默认30天, -1代表永不过期
timeout: 2592000
# token 临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
activity-timeout: -1
# 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)
is-concurrent: true
# 在多人登录同一账号时,是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token)
is-share: false
# token风格
token-style: random-128
# 是否输出操作日志
is-log: false
jwt-secret-key: opsjajisdnnca0sdkksdfaaasdfwwq
# token 前缀
token-prefix:
cookie:
# 配置 Cookie 作用域:根据二级域名实现sso登入如lms.sso.com;acs.sso.com
domain:
is-read-cookie: false
is-print: false

3
nladmin-system/nlsso-server/src/main/resources/logback-spring.xml

@ -12,8 +12,7 @@ https://juejin.cn/post/6844903775631572999
<contextName>nlAdmin</contextName>
<property name="log.charset" value="utf-8"/>
<property name="log.pattern"
value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %cyan(%msg%n)"/>
<springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
value="%cyan(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %blue(%msg%n)"/>
<property name="LOG_HOME" value="${logPath}"/>
<!--引入默认的一些设置-->
<!--<include resource="log/XrToMes.xml"/>

BIN
nladmin-ui/src/assets/images/logo.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 120 KiB

BIN
nladmin-ui/src/assets/images/nl.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 120 KiB

BIN
nladmin-ui/src/assets/logo/logo.63028018.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

BIN
nladmin-ui/src/assets/logo/logo.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

BIN
nladmin-ui/src/assets/wms/1.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 170 B

BIN
nladmin-ui/src/assets/wms/2.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1022 B

BIN
nladmin-ui/src/assets/wms/3.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 404 B

BIN
nladmin-ui/src/assets/wms/4.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

8
nladmin-ui/src/components/Crud/crud.js

@ -89,10 +89,10 @@ function CRUD(options) {
}
},
msg: {
submit: '提交成功',
add: '新增成功',
edit: '编辑成功',
del: '删除成功'
submit: i18n.t('common.submit'),
add: i18n.t('common.add'),
edit: i18n.t('common.edit'),
del: i18n.t('common.del')
},
page: {
// 页码

20
nladmin-ui/src/i18n/langs/en.js

@ -1,5 +1,12 @@
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',
@ -72,6 +79,13 @@ export default {
'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',
@ -83,14 +97,16 @@ export default {
'Tip9': 'Please enter your password again',
'Tip10': 'Please enter your old password',
'Tip11': 'Please enter your new password',
'Tip12': '6 to 20 characters in length',
'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'
'Tip18': 'select date time',
'Tip19': 'Are you sure to delete the selected data?',
'Tip20': 'The login has expired,please log in again!'
},
'WorkOrder': {
'form': {

20
nladmin-ui/src/i18n/langs/in.js

@ -1,5 +1,12 @@
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',
@ -72,6 +79,13 @@ export default {
'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',
@ -83,14 +97,16 @@ export default {
'Tip9': 'Silakan masukkan sandi lagi',
'Tip10': 'Silakan masukkan kata sandi lama Anda',
'Tip11': 'Silakan masukkan sandi baru',
'Tip12': 'Antara 6 dan 20 karakter dalam panjang',
'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'
'Tip18': 'pilih tanggal waktu',
'Tip19': 'Apakah Anda yakin untuk menghapus data yang dipilih?',
'Tip20': 'Log masuk telah habis,silakan log masuk lagi!'
},
'WorkOrder': {
'form': {

20
nladmin-ui/src/i18n/langs/zh-CN.js

@ -1,5 +1,12 @@
export default {
'lang': 'zh',
// 平台
'platform': {
'title': '诺力开发平台',
'tip1': '用户名不能为空',
'tip2': '密码不能为空',
'tip3': '验证码不能为空'
},
'common': {
'home': '首页', // 首页
'Layout_setting': '布局设置',
@ -72,6 +79,13 @@ export default {
'moreMenu': '更多菜单',
'browses': '浏览',
'fz': '全屏缩放',
'submit': '提交成功',
'add': '新增成功',
'edit': '编辑成功',
'del': '删除成功',
'close': '确认关闭',
'save': '保存成功',
'datas': '数据',
'Tips': '提示',
'Tip1': '确认删除选中的{count}条数据?',
'Tip3': '用户姓名不作为登录使用',
@ -83,14 +97,16 @@ export default {
'Tip9': '请再次输入密码',
'Tip10': '请输入旧密码',
'Tip11': '请输入新密码',
'Tip12': '长度在 6 到 20 个字符',
'Tip12': '长度在 {min} 到 {max} 个字符',
'Tip13': '确定注销并退出系统吗?',
'Tip14': 'WebSocket连接发生错误',
'Tip15': '请输入图标名称',
'Tip16': '不能为空',
'Tip17': '请输入你要搜索的内容',
'loading': '数据加载中...',
'Tip18': '选择日期时间'
'Tip18': '选择日期时间',
'Tip19': '你确定删除选中的数据吗?',
'Tip20': '当前登录状态已过期,请重新登录!'
},
'WorkOrder': {
'form': {

2
nladmin-ui/src/layout/components/Sidebar/Logo.vue

@ -14,7 +14,7 @@
</template>
<script>
import Logo from '@/assets/images/nl.png'
import Logo from '@/assets/images/logo.png'
import variables from '@/assets/styles/variables.scss'
export default {
name: 'SidebarLogo',

21
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('common.submit'),
type: 'success',
duration: 2500
})
},
addSuccessNotify() {
this.$notify({
title: '新增成功',
title: i18n.t('common.add'),
type: 'success',
duration: 2500
})
},
editSuccessNotify() {
this.$notify({
title: '编辑成功',
title: i18n.t('common.edit'),
type: 'success',
duration: 2500
})
},
delSuccessNotify() {
this.$notify({
title: '删除成功',
title: i18n.t('common.del'),
type: 'success',
duration: 2500
})
@ -179,9 +180,9 @@ export default {
* 多选删除提示
*/
beforeDelAllMethod() {
this.$confirm('你确定删除选中的数据吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
this.$confirm(i18n.t('common.Tip19'), i18n.t('common.Tips'), {
confirmButtonText: i18n.t('common.Confirm'),
cancelButtonText: i18n.t('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('common.del'),
type: 'success',
duration: 2500
})
@ -318,7 +319,7 @@ export default {
* 获取弹窗的标题
*/
getFormTitle() {
return this.isAdd ? `新增${this.title}` : `编辑${this.title}`
return this.isAdd ? i18n.t('common.Create') + `${this.title}` : i18n.t('common.Editors') + `${this.title}`
},
/**
* 通用导出
@ -327,7 +328,7 @@ export default {
this.beforeInit()
this.downloadLoading = true
download(this.url + '/download', this.params).then(result => {
this.downloadFile(result, this.title + '数据', 'xlsx')
this.downloadFile(result, this.title + i18n.t('common.datas'), 'xlsx')
this.downloadLoading = false
}).catch(() => {
this.downloadLoading = false

13
nladmin-ui/src/views/login.vue

@ -62,12 +62,13 @@ import Config from '@/settings'
import { getCodeImg } from '@/api/login'
import Cookies from 'js-cookie'
import Background from '@/assets/images/background.jpg'
import i18n from '@/i18n'
export default {
name: 'Login',
data() {
return {
language: '简体中文',
title: '诺力开发平台',
title: i18n.t('platform.title'),
title_param: 'platform',
Background: Background,
codeUrl: '',
@ -80,9 +81,9 @@ export default {
uuid: ''
},
loginRules: {
username: [{ required: true, trigger: 'blur', message: '用户名不能为空' }],
password: [{ required: true, trigger: 'blur', message: '密码不能为空' }],
code: [{ required: true, trigger: 'change', message: '验证码不能为空' }]
username: [{ required: true, trigger: 'blur', message: i18n.t('platform.tip1') }],
password: [{ required: true, trigger: 'blur', message: i18n.t('platform.tip2') }],
code: [{ required: true, trigger: 'change', message: i18n.t('platform.tip3') }]
},
loading: false,
redirect: undefined
@ -185,8 +186,8 @@ export default {
console.log(point)
if (point) {
this.$notify({
title: '提示',
message: '当前登录状态已过期,请重新登录!',
title: i18n.t('common.Tips'),
message: i18n.t('common.Tip20'),
type: 'warning',
duration: 5000
})

2
nladmin-ui/src/views/system/user/center/updatePass.vue

@ -45,7 +45,7 @@ export default {
],
newPass: [
{ required: true, message: i18n.t('common.Tip11'), trigger: 'blur' },
{ min: 6, max: 20, message: i18n.t('common.Tip12'), trigger: 'blur' }
{ min: 6, max: 20, message: i18n.t('common.Tip12', { min: 6, max: 20 }), trigger: 'blur' }
],
confirmPass: [
{ required: true, validator: confirmPass, trigger: 'blur' }

48
nladmin-ui/src/views/system/user/index.vue

@ -252,10 +252,10 @@
width="700px"
>
<el-form ref="form" :inline="true" :model="dataDialog" :rules="rules" size="mini" label-width="100px">
<el-form-item label="用户名" prop="username">
<el-form-item :label="$t('User.table.user_name')" prop="username">
<el-input v-model="dataDialog.username" disabled style="width: 200px;" />
</el-form-item>
<el-form-item label="姓名" prop="person_name">
<el-form-item :label="$t('User.table.person_name')" prop="person_name">
<el-input v-model="dataDialog.person_name" disabled style="width: 200px;" />
</el-form-item>
<el-table
@ -265,12 +265,12 @@
@selection-change="getRows"
>
<el-table-column :selectable="checkboxT" type="selection" width="55" />
<el-table-column prop="label" label="权限范围" />
<el-table-column label="数据权限">
<el-table-column prop="label" :label="$t('User.table.permission_scope_type')" />
<el-table-column :label="$t('User.table.permissionName')">
<template slot-scope="scope">
<el-select
v-model="scope.row.permission_id"
placeholder="请选择"
:placeholder="$t('common.Please_select')"
@change="openRelevance(scope.row, scope.$index)"
>
<el-option
@ -283,20 +283,20 @@
</template>
</el-table-column>
<el-table-column
label="操作"
:label="$t('common.Operate')"
fixed="right"
align="center"
width="100"
>
<template slot-scope="scope">
<el-button type="text" @click="showDatas(scope.row)">查看明细</el-button>
<el-button type="text" @click="showDatas(scope.row)">{{ $t('User.table.see') }}</el-button>
</template>
</el-table-column>
</el-table>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancelDataPerm">取消</el-button>
<el-button type="primary" @click="savePermise()">确认</el-button>
<el-button @click="cancelDataPerm">{{ $t('common.Cancel') }}</el-button>
<el-button type="primary" @click="savePermise()">{{ $t('common.Confirm') }}</el-button>
</div>
</el-dialog>
<el-dialog
@ -382,12 +382,12 @@ export default {
],
rules: {
username: [
{ required: true, message: '请输入用户名', trigger: 'blur' },
{ min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }
{ required: true, message: i18n.t('User.rules.r2'), trigger: 'blur' },
{ min: 2, max: 20, message: i18n.t('common.Tip12', { min: 2, max: 10 }), trigger: 'blur' }
],
person_name: [
{ required: true, message: '请输入用户姓名', trigger: 'blur' },
{ min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }
{ required: true, message: i18n.t('User.rules.r3'), trigger: 'blur' },
{ min: 2, max: 20, message: i18n.t('common.Tip12', { min: 2, max: 10 }), trigger: 'blur' }
]
},
syncDrawer: false,
@ -409,7 +409,7 @@ export default {
userIds: [],
showData: false,
dataPermissions: [],
dataPermissionTitle: '数据权限'
dataPermissionTitle: i18n.t('User.table.data_reg')
}
},
computed: {
@ -435,7 +435,7 @@ export default {
this.deptTree()
},
created() {
this.crud.msg.add = '新增成功'
this.crud.msg.add = i18n.t('common.add')
},
mounted: function() {
const that = this
@ -465,9 +465,9 @@ export default {
return '#F56C6C'
},
handdeleted(datas) {
this.$confirm(`确认删除选中的1条数据?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
this.$confirm(i18n.t('common.Tip1', { count: 1 }), i18n.t('common.Tips'), {
confirmButtonText: i18n.t('common.Confirm'),
cancelButtonText: i18n.t('common.Cancel'),
type: 'warning'
}).then(() => {
this.crud.delAllLoading = true
@ -509,13 +509,13 @@ export default {
[CRUD.HOOK.afterValidateCU](crud) {
if (!crud.form.depts) {
this.$message({
message: '部门不能为空',
message: i18n.t('User.rules.r4'),
type: 'warning'
})
return false
} else if (this.roleDatas.length === 0) {
this.$message({
message: '角色不能为空',
message: i18n.t('User.rules.r5'),
type: 'warning'
})
return false
@ -708,7 +708,7 @@ export default {
this.dataDialog.person_name = row.person_name
this.dataDialog.username = row.username
this.dataDialog.user_id = row.user_id
this.dataPermissionTitle = '[' + row.person_name + '] 数据权限'
this.dataPermissionTitle = '[' + row.person_name + '] ' + i18n.t('User.table.data_reg')
this.dataPerm = true
//
crudDataPermission.getDataShow(row.user_id).then(res => {
@ -798,7 +798,7 @@ export default {
}
crudDataPermission.saveDataPermission(param).then(res => {
this.dataPerm = false
this.crud.notify('添加数据权限成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.notify(i18n.t('User.msg.m5'), CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
},
@ -814,7 +814,7 @@ export default {
if (this.flag) this.$refs.deptUser.setCheckedKeys([])
},
handleClose(done) {
this.$confirm('确认关闭?')
this.$confirm(i18n.t('common.close'))
.then(_ => {
done()
})
@ -835,7 +835,7 @@ export default {
}
crudUser.edit(user).then(res => {
this.cancelForm()
this.crud.notify('保存成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.notify(i18n.t('common.save'), CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
},

12
nladmin-ui/src/views/system/user/locale/en.js

@ -30,7 +30,8 @@ export default {
'assign_roles': 'Assign Roles',
'locked': 'Lock ',
'activate': 'Activate ',
'role_name': 'Role Name'
'role_name': 'Role Name',
'see': 'View Details'
},
'dialog': {
'role': 'role',
@ -47,13 +48,18 @@ export default {
},
'rules': {
'NotNull': 'Cannot be empty',
'r1': 'Please select a department'
'r1': 'Please select a department',
'r2': 'Please enter your username',
'r3': 'Please enter your username',
'r4': 'Department cannot be empty',
'r5': 'Role cannot be empty'
},
'msg': {
'm1': 'Confirm reset the password?',
'm2': 'Password reset succeeded. Password :123456',
'm3': 'This operation will change {display_name} account: {username}. Do you want to continue?',
'm4': 'Account: {username} has been {display_name}'
'm4': 'Account: {username} has been {display_name}',
'm5': 'Adding the data permission succeeded. Procedure'
}
}
}

12
nladmin-ui/src/views/system/user/locale/in.js

@ -30,7 +30,8 @@ export default {
'assign_roles': 'Jadikan Rol',
'locked': 'Mengunci ',
'activate': 'Aktivasi ',
'role_name': 'Nama Peran'
'role_name': 'Nama Peran',
'see': 'Melihat Rincian'
},
'dialog': {
'role': 'peran',
@ -47,13 +48,18 @@ export default {
},
'rules': {
'NotNull': 'Tidak dapat kosong',
'r1': 'Silakan pilih departemen'
'r1': 'Silakan pilih departemen',
'r2': 'Silakan masukkan nama pengguna Anda',
'r3': 'Silakan masukkan nama pengguna Anda',
'r4': 'Departemen tidak boleh kosong',
'r5': 'Peran tidak boleh kosong'
},
'msg': {
'm1': 'Konfirmasikan setel ulang kata sandi?',
'm2': 'Penyetelan ulang kata sandi berhasil. Kata sandi :123456',
'm3': 'Operasi ini akan mengubah akun {display_name}: {username}.',
'm4': 'Akun: {username} telah menjadi {display_name}'
'm4': 'Akun: {username} telah menjadi {display_name}',
'm5': 'Menambahkan izin data berhasil. Prosedur'
}
}
}

12
nladmin-ui/src/views/system/user/locale/zh.js

@ -30,7 +30,8 @@ export default {
'assign_roles': '分配角色',
'locked': '锁定',
'activate': '激活',
'role_name': '角色名称'
'role_name': '角色名称',
'see': '查看明细'
},
'dialog': {
'role': '角色',
@ -47,13 +48,18 @@ export default {
},
'rules': {
'NotNull': '不能为空',
'r1': '请选择部门'
'r1': '请选择部门',
'r2': '请输入用户名',
'r3': '请输入用户姓名',
'r4': '部门不能为空',
'r5': '角色不能为空'
},
'msg': {
'm1': '确认重置密码?',
'm2': '密码重置成功,密码:123456',
'm3': '此操作将{display_name}账号:{username},是否继续?',
'm4': '账号:{username}已{display_name}'
'm4': '账号:{username}已{display_name}',
'm5': '添加数据权限成功'
}
}
}

Loading…
Cancel
Save