diff --git a/src/api/commonApi.ts b/src/api/commonApi.ts index 7486eba..129f9cb 100644 --- a/src/api/commonApi.ts +++ b/src/api/commonApi.ts @@ -173,4 +173,10 @@ export class commonService { params }) } + //仪表盘选择下拉 + static getDashboardSelect() { + return request.get({ + url: '/admin/resources/list/menu?is_home=1' + }) + } } diff --git a/src/api/systemApi.ts b/src/api/systemApi.ts index 458e369..0d75af3 100644 --- a/src/api/systemApi.ts +++ b/src/api/systemApi.ts @@ -310,4 +310,39 @@ export class systemService { params }) } + //仪表盘设置列表 + static getDashboardList(params: any) { + return request.get({ + url: '/admin/dashboard/rule/list', + params + }) + } + //仪表盘设置新增 + static dashboardAdd(params: any) { + return request.post({ + url: '/admin/dashboard/rule/store', + params + }) + } + //仪表盘设置详情 + static dashboardDetail(params: any) { + return request.get({ + url: '/admin/dashboard/rule/show', + params + }) + } + //仪表盘设置编辑 + static dashboardEdit(params: any) { + return request.post({ + url: '/admin/dashboard/rule/update', + params + }) + } + //仪表盘设置删除 + static dashboardDelete(params: any) { + return request.post({ + url: '/admin/dashboard/rule/destroy', + params + }) + } } diff --git a/src/components/core/layouts/art-header-bar/index.vue b/src/components/core/layouts/art-header-bar/index.vue index 04600f3..a2c37cf 100644 --- a/src/components/core/layouts/art-header-bar/index.vue +++ b/src/components/core/layouts/art-header-bar/index.vue @@ -334,13 +334,8 @@ const goPage = (path: string) => { router.push(path) } - const { systemsid } = useUserStore() const gouserInfo = () => { - if (systemsid == '1') { - router.push('/admin/user/user_info') - } else { - router.push('/system/user-center') - } + router.push('/admin/user/user_info') } // const toDocs = () => { diff --git a/src/router/routes/staticRoutes.ts b/src/router/routes/staticRoutes.ts index 5525e3f..33de2cf 100644 --- a/src/router/routes/staticRoutes.ts +++ b/src/router/routes/staticRoutes.ts @@ -9,7 +9,7 @@ import Home from '@views/index/index.vue' export const staticRoutes: AppRouteRecordRaw[] = [ { path: '/', - redirect: HOME_PAGE + redirect: localStorage.getItem('home_page') || HOME_PAGE }, { path: '/console', diff --git a/src/utils/http/index.ts b/src/utils/http/index.ts index 4bd356b..b04d19b 100644 --- a/src/utils/http/index.ts +++ b/src/utils/http/index.ts @@ -50,7 +50,7 @@ axiosInstance.interceptors.request.use( const { systemsabbr } = useUserStore() request.headers.set('Fdesk-Language', language) request.headers.set('Fdesk-Corp-Abbr', companyabbr) - request.headers.set('Fdesk-System-Code', systemsabbr) + request.headers.set('Fdesk-System-Code', 'fdesk') request.headers.set('Fdesk-Login-Type', loginType) // 设置 token 和 请求头 if (accessToken) { diff --git a/src/views/admin/approval/approval_list.vue b/src/views/admin/approval/approval_list.vue index 1764301..1fd70a1 100644 --- a/src/views/admin/approval/approval_list.vue +++ b/src/views/admin/approval/approval_list.vue @@ -47,7 +47,12 @@