diff --git a/src/api/tjt/report/index.ts b/src/api/tjt/report/index.ts index ea2ee08..b81ae29 100644 --- a/src/api/tjt/report/index.ts +++ b/src/api/tjt/report/index.ts @@ -2,7 +2,7 @@ import request from '@/config/axios' export interface ProjectOverviewExportReqVO { year?: number - specialtyCode?: string + officeId?: number sortType?: string } diff --git a/src/layout/components/Menu/src/components/useRenderMenuTitle.tsx b/src/layout/components/Menu/src/components/useRenderMenuTitle.tsx index 8941d9d..ed955d6 100644 --- a/src/layout/components/Menu/src/components/useRenderMenuTitle.tsx +++ b/src/layout/components/Menu/src/components/useRenderMenuTitle.tsx @@ -6,17 +6,24 @@ export const useRenderMenuTitle = () => { const renderMenuTitle = (meta: RouteMeta) => { const { t } = useI18n() const { title = 'Please set title', icon } = meta + const text = t(title as string) return icon ? ( <> - - {t(title as string)} + + {text} ) : ( - - {t(title as string)} + + {text} ) } diff --git a/src/styles/var.css b/src/styles/var.css index 44f9405..3accf00 100644 --- a/src/styles/var.css +++ b/src/styles/var.css @@ -1,7 +1,7 @@ :root { --login-bg-color: #293146; - --left-menu-max-width: 200px; + --left-menu-max-width: 224px; --left-menu-min-width: 64px; diff --git a/src/views/tjt/report-summary/index.vue b/src/views/tjt/report-summary/index.vue index 293951e..73250c3 100644 --- a/src/views/tjt/report-summary/index.vue +++ b/src/views/tjt/report-summary/index.vue @@ -1,75 +1,8 @@