@@ -68,21 +68,20 @@ export default {
this.expandedKeys = expandedKeys
},
setFormValues ({...domain}) {
- this.form.getFieldDecorator('domainName')
- this.form.setFieldsValue({'domainName': domain.name})
- this.form.getFieldDecorator('orderNum')
- this.form.setFieldsValue({'orderNum': domain.order})
- this.form.getFieldDecorator('domainId')
- this.form.setFieldsValue({'domainId': domain.domainId})
- this.domain.domainId = domain.domainId
+ this.form.getFieldDecorator('name')
+ this.form.setFieldsValue({'name': domain.name})
+ this.form.getFieldDecorator('domainid')
+ this.form.setFieldsValue({'domainid': domain.domainid})
+ this.form.getFieldDecorator('description')
+ this.form.setFieldsValue({'description': domain.description})
},
handleSubmit () {
this.form.validateFields((err, values) => {
if (!err) {
this.loading = true
let domain = this.form.getFieldsValue()
- domain.domainId = this.domain.domainId
- this.$put('domains', {
+ console.log(domain.domainid)
+ this.$bodyRequest('put', `auth/v1/domains/${domain.domainid}`, {
...domain
}).then(() => {
this.reset()
@@ -96,16 +95,16 @@ export default {
},
watch: {
domainEditVisible () {
- if (this.domainEditVisible) {
- this.$get('menu').then((r) => {
- this.allTreeKeys = r.data.ids
- this.$get('role/menu/' + this.roleInfoData.roleId).then((r) => {
- this.defaultCheckedKeys.splice(0, this.defaultCheckedKeys.length, r.data)
- this.checkedKeys = r.data
- this.expandedKeys = r.data
- })
- })
- }
+ // if (this.domainEditVisible) {
+ // this.$get('menu').then((r) => {
+ // this.allTreeKeys = r.data.ids
+ // this.$get('role/menu/' + this.roleInfoData.roleId).then((r) => {
+ // this.defaultCheckedKeys.splice(0, this.defaultCheckedKeys.length, r.data)
+ // this.checkedKeys = r.data
+ // this.expandedKeys = r.data
+ // })
+ // })
+ // }
}
}
}
diff --git a/ControlPlatform/web/src/views/system/domain/DomainInfo.vue b/ControlPlatform/web/src/views/system/domain/DomainInfo.vue
index ea73b8495..6872ced41 100644
--- a/ControlPlatform/web/src/views/system/domain/DomainInfo.vue
+++ b/ControlPlatform/web/src/views/system/domain/DomainInfo.vue
@@ -8,8 +8,8 @@
@close="close"
:visible="domainInfoVisible"
style="height: calc(100% - 55px);overflow: auto;padding-bottom: 53px;">
-
域名称：{{domainInfoData.roleName}}
-
域描述：{{domainInfoData.remark}}
+
域名称：{{domainInfoData.name}}
+
域描述：{{domainInfoData.description}}
创建时间：{{domainInfoData.createTime}}
修改时间：{{domainInfoData.modifyTime? domainInfoData.modifyTime : '暂未修改'}}
diff --git a/ControlPlatform/web/src/views/system/role/Role.vue b/ControlPlatform/web/src/views/system/role/Role.vue
index 50dbc6e30..699345d8b 100644
--- a/ControlPlatform/web/src/views/system/role/Role.vue
+++ b/ControlPlatform/web/src/views/system/role/Role.vue
@@ -142,7 +142,7 @@ export default {
}, {
title: '描述',
dataIndex: 'description',
- scopedSlots: {customRender: 'remark'},
+ scopedSlots: {customRender: 'description'},
width: 350
}, {
title: '名称',
diff --git a/ControlPlatform/web/src/views/system/role/RoleAdd.vue b/ControlPlatform/web/src/views/system/role/RoleAdd.vue
index 87386d364..c36362b09 100644
--- a/ControlPlatform/web/src/views/system/role/RoleAdd.vue
+++ b/ControlPlatform/web/src/views/system/role/RoleAdd.vue
@@ -86,8 +86,7 @@ export default {
menuSelectHelp: '',
role: {
roleName: '',
- remark: '',
- menuId: ''
+ description: ''
},
checkedKeys: [],
expandedKeys: [],
@@ -120,32 +119,28 @@ export default {
disableRelate () {
this.checkStrictly = true
},
- handleCheck (checkedKeys) {
- this.checkedKeys = checkedKeys
- let checkedArr = Object.is(checkedKeys.checked, undefined) ? checkedKeys : checkedKeys.checked
- if (checkedArr.length) {
- this.menuSelectStatus = ''
- this.menuSelectHelp = ''
- } else {
- this.menuSelectStatus = 'error'
- this.menuSelectHelp = '请选择相应的权限'
- }
- },
+ // handleCheck (checkedKeys) {
+ // this.checkedKeys = checkedKeys
+ // let checkedArr = Object.is(checkedKeys.checked, undefined) ? checkedKeys : checkedKeys.checked
+ // if (checkedArr.length) {
+ // this.menuSelectStatus = ''
+ // this.menuSelectHelp = ''
+ // } else {
+ // this.menuSelectStatus = 'error'
+ // this.menuSelectHelp = '请选择相应的权限'
+ // }
+ // },
handleExpand (expandedKeys) {
this.expandedKeys = expandedKeys
},
handleSubmit () {
- let checkedArr = Object.is(this.checkedKeys.checked, undefined) ? this.checkedKeys : this.checkedKeys.checked
+ // let checkedArr = Object.is(this.checkedKeys.checked, undefined) ? this.checkedKeys : this.checkedKeys.checked
if (this.validateStatus !== 'success') {
this.handleRoleNameBlur()
- } else if (checkedArr.length === 0) {
- this.menuSelectStatus = 'error'
- this.menuSelectHelp = '请选择相应的权限'
} else {
this.form.validateFields((err, values) => {
if (!err) {
this.loading = true
- this.role.menuId = checkedArr.join(',')
this.$bodyRequest('post', '/auth/v1/roles', {
...this.role
}).then((r) => {
diff --git a/ControlPlatform/web/src/views/system/role/RoleEdit.vue b/ControlPlatform/web/src/views/system/role/RoleEdit.vue
index ef3df15cf..9b7937be1 100644
--- a/ControlPlatform/web/src/views/system/role/RoleEdit.vue
+++ b/ControlPlatform/web/src/views/system/role/RoleEdit.vue
@@ -82,9 +82,7 @@ export default {
form: this.$form.createForm(this),
menuSelectStatus: '',
menuSelectHelp: '',
- role: {
- menuId: ''
- },
+ role: {},
menuTreeData: [],
allTreeKeys: [],
checkedKeys: [],
@@ -145,28 +143,27 @@ export default {
})
},
handleSubmit () {
- let checkedArr = Object.is(this.checkedKeys.checked, undefined) ? this.checkedKeys : this.checkedKeys.checked
- if (checkedArr.length === 0) {
- this.menuSelectStatus = 'error'
- this.menuSelectHelp = '请选择相应的权限'
- } else {
- this.form.validateFields((err, values) => {
- if (!err) {
- this.loading = true
- let role = this.form.getFieldsValue()
- role.roleId = this.roleInfoData.roleId
- role.menuId = checkedArr.join(',')
- this.$bodyRequest('put', 'auth/v1/roles', {
- ...role
- }).then((r) => {
- this.reset()
- this.$emit('success')
- }).catch(() => {
- this.loading = false
- })
- }
- })
- }
+ // let checkedArr = Object.is(this.checkedKeys.checked, undefined) ? this.checkedKeys : this.checkedKeys.checked
+ // if (checkedArr.length === 0) {
+ // this.menuSelectStatus = 'error'
+ // this.menuSelectHelp = '请选择相应的权限'
+ // } else {
+ this.form.validateFields((err, values) => {
+ if (!err) {
+ this.loading = true
+ let role = this.form.getFieldsValue()
+ role.roleid = this.roleInfoData.roleid
+ this.$bodyRequest('put', 'auth/v1/roles', {
+ ...role
+ }).then((r) => {
+ this.reset()
+ this.$emit('success')
+ }).catch(() => {
+ this.loading = false
+ })
+ }
+ })
+ // }
}
},
watch: {
diff --git a/ControlPlatform/web/src/views/system/user/User.vue b/ControlPlatform/web/src/views/system/user/User.vue
index 336e62269..55ed7fd2d 100644
--- a/ControlPlatform/web/src/views/system/user/User.vue
+++ b/ControlPlatform/web/src/views/system/user/User.vue
@@ -234,7 +234,7 @@ export default {
},
handleUserAddSuccess () {
this.userAdd.visible = false
- this.$message.success('新增用户成功，初始密码为1234qwer')
+ this.$message.success('新增用户成功')
this.search()
},
edit (record) {
@@ -252,9 +252,6 @@ export default {
handleUserInfoClose () {
this.userInfo.visible = false
},
- handleDeptChange (value) {
- this.queryParams.deptId = value || ''
- },
handleDateChange (value) {
if (value) {
this.queryParams.createTimeFrom = value[0]
diff --git a/ControlPlatform/web/src/views/system/user/UserAdd.vue b/ControlPlatform/web/src/views/system/user/UserAdd.vue
index d76443643..606d8fd79 100644
--- a/ControlPlatform/web/src/views/system/user/UserAdd.vue
+++ b/ControlPlatform/web/src/views/system/user/UserAdd.vue
@@ -98,7 +98,7 @@ export default {
data () {
return {
user: {
- username: ''
+ name: ''
},
loading: false,
roleData: [],
@@ -114,7 +114,7 @@ export default {
reset () {
this.validateStatus = ''
this.help = ''
- this.user.username = ''
+ this.user.name = ''
this.loading = false
this.form.resetFields()
},
@@ -129,8 +129,7 @@ export default {
this.form.validateFields((err, values) => {
if (!err && this.validateStatus === 'success') {
this.loading = true
- this.user.roleId = this.user.roleId.join(',')
- this.$post('user', {
+ this.$post('auth/v1/users', {
...this.user
}).then((r) => {
this.reset()