diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts index dd2a558..8467108 100644 --- a/src/locales/langs/zh-cn.ts +++ b/src/locales/langs/zh-cn.ts @@ -227,6 +227,9 @@ const local: App.I18n.Schema = { home: '我的操作台', home_index: '工作台首页', home_initiatechange: '发起变更', + home_highrisk: '本专业高风险', + home_highriskdetail: '高风险场景详情', + home_mytask: '我的任务', home_mydraft: '我的草稿', home_pending: '待我处理', home_process: '流程演示', diff --git a/src/router/elegant/imports.ts b/src/router/elegant/imports.ts index 310d06e..3b47eb3 100644 --- a/src/router/elegant/imports.ts +++ b/src/router/elegant/imports.ts @@ -23,9 +23,12 @@ export const views: Record Promise import("@/views/changeStatistics/index.vue"), docs_archives: () => import("@/views/docs/archives/index.vue"), docs_query: () => import("@/views/docs/query/index.vue"), + home_highrisk: () => import("@/views/home/highRisk/index.vue"), + home_highriskdetail: () => import("@/views/home/highRiskDetail/index.vue"), home_index: () => import("@/views/home/index/index.vue"), home_initiatechange: () => import("@/views/home/initiateChange/index.vue"), home_mydraft: () => import("@/views/home/myDraft/index.vue"), + home_mytask: () => import("@/views/home/myTask/index.vue"), home_pending: () => import("@/views/home/pending/index.vue"), home_process: () => import("@/views/home/process/index.vue"), home_processdetail: () => import("@/views/home/processDetail/index.vue"), diff --git a/src/router/elegant/routes.ts b/src/router/elegant/routes.ts index bfab929..fd2cd45 100644 --- a/src/router/elegant/routes.ts +++ b/src/router/elegant/routes.ts @@ -127,6 +127,29 @@ export const generatedRoutes: GeneratedRoute[] = [ order: 1 }, children: [ + { + name: 'home_highrisk', + path: '/home/highrisk', + component: 'view.home_highrisk', + meta: { + title: 'home_highrisk', + i18nKey: 'route.home_highrisk', + icon: '', + order: 6 + } + }, + { + name: 'home_highriskdetail', + path: '/home/highriskdetail', + component: 'view.home_highriskdetail', + meta: { + title: 'home_highriskdetail', + i18nKey: 'route.home_highriskdetail', + activeMenu: 'home_highrisk', + hideInMenu: true, + icon: '' + } + }, { name: 'home_index', path: '/home/index', @@ -134,7 +157,8 @@ export const generatedRoutes: GeneratedRoute[] = [ meta: { title: 'home_index', i18nKey: 'route.home_index', - icon: '' + icon: '', + order: 1 } }, { @@ -144,7 +168,8 @@ export const generatedRoutes: GeneratedRoute[] = [ meta: { title: 'home_initiatechange', i18nKey: 'route.home_initiatechange', - icon: '' + icon: '', + order: 2 } }, { @@ -154,7 +179,19 @@ export const generatedRoutes: GeneratedRoute[] = [ meta: { title: 'home_mydraft', i18nKey: 'route.home_mydraft', - icon: '' + icon: '', + order: 3 + } + }, + { + name: 'home_mytask', + path: '/home/mytask', + component: 'view.home_mytask', + meta: { + title: 'home_mytask', + i18nKey: 'route.home_mytask', + icon: '', + order: 5 } }, { @@ -164,7 +201,8 @@ export const generatedRoutes: GeneratedRoute[] = [ meta: { title: 'home_pending', i18nKey: 'route.home_pending', - icon: '' + icon: '', + order: 4 } }, { @@ -174,7 +212,8 @@ export const generatedRoutes: GeneratedRoute[] = [ meta: { title: 'home_process', i18nKey: 'route.home_process', - icon: '' + icon: '', + order: 7 } }, { diff --git a/src/router/elegant/transform.ts b/src/router/elegant/transform.ts index 60406f6..48702ce 100644 --- a/src/router/elegant/transform.ts +++ b/src/router/elegant/transform.ts @@ -174,9 +174,12 @@ const routeMap: RouteMap = { "docs_archives": "/docs/archives", "docs_query": "/docs/query", "home": "/home", + "home_highrisk": "/home/highrisk", + "home_highriskdetail": "/home/highriskdetail", "home_index": "/home/index", "home_initiatechange": "/home/initiatechange", "home_mydraft": "/home/mydraft", + "home_mytask": "/home/mytask", "home_pending": "/home/pending", "home_process": "/home/process", "home_processdetail": "/home/processdetail", diff --git a/src/store/modules/auth/index.ts b/src/store/modules/auth/index.ts index 9791d9b..c68c3c4 100644 --- a/src/store/modules/auth/index.ts +++ b/src/store/modules/auth/index.ts @@ -22,7 +22,7 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => { const userInfo: Api.Auth.UserInfo = reactive({ userId: '', - userName: '', + username: '', roles: [], buttons: [] }); @@ -116,7 +116,7 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => { window.$notification?.success({ title: '登录成功', - content: `欢迎回来,${userInfo.userName} !`, + content: `欢迎回来,${userInfo.username} !`, duration: 4500 }); } diff --git a/src/typings/components.d.ts b/src/typings/components.d.ts index c783ca7..bf3098c 100644 --- a/src/typings/components.d.ts +++ b/src/typings/components.d.ts @@ -69,6 +69,7 @@ declare module 'vue' { NScrollbar: typeof import('naive-ui')['NScrollbar'] NSelect: typeof import('naive-ui')['NSelect'] NSpace: typeof import('naive-ui')['NSpace'] + NSpin: typeof import('naive-ui')['NSpin'] NSwitch: typeof import('naive-ui')['NSwitch'] NTab: typeof import('naive-ui')['NTab'] NTabs: typeof import('naive-ui')['NTabs'] @@ -151,6 +152,7 @@ declare global { const NScrollbar: typeof import('naive-ui')['NScrollbar'] const NSelect: typeof import('naive-ui')['NSelect'] const NSpace: typeof import('naive-ui')['NSpace'] + const NSpin: typeof import('naive-ui')['NSpin'] const NSwitch: typeof import('naive-ui')['NSwitch'] const NTab: typeof import('naive-ui')['NTab'] const NTabs: typeof import('naive-ui')['NTabs'] diff --git a/src/typings/elegant-router.d.ts b/src/typings/elegant-router.d.ts index 8ae4342..357a11c 100644 --- a/src/typings/elegant-router.d.ts +++ b/src/typings/elegant-router.d.ts @@ -28,9 +28,12 @@ declare module "@elegant-router/types" { "docs_archives": "/docs/archives"; "docs_query": "/docs/query"; "home": "/home"; + "home_highrisk": "/home/highrisk"; + "home_highriskdetail": "/home/highriskdetail"; "home_index": "/home/index"; "home_initiatechange": "/home/initiatechange"; "home_mydraft": "/home/mydraft"; + "home_mytask": "/home/mytask"; "home_pending": "/home/pending"; "home_process": "/home/process"; "home_processdetail": "/home/processdetail"; @@ -103,9 +106,12 @@ declare module "@elegant-router/types" { | "changestatistics" | "docs_archives" | "docs_query" + | "home_highrisk" + | "home_highriskdetail" | "home_index" | "home_initiatechange" | "home_mydraft" + | "home_mytask" | "home_pending" | "home_process" | "home_processdetail" diff --git a/src/views/home/highRisk/index.vue b/src/views/home/highRisk/index.vue new file mode 100644 index 0000000..fe47707 --- /dev/null +++ b/src/views/home/highRisk/index.vue @@ -0,0 +1,472 @@ + + + + + diff --git a/src/views/home/highRiskDetail/index.vue b/src/views/home/highRiskDetail/index.vue new file mode 100644 index 0000000..7a39663 --- /dev/null +++ b/src/views/home/highRiskDetail/index.vue @@ -0,0 +1,86 @@ + + + + + diff --git a/src/views/home/myTask/index.vue b/src/views/home/myTask/index.vue new file mode 100644 index 0000000..d6f25ef --- /dev/null +++ b/src/views/home/myTask/index.vue @@ -0,0 +1,631 @@ + + + + + + diff --git a/src/views/home/process/detail.vue b/src/views/home/process/detail.vue deleted file mode 100644 index 9f35f9c..0000000 --- a/src/views/home/process/detail.vue +++ /dev/null @@ -1,184 +0,0 @@ - - - - - - diff --git a/src/views/login/modules/pwd-login.vue b/src/views/login/modules/pwd-login.vue index 131e82e..9303be0 100644 --- a/src/views/login/modules/pwd-login.vue +++ b/src/views/login/modules/pwd-login.vue @@ -1,46 +1,47 @@