diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts index 75454dc..6b0325a 100644 --- a/src/locales/langs/zh-cn.ts +++ b/src/locales/langs/zh-cn.ts @@ -240,8 +240,6 @@ const local: App.I18n.Schema = { my_datachangecenter: '变更数据中心', my_closeconfirm: '关闭确认', changeledger: '变更台账', - changeledger_mychanges: '我发起的变更', - changeledger_workshopchanges: '本车间变更', changestatistics: '本部门变更统计', docs: '资料管理', docs_archives: '资料档案库', diff --git a/src/router/elegant/imports.ts b/src/router/elegant/imports.ts index 3a422f4..40adf68 100644 --- a/src/router/elegant/imports.ts +++ b/src/router/elegant/imports.ts @@ -18,8 +18,7 @@ export const views: Record Promise import("@/views/_builtin/403/index.vue"), 404: () => import("@/views/_builtin/404/index.vue"), 500: () => import("@/views/_builtin/500/index.vue"), - changeledger_mychanges: () => import("@/views/changeLedger/myChanges/index.vue"), - changeledger_workshopchanges: () => import("@/views/changeLedger/workshopChanges/index.vue"), + changeledger: () => import("@/views/changeLedger/index.vue"), changepassword: () => import("@/views/changePassword/index.vue"), changestatistics: () => import("@/views/changeStatistics/index.vue"), details_closedoc: () => import("@/views/details/closeDoc/index.vue"), diff --git a/src/router/elegant/routes.ts b/src/router/elegant/routes.ts index 3b500f0..601795c 100644 --- a/src/router/elegant/routes.ts +++ b/src/router/elegant/routes.ts @@ -42,33 +42,13 @@ export const generatedRoutes: GeneratedRoute[] = [ { name: 'changeledger', path: '/changeledger', - component: 'layout.base', + component: 'layout.base$view.changeledger', meta: { title: '变更台账', icon: 'tabler:table', order: 3, i18nKey: 'route.changeledger' - }, - children: [ - { - name: 'changeledger_mychanges', - path: '/changeledger/mychanges', - component: 'view.changeledger_mychanges', - meta: { - title: '我发起的变更', - i18nKey: 'route.changeledger_mychanges' - } - }, - { - name: 'changeledger_workshopchanges', - path: '/changeledger/workshopchanges', - component: 'view.changeledger_workshopchanges', - meta: { - title: '本车间变更', - i18nKey: 'route.changeledger_workshopchanges' - } - } - ] + } }, { name: 'changepassword', diff --git a/src/router/elegant/transform.ts b/src/router/elegant/transform.ts index 6aa1435..048b33c 100644 --- a/src/router/elegant/transform.ts +++ b/src/router/elegant/transform.ts @@ -167,8 +167,6 @@ const routeMap: RouteMap = { "404": "/404", "500": "/500", "changeledger": "/changeledger", - "changeledger_mychanges": "/changeledger/mychanges", - "changeledger_workshopchanges": "/changeledger/workshopchanges", "changepassword": "/changepassword", "changestatistics": "/changestatistics", "details": "/details", diff --git a/src/typings/elegant-router.d.ts b/src/typings/elegant-router.d.ts index 9c5b021..cca7ab2 100644 --- a/src/typings/elegant-router.d.ts +++ b/src/typings/elegant-router.d.ts @@ -21,8 +21,6 @@ declare module "@elegant-router/types" { "404": "/404"; "500": "/500"; "changeledger": "/changeledger"; - "changeledger_mychanges": "/changeledger/mychanges"; - "changeledger_workshopchanges": "/changeledger/workshopchanges"; "changepassword": "/changepassword"; "changestatistics": "/changestatistics"; "details": "/details"; @@ -119,8 +117,7 @@ declare module "@elegant-router/types" { | "403" | "404" | "500" - | "changeledger_mychanges" - | "changeledger_workshopchanges" + | "changeledger" | "changepassword" | "changestatistics" | "details_closedoc" diff --git a/src/views/changeLedger/index.vue b/src/views/changeLedger/index.vue new file mode 100644 index 0000000..0aa4276 --- /dev/null +++ b/src/views/changeLedger/index.vue @@ -0,0 +1,9 @@ + + + diff --git a/src/views/changeLedger/myChanges/index.vue b/src/views/changeLedger/myChanges/index.vue deleted file mode 100644 index 1689b74..0000000 --- a/src/views/changeLedger/myChanges/index.vue +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/src/views/changeLedger/workshopChanges/index.vue b/src/views/changeLedger/workshopChanges/index.vue deleted file mode 100644 index fb42c6f..0000000 --- a/src/views/changeLedger/workshopChanges/index.vue +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file