|
@@ -621,6 +621,8 @@ export default {
|
|
// 角色取消按钮
|
|
// 角色取消按钮
|
|
jscancel() {
|
|
jscancel() {
|
|
this.jsopen = false;
|
|
this.jsopen = false;
|
|
|
|
+ this.userRoleId = ''
|
|
|
|
+ this.menuOptions=[]
|
|
},
|
|
},
|
|
// 表单重置
|
|
// 表单重置
|
|
reset() {
|
|
reset() {
|
|
@@ -1099,27 +1101,30 @@ export default {
|
|
const a = this.$axios
|
|
const a = this.$axios
|
|
const _this = this
|
|
const _this = this
|
|
return new Promise(async function (resolve, reject) {
|
|
return new Promise(async function (resolve, reject) {
|
|
- // let sysTime
|
|
|
|
- // let lk
|
|
|
|
- // await a.get('/sysPolicyController/getLicenseKey').then((res) => {
|
|
|
|
- // sysTime = res.data.sysTime
|
|
|
|
- // lk = res.data.lk
|
|
|
|
- // }).catch((error) => {
|
|
|
|
- // })
|
|
|
|
- //
|
|
|
|
- // var userRoleParams = {
|
|
|
|
- // userId: userid,
|
|
|
|
- // sysTime: sysTime,
|
|
|
|
- // lk: lk
|
|
|
|
- // }
|
|
|
|
- // await a.get('/sysUserController/getUserRole',
|
|
|
|
- // {params: userRoleParams}).then(res => {
|
|
|
|
- // console.log(res)
|
|
|
|
- // _this.userRoleId = res.data.roleId
|
|
|
|
- //
|
|
|
|
- // // 返回userRole对象
|
|
|
|
- // resolve(res.data)
|
|
|
|
- // })
|
|
|
|
|
|
+ let sysTime
|
|
|
|
+ let lk
|
|
|
|
+ await a.get('/sysPolicyController/getLicenseKey').then((res) => {
|
|
|
|
+ sysTime = res.data.sysTime
|
|
|
|
+ lk = res.data.lk
|
|
|
|
+ }).catch((error) => {
|
|
|
|
+ })
|
|
|
|
+
|
|
|
|
+ var userRoleParams = {
|
|
|
|
+ userId: userid,
|
|
|
|
+ sysTime: sysTime,
|
|
|
|
+ lk: lk
|
|
|
|
+ }
|
|
|
|
+ await a.get('/sysUserController/getUserRole',
|
|
|
|
+ {params: userRoleParams}).then(res => {
|
|
|
|
+ if (res.data==undefined){
|
|
|
|
+ _this.userRoleId = ''
|
|
|
|
+ }
|
|
|
|
+ else{
|
|
|
|
+ _this.userRoleId = res.data.roleId
|
|
|
|
+ }
|
|
|
|
+ // 返回userRole对象
|
|
|
|
+ resolve(res.data)
|
|
|
|
+ })
|
|
|
|
|
|
let sysTime1
|
|
let sysTime1
|
|
let lk1
|
|
let lk1
|