diff --git a/ruoyi-ui/src/utils/request.js b/ruoyi-ui/src/utils/request.js index 1a02a0a..03a3d2c 100644 --- a/ruoyi-ui/src/utils/request.js +++ b/ruoyi-ui/src/utils/request.js @@ -17,7 +17,7 @@ const service = axios.create({ // axios中请求配置有baseURL选项,表示请求URL公共部分 baseURL: process.env.VUE_APP_BASE_API, // 超时 - timeout: 10000 + timeout: 180000 }) // request拦截器 diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue index 522120c..8593c22 100644 --- a/ruoyi-ui/src/views/system/user/index.vue +++ b/ruoyi-ui/src/views/system/user/index.vue @@ -179,7 +179,8 @@ --> - + + @@ -217,6 +218,7 @@ 取 消 + @@ -483,7 +485,8 @@ export default { this.postOptions = response.posts this.roleOptions = response.roles this.$set(this.form, "postIds", response.postIds) - this.$set(this.form, "roleIds", response.roleIds) + // this.$set(this.form, "roleIds", response.roleIds); + this.$set(this.form, "roleIds", response.roleIds[0]) this.open = true this.title = "修改用户" this.form.password = "" @@ -517,14 +520,16 @@ export default { submitForm: function() { this.$refs["form"].validate(valid => { if (valid) { + let RoleIds = [this.form.roleIds]; + let FormData = {...this.form, roleIds: RoleIds} if (this.form.userId != undefined) { - updateUser(this.form).then(response => { + updateUser(FormData).then(response => { this.$modal.msgSuccess("修改成功") this.open = false this.getList() }) } else { - addUser(this.form).then(response => { + addUser(FormData).then(response => { this.$modal.msgSuccess("新增成功") this.open = false this.getList()