diff --git a/.env.development b/.env.development index 82d8d16..c5af22d 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -VITE_API_BASE='https://hwjb.homilychart.com/dev/admin' -# VITE_API_BASE='http://192.168.9.28:8081/' +# VITE_API_BASE='https://hwjb.homilychart.com/dev/admin' + VITE_API_BASE='http://192.168.9.28:8081/' VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload diff --git a/src/views/permissions/permission.vue b/src/views/permissions/permission.vue index a2be56f..16d2c64 100644 --- a/src/views/permissions/permission.vue +++ b/src/views/permissions/permission.vue @@ -722,7 +722,7 @@ const getLists = async function () { data: { id: roleId } }) data.value = res.data - if(addRole.value.roleId ==null ||addRole.value.roleId ==undefined){ + if(addRole.value.parentId ==null ||addRole.value.parentId ==undefined){ data.value = data.value }else if (addRole.value.parentId != 2) { data.value = data.value.filter(item => item.id !== 9); @@ -737,11 +737,14 @@ const getLists = async function () { if (result.code == 200) { if (typeof result.data === 'string' && result.data) { addRoleMarket.value = result.data.split(','); + addRole.value.market = '' } else if (Array.isArray(result.data)) { addRoleMarket.value = result.data + addRole.value.market = '' } else { addRoleMarket.value = []; + addRole.value.market = '' } } else { ElMessage.error('该上级角色无所属地区') @@ -752,11 +755,14 @@ const getLists = async function () { } else { if (typeof adminData.value.markets === 'string' && adminData.value.markets) { addRoleMarket.value = adminData.value.markets.split(','); + addRole.value.market = '' } else if (Array.isArray(adminData.value.markets)) { addRoleMarket.value = adminData.value.markets + addRole.value.market = '' } else { addRoleMarket.value = []; + addRole.value.market = '' } } @@ -1425,17 +1431,17 @@ onMounted(async function () { - - - - - - + + + + + +