diff --git a/src/api/user.js b/src/api/user.js index b14bdf3a..b53901b1 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -12,6 +12,8 @@ import { export function login({ userName, password, + roleUuid, + organizationUuid, token }) { return requestRest({ @@ -20,6 +22,8 @@ export function login({ data: { username: userName, password, + role_uuid: roleUuid, + organization_uuid: organizationUuid, token } }) diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 821a0fd4..22b459aa 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -107,6 +107,13 @@ const actions = { token }) { return new Promise((resolve, reject) => { + console.log({ + userName, + password, + roleUuid, + organizationUuid, + token + }) login({ userName, password, diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 6c2d77b8..ab5e9183 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -119,7 +119,9 @@ export default { return { loginForm: { userName: '', - password: '' + password: '', + roleUuid: '', + organizationUuid: '' }, loginRules: { userName: [{ required: true, trigger: 'blur', validator: validateUsername }], @@ -169,8 +171,8 @@ export default { if (!this.isEmptyValue(query)) { this.loginForm = { ...this.loginForm, - roleId: this.clientIdRedirect(query, expr), - organizationId: this.organizationIdRedirect(query, expr) + roleUuid: this.clientIdRedirect(query, expr), + organizationUuid: this.organizationIdRedirect(query, expr) } } this.$refs.loginForm.validate(valid => {