diff --git a/src/api/system/menu.ts b/src/api/system/menu.ts index 4e1a19e..5e9fd14 100644 --- a/src/api/system/menu.ts +++ b/src/api/system/menu.ts @@ -5,7 +5,7 @@ import { http } from '@/utils/http/axios'; */ export function adminMenus() { return http.request({ - url: '/menus', + url: '/index/getMenus', method: 'GET', }); } diff --git a/src/api/system/role.ts b/src/api/system/role.ts index e40370e..7114082 100644 --- a/src/api/system/role.ts +++ b/src/api/system/role.ts @@ -10,3 +10,10 @@ export function getRoleList(params?) { params, }); } +export function getRoleAllList(params?) { + return http.request({ + url: '/role/list', + method: 'GET', + params, + }); +} diff --git a/src/components/Table/src/Table.vue b/src/components/Table/src/Table.vue index 8930faa..13b36f4 100644 --- a/src/components/Table/src/Table.vue +++ b/src/components/Table/src/Table.vue @@ -102,11 +102,12 @@
diff --git a/src/layout/components/Logo/index.vue b/src/layout/components/Logo/index.vue index 931ad63..fc49871 100644 --- a/src/layout/components/Logo/index.vue +++ b/src/layout/components/Logo/index.vue @@ -9,7 +9,7 @@

NaiveElement

云恒WMS diff --git a/src/router/generator-routers.ts b/src/router/generator-routers.ts index 0123faf..3af649b 100644 --- a/src/router/generator-routers.ts +++ b/src/router/generator-routers.ts @@ -3,6 +3,8 @@ import { constantRouterIcon } from './router-icons'; import { RouteRecordRaw } from 'vue-router'; import { Layout, ParentLayout } from '@/router/constant'; import type { AppRouteRecordRaw } from '@/router/types'; +import { DashboardOutlined, TableOutlined } from '@vicons/antd'; +import { renderIcon } from '@/utils/index'; const Iframe = () => import('@/views/iframe/index.vue'); const LayoutMap = new Map Promise>(); @@ -18,9 +20,16 @@ LayoutMap.set('IFRAME', Iframe); */ export const routerGenerator = (routerMap, parent?): any[] => { return routerMap.map((item) => { + item.meta = { + title:item.name, + icon:renderIcon(DashboardOutlined), + sort:item.sort, + permissions:item.permission + } + const components ='' const currentRouter: any = { // 路由地址 动态拼接生成如 /dashboard/workplace - path: `${(parent && parent.path) || ''}/${item.path}`, + path: `${item.path}`, // 路由名称，建议唯一 name: item.name || '', // 该路由对应页面的 组件 @@ -29,7 +38,7 @@ export const routerGenerator = (routerMap, parent?): any[] => { meta: { ...item.meta, label: item.meta.title, - icon: constantRouterIcon[item.meta.icon] || null, + icon: renderIcon(DashboardOutlined) || null, permissions: item.meta.permissions || null, }, }; @@ -41,7 +50,7 @@ export const routerGenerator = (routerMap, parent?): any[] => { // 是否有子菜单，并递归处理 if (item.children && item.children.length > 0) { //如果未定义 redirect 默认第一个子路由为 redirect - !item.redirect && (currentRouter.redirect = `${item.path}/${item.children[0].path}`); + !item.redirect && (currentRouter.redirect = `${item.children[0].path}`); // Recursion currentRouter.children = routerGenerator(item.children, currentRouter); } @@ -88,7 +97,7 @@ export const asyncImportRoute = (routes: AppRouteRecordRaw[] | undefined): void item.component = dynamicImport(viewsModules, component as string); } } else if (name) { - item.component = ParentLayout; + item.component = Layout; } children && asyncImportRoute(children); }); diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts index 1409ca5..629aada 100644 --- a/src/router/modules/system.ts +++ b/src/router/modules/system.ts @@ -48,7 +48,7 @@ const routes: Array = [ meta: { title: '角色管理', }, - component: () => import('@/views/system/role/role.vue'), + component: () => import('@/views/system/role/index.vue'), }, { path: 'dictionary', diff --git a/src/settings/componentSetting.ts b/src/settings/componentSetting.ts index 3dd883a..0bf8367 100644 --- a/src/settings/componentSetting.ts +++ b/src/settings/componentSetting.ts @@ -2,9 +2,9 @@ export default { table: { apiSetting: { // 当前页的字段名 - pageField: 'pageNo', + pageField: 'current', // 每页数量字段名 - sizeField: 'pageSize', + sizeField: 'size', // 接口返回的数据字段名 listField: 'records', // 接口返回总页数字段名 diff --git a/src/views/system/menu/menu.vue b/src/views/system/menu/index.vue similarity index 97% rename from src/views/system/menu/menu.vue rename to src/views/system/menu/index.vue index 2b852b4..522114f 100644 --- a/src/views/system/menu/menu.vue +++ b/src/views/system/menu/index.vue @@ -1,5 +1,5 @@