xuziqiang/SaaS-lib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: 权限排序异常

Browse Source
This commit is contained in:
xuziqiang
2024-06-19 16:22:19 +08:00
parent 5d7d8cc4de
commit 8a554f5871
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hx-ai-intelligent/src/config/app.config.ts
View File

@@ -19,7 +19,7 @@ export const appConfig = {
projectType: 'web', projectType: 'web',
baseApi: '/api', baseApi: '/api',
projectName: '济阳站_AI智能BAS系统', projectName: '济阳站_AI智能BAS系统',
enablePermissions: false, enablePermissions: true,
// themeColor: '#eee', // themeColor: '#eee',
siderPosition: 'left', siderPosition: 'left',
baseHeader: '/parkingManage', baseHeader: '/parkingManage',

5
hx-ai-intelligent/src/view/organizationManage/usermanage/index.vue
View File

@@ -200,7 +200,6 @@
opMap.value.fuc && opMap.value.fuc &&
opMap.value.fuc({ ...formData.value, userRoleList: userAuthList.value, orgId }); opMap.value.fuc({ ...formData.value, userRoleList: userAuthList.value, orgId });
visible.value = false;
}); });
}; };
@@ -242,7 +241,7 @@
userAuthList.value.splice(0); userAuthList.value.splice(0);
}); });
opMap.value.fuc = (formData: any) => { opMap.value.fuc = (formData: any) => {
http.post(origanizemanage.addUser, formData).then(() => { return http.post(origanizemanage.addUser, formData).then(() => {
mainRef.value?.nsTableRef.reload(); mainRef.value?.nsTableRef.reload();
visible.value = false; visible.value = false;
NsMessage.success('操作成功'); NsMessage.success('操作成功');
@@ -370,7 +369,7 @@
}, 10); }, 10);
opMap.value.type = 'edit'; opMap.value.type = 'edit';
opMap.value.fuc = (formData: any) => { opMap.value.fuc = (formData: any) => {
http.post(origanizemanage.editUser, formData).then(() => { return http.post(origanizemanage.editUser, formData).then(() => {
mainRef.value?.nsTableRef.reload(); mainRef.value?.nsTableRef.reload();
visible.value = false; visible.value = false;
NsMessage.success('操作成功'); NsMessage.success('操作成功');

2
lib/saas/router/helper/route-helper.ts
View File

@@ -21,7 +21,7 @@ export function transformRouteToMenu(route: RouteRecordRaw, parentCode = '') {
const _menu: ModuleMenu = { const _menu: ModuleMenu = {
code, code,
icon: (route.meta?.icon || ' ') as string, icon: (route.meta?.icon || ' ') as string,
sort: (route.meta?.index || 999) as number, sort: (isNumber(route.meta?.index) ? route.meta?.index : 999) as number,
label: (route.meta?.title || ' ') as string, label: (route.meta?.title || ' ') as string,
type: (route.meta?.type || 'menus') as string, type: (route.meta?.type || 'menus') as string,
// name: dealOp(route) as string, // name: dealOp(route) as string,

11
lib/saas/store/modules/route.ts
View File

@@ -65,6 +65,7 @@ export const useRouteStore = defineStore({
routeModule[i].menus && loop(routeModule[i].menus); routeModule[i].menus && loop(routeModule[i].menus);
} }
} }
loop(this.routeModule); loop(this.routeModule);
this.routeModuleObject = routeModuleObject; this.routeModuleObject = routeModuleObject;
function loopRoute(routeList) { function loopRoute(routeList) {
@@ -90,9 +91,10 @@ export const useRouteStore = defineStore({
}); });
// const initPcResource = { application: {}, menus: [] }; // const initPcResource = { application: {}, menus: [] };
let initPcResource = []; let initPcResource = [];
// this.routeModule.sort((a, b) => {
// return a.route?.meta?.index - b.route?.meta?.index; this.routeModule.sort((a, b) => {
// }); return a.route?.meta?.index - b.route?.meta?.index;
});
const info = JSON.parse(JSON.stringify(this.routeModule)); const info = JSON.parse(JSON.stringify(this.routeModule));
initRouteMouleList(info); initRouteMouleList(info);
function initRouteMouleList(info) { function initRouteMouleList(info) {
@@ -116,9 +118,6 @@ export const useRouteStore = defineStore({
}); });
} }
// initPcResource.application = appConfig.resourceInfo?.application as object; // initPcResource.application = appConfig.resourceInfo?.application as object;
console.log(info);
return;
initPcResource = appConfig.resourceInfo?.dealReosurceList initPcResource = appConfig.resourceInfo?.dealReosurceList
? appConfig.resourceInfo?.dealReosurceList(info) ? appConfig.resourceInfo?.dealReosurceList(info)
: info; : info;