|
|
@@ -109,7 +109,7 @@
|
|
|
<el-form-item label="用户">
|
|
|
<el-select ref="selectOfficer" multiple filterable default-first-option v-model="OfficerList" placeholder="请选择"
|
|
|
style="width: 100%">
|
|
|
- <el-option v-for="item in partuserlist" :key="item.Id" :label="item.Realname" :value="item.Id">
|
|
|
+ <el-option v-for="item in selectuserlist" :key="item.Id" :label="item.Realname" :value="item.Id">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
@@ -292,7 +292,7 @@
|
|
|
// paginate
|
|
|
const params = { _currentPage: this.currentPage, _size: this.size, keyword: this.searchform.name }
|
|
|
// request
|
|
|
- this.$axios.get('/role/list', { params })
|
|
|
+ this.$axios.get('casbin/role/list', { params })
|
|
|
.then(res => {
|
|
|
// response
|
|
|
_this.list = res.data.items
|
|
|
@@ -307,10 +307,11 @@
|
|
|
},
|
|
|
getpartuserlist() {
|
|
|
let _this =this
|
|
|
- this.$axios.get('users/usualwithrole', {})
|
|
|
+ this.$axios.get('casbin/users/list', {})
|
|
|
.then(res => {
|
|
|
// response
|
|
|
_this.partuserlist = res.data.items
|
|
|
+ console.log(this.partuserlist ,'====')
|
|
|
this.userlistfilter()
|
|
|
})
|
|
|
.catch(err => {
|
|
|
@@ -324,6 +325,7 @@
|
|
|
this.OfficerList = ''
|
|
|
},
|
|
|
userlistfilter(){
|
|
|
+ try {
|
|
|
let entityArray = this.userList
|
|
|
let arr = this.partuserlist
|
|
|
if (entityArray == null) {
|
|
|
@@ -341,6 +343,9 @@
|
|
|
}
|
|
|
}
|
|
|
this.selectuserlist = arr
|
|
|
+ } catch (e) {
|
|
|
+ console.log(e)
|
|
|
+ }
|
|
|
},
|
|
|
adduerinrole(){
|
|
|
let _this = this
|
|
|
@@ -359,7 +364,7 @@
|
|
|
let useridlist = tempOfficers.join(',');
|
|
|
let useridliststring = useridlist.toString()
|
|
|
// request
|
|
|
- this.$axios.put('casbin/role/setuserrole/' + useridlist + '_' + this.selectRoleId, {})
|
|
|
+ this.$axios.put('casbin/role/setuserrole/' + useridliststring + '_' + this.selectRoleId, {})
|
|
|
.then(res => {
|
|
|
// response
|
|
|
if (res.data.code === 0) {
|
huahaiyan