diff --git a/backend/dvadmin/system/views/role_menu_button_permission.py b/backend/dvadmin/system/views/role_menu_button_permission.py index d44fab2b547d7e1380003293f521a6a1a3e327c2..3455d92ac606dbb08f0f75f37ff215c100da022d 100644 --- a/backend/dvadmin/system/views/role_menu_button_permission.py +++ b/backend/dvadmin/system/views/role_menu_button_permission.py @@ -256,86 +256,45 @@ class RoleMenuButtonPermissionViewSet(CustomModelViewSet): is_superuser = request.user.is_superuser if is_superuser: data = [ - { - "value": 0, - "label": '仅本人数据权限' - }, - { - "value": 1, - "label": '本部门及以下数据权限' - }, - { - "value": 2, - "label": '本部门数据权限' - }, - { - "value": 3, - "label": '全部数据权限' - }, - { - "value": 4, - "label": '自定义数据权限' - } + {"value": 0, "label": '仅本人数据权限'}, + {"value": 1, "label": '本部门及以下数据权限'}, + {"value": 2, "label": '本部门数据权限'}, + {"value": 3, "label": '全部数据权限'}, + {"value": 4, "label": '自定义数据权限'} ] return DetailResponse(data=data) else: - data = [] + params = request.query_params + data = [{"value": 0, "label": '仅本人数据权限'}] role_list = request.user.role.values_list('id', flat=True) - if params := request.query_params: - if menu_button_id := params.get('menu_button', None): - role_queryset = RoleMenuButtonPermission.objects.filter( - role__in=role_list, menu_button__id=menu_button_id - ).values_list('data_range', flat=True) - data_range_list = list(set(role_queryset)) - for item in data_range_list: - if item == 0: - data = [{ - "value": 0, - "label": '仅本人数据权限' - }] - elif item == 1: - data = [{ - "value": 0, - "label": '仅本人数据权限' - }, { - "value": 1, - "label": '本部门及以下数据权限' - }, - { - "value": 2, - "label": '本部门数据权限' - }] - elif item == 2: - data = [{ - "value": 0, - "label": '仅本人数据权限' - }, - { - "value": 2, - "label": '本部门数据权限' - }] - elif item == 3: - data = [{ - "value": 0, - "label": '仅本人数据权限' - }, - { - "value": 3, - "label": '全部数据权限' - }, ] - elif item == 4: - data = [{ - "value": 0, - "label": '仅本人数据权限' - }, - { - "value": 4, - "label": '自定义数据权限' - }] - else: - data = [] - return DetailResponse(data=data) - return ErrorResponse(msg="参数错误") + # 权限页面进入初始化获取所有的数据权限范围 + role_queryset = RoleMenuButtonPermission.objects.filter( + role__in=role_list + ).values_list('data_range', flat=True) + # 通过按钮小齿轮获取指定按钮的权限 + if menu_button_id := params.get('menu_button', None): + role_queryset = RoleMenuButtonPermission.objects.filter( + role__in=role_list, menu_button__id=menu_button_id + ).values_list('data_range', flat=True) + + data_range_list = list(set(role_queryset)) + for item in data_range_list: + if item == 0: + data = data + elif item == 1: + data.extend([ + {"value": 1, "label": '本部门及以下数据权限'}, + {"value": 2, "label": '本部门数据权限'} + ]) + elif item == 2: + data.extend([{"value": 2, "label": '本部门数据权限'}]) + elif item == 3: + data.extend([{"value": 3, "label": '全部数据权限'}]) + elif item == 4: + data.extend([{"value": 4, "label": '自定义数据权限'}]) + else: + data = [] + return DetailResponse(data=data) @action(methods=['get'], detail=False, permission_classes=[IsAuthenticated]) def role_to_dept_all(self, request): @@ -344,23 +303,23 @@ class RoleMenuButtonPermissionViewSet(CustomModelViewSet): :param request: :return: """ - params = request.query_params is_superuser = request.user.is_superuser - if is_superuser: - queryset = Dept.objects.values('id', 'name', 'parent') - else: - if not params: - return ErrorResponse(msg="参数错误") - menu_button = params.get('menu_button') - if menu_button is None: - return ErrorResponse(msg="参数错误") - role_list = request.user.role.values_list('id', flat=True) - queryset = RoleMenuButtonPermission.objects.filter(role__in=role_list, menu_button=None).values( - dept_id=F('dept__id'), - name=F('dept__name'), - parent=F('dept__parent') - ) - return DetailResponse(data=queryset) + params = request.query_params + role_id = params.get('role') + menu_button_id = params.get('menu_button') + dept_checked = RoleMenuButtonPermission.objects.filter( + role_id=role_id, menu_button_id=menu_button_id + ).values_list('dept', flat=True) + dept_list = Dept.objects.values('id', 'name', 'parent') + data = { + 'depts': [], + 'dept_checked': [i for i in dept_checked if i is not None] + } + + for dept in dept_list: + dept["disabled"] = False if is_superuser else dept["id"] not in dept_checked + data['depts'].append(dept) + return DetailResponse(data=data) @action(methods=['get'], detail=False, permission_classes=[IsAuthenticated]) def menu_to_button(self, request): diff --git a/web/src/views/system/login/component/account.vue b/web/src/views/system/login/component/account.vue index ee4e64fa68719ae74a58ca2b10f49e5ea1749685..def80eb717c9131f2d266914a82b7ee07c02aef1 100644 --- a/web/src/views/system/login/component/account.vue +++ b/web/src/views/system/login/component/account.vue @@ -80,8 +80,8 @@ export default defineComponent({ const state = reactive({ isShowPassword: false, ruleForm: { - username: '', - password: '', + username: 'superadmin', + password: 'admin123456', captcha: '', captchaKey: '', captchaImgBase: '', diff --git a/web/src/views/system/role/components/PermissionComNew/api.ts b/web/src/views/system/role/components/PermissionComNew/api.ts index eee6d2a16de84d1fcb0db5f830c77eaff283f943..68793c06dec6d8d781ce640a5c09c03212c04eb2 100644 --- a/web/src/views/system/role/components/PermissionComNew/api.ts +++ b/web/src/views/system/role/components/PermissionComNew/api.ts @@ -40,10 +40,11 @@ export function getDataPermissionRangeAll() { method: 'get', }) } -export function getDataPermissionDept() { +export function getDataPermissionDept(query:object) { return request({ url: '/api/system/role_menu_button_permission/role_to_dept_all/', - method: 'get' + method: 'get', + params:query }) } diff --git a/web/src/views/system/role/components/PermissionComNew/index.vue b/web/src/views/system/role/components/PermissionComNew/index.vue index 7770b05bc10163511cf773da941bf21fe143711a..29a8ab3f829c925cd65bf8e1bc59e997e81096de 100644 --- a/web/src/views/system/role/components/PermissionComNew/index.vue +++ b/web/src/views/system/role/components/PermissionComNew/index.vue @@ -29,7 +29,7 @@ :label="btn.value">
{{ btn.data_range !== null ? `${btn.name}(${formatDataRange(btn.data_range)})` : btn.name }} - + @@ -124,6 +124,7 @@ watch( (val) => { drawerVisible.value = val; getMenuBtnPermission() + getDataPermissionRangeLable() } ); @@ -144,9 +145,10 @@ let menuCurrent = ref>({}); let menuBtnCurrent = ref(-1); let dialogVisible = ref(false); let dataPermissionRange = ref([]); +let dataPermissionRangeLabel = ref([]); const formatDataRange = computed(() => { return function (datarange: number) { - const findItem = dataPermissionRange.value.find((i) => i.value === datarange); + const findItem = dataPermissionRangeLabel.value.find((i) => i.value === datarange); return findItem?.label || '' } }) @@ -158,8 +160,13 @@ const getMenuBtnPermission = async () => { const resMenu = await getRolePremission({ role: props.roleId }) menuData.value = resMenu.data } +// 获取按钮的数据权限下拉选项 +const getDataPermissionRangeLable = async () => { + const resRange = await getDataPermissionRange({ role: props.roleId }) + dataPermissionRangeLabel.value = resRange.data; +} -const fetchData = async (btnId) => { +const fetchData = async (btnId:number) => { try { const resRange = await getDataPermissionRange({menu_button:btnId}); if (resRange?.code === 2000) { @@ -170,20 +177,22 @@ const fetchData = async (btnId) => { } }; -const handleCollapseChange = (val: number) => { - collapseCurrent.value = [val]; -}; +// const handleCollapseChange = (val: number) => { +// collapseCurrent.value = [val]; +// }; /** * 设置按钮数据权限 * @param record 当前菜单 * @param btnType 按钮类型 */ -const handleSettingClick = (record: MenusType, btnId: number) => { +const handleSettingClick = (record: MenusType, btn: MenusType['btns'][number]) => { menuCurrent.value = record; - menuBtnCurrent.value = btnId; + menuBtnCurrent.value = btn.id; dialogVisible.value = true; - fetchData(btnId) + dataPermission.value =btn.data_range; + handlePermissionRangeChange(btn.data_range) + fetchData( btn.id) }; const handleColumnChange = (val: boolean, record: MenusType, btnType: string) => { @@ -194,9 +203,10 @@ const handleColumnChange = (val: boolean, record: MenusType, btnType: string) => const handlePermissionRangeChange = async (val: number) => { if (val === 4) { - const res = await getDataPermissionDept(); - const data = XEUtils.toArrayTree(res.data, { parentKey: 'parent', strict: false }); - deptData.value = data; + const res = await getDataPermissionDept({ role: props.roleId,menu_button:menuBtnCurrent.value }); + const depts = XEUtils.toArrayTree(res.data.depts, { parentKey: 'parent', strict: false }); + deptData.value = depts; + customDataPermission.value = res.data.dept_checked; } };