diff --git a/src/api/system/login.ts b/src/api/system/login.ts index 054d70d..e8c6dd1 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -30,7 +30,7 @@ // 获取用户权限(菜单、按钮) export function getUserMenus(params: { resourceType: string; parentCode: string }) { - return request1.get(`${prefix}user/permission`, { params }) + return request.get(`${prefix}user/permission`, { params }) } // 登出 diff --git a/src/api/system/login.ts b/src/api/system/login.ts index 054d70d..e8c6dd1 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -30,7 +30,7 @@ // 获取用户权限(菜单、按钮) export function getUserMenus(params: { resourceType: string; parentCode: string }) { - return request1.get(`${prefix}user/permission`, { params }) + return request.get(`${prefix}user/permission`, { params }) } // 登出 diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index a2a96fb..9f8c8ff 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -353,30 +353,30 @@ auth: '/tested/device/model', }, children: [ - // { - // path: '/dmodel', - // name: 'DeviceModelPage', - // component: () => import('@/views/tested/device/model/index.vue'), - // meta: { - // title: '设备规格型号管理', - // auth: '/tested/device/model', - // sidebar: false, - // breadcrumb: false, - // activeMenu: '/modellist', - // }, - // }, - // { - // path: '/dmodel/:type', - // name: 'ModelEdit', - // component: () => import('@/views/tested/device/model/components/edit.vue'), - // meta: { - // title: '设备规格型号管理', - // auth: '/tested/device/model', - // sidebar: false, - // breadcrumb: false, - // activeMenu: '/modellist', - // }, - // }, + { + path: '/dmodel', + name: 'DeviceModelPage', + component: () => import('@/views/tested/device/model/index.vue'), + meta: { + title: '设备规格型号管理', + auth: '/tested/device/model', + sidebar: false, + breadcrumb: false, + activeMenu: '/modellist', + }, + }, + { + path: '/dmodel/:type', + name: 'ModelEdit', + component: () => import('@/views/tested/device/model/components/edit.vue'), + meta: { + title: '设备规格型号管理', + auth: '/tested/device/model', + sidebar: false, + breadcrumb: false, + activeMenu: '/modellist', + }, + }, ], }, {