From d0392bd43a79d38745e59daa50afaa056575408a Mon Sep 17 00:00:00 2001 From: gaoyunqi Date: Thu, 22 Feb 2024 10:23:38 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 3 + src/router/routes/basic.ts | 9 ++ src/router/routes/index.ts | 60 +++---- src/views/secondDev/Login.vue | 254 ++++++++++++++++++++++++++++++ src/views/secondDev/LoginForm.vue | 226 ++++++++++++++++++++++++++ 5 files changed, 522 insertions(+), 30 deletions(-) create mode 100644 src/views/secondDev/Login.vue create mode 100644 src/views/secondDev/LoginForm.vue diff --git a/.env b/.env index 4112dbd..331d76c 100644 --- a/.env +++ b/.env @@ -6,3 +6,6 @@ VITE_GLOB_APP_TITLE = Learun Pro # spa shortname VITE_GLOB_APP_SHORT_NAME = learun_admin + +# 应用名称 +VITE_SYSTEM_NAME = 数字新能源 diff --git a/src/router/routes/basic.ts b/src/router/routes/basic.ts index ba4cf56..c0c5808 100644 --- a/src/router/routes/basic.ts +++ b/src/router/routes/basic.ts @@ -149,6 +149,7 @@ export const FLOW_ROUTE: AppRouteRecordRaw = { title: '审批流程' } }, + /* 菜单不支持复用,不同菜单如果path或者name一样会报错 */ { path: 'flowList', name: 'FlowListPage', @@ -156,6 +157,14 @@ export const FLOW_ROUTE: AppRouteRecordRaw = { meta: { title: '流程列表' } + }, + { + path: 'flowList2', + name: 'FlowListPage2', + component: () => import('/@/views/secondDev/processTasksPage.vue'), + meta: { + title: '待办列表' + } } ] }; diff --git a/src/router/routes/index.ts b/src/router/routes/index.ts index c2a4ec0..ce84e35 100644 --- a/src/router/routes/index.ts +++ b/src/router/routes/index.ts @@ -1,12 +1,12 @@ import type { AppRouteRecordRaw, AppRouteModule } from '/@/router/types'; import { - PAGE_NOT_FOUND_ROUTE, - REDIRECT_ROUTE, - SYSTEM_ROUTE, - USERCENTER_ROUTE, - FLOW_ROUTE, - // CUSTOMFORM_ROUTE, + PAGE_NOT_FOUND_ROUTE, + REDIRECT_ROUTE, + SYSTEM_ROUTE, + USERCENTER_ROUTE, + FLOW_ROUTE + // CUSTOMFORM_ROUTE, } from '/@/router/routes/basic'; import { mainOutRoutes } from './mainOut'; @@ -18,41 +18,41 @@ const modules = import.meta.glob('./modules/**/*.ts', { eager: true }); const routeModuleList: AppRouteModule[] = []; Object.keys(modules).forEach((key) => { - const mod = modules[key].default || {}; - const modList = Array.isArray(mod) ? [...mod] : [mod]; - routeModuleList.push(...modList); + const mod = modules[key].default || {}; + const modList = Array.isArray(mod) ? [...mod] : [mod]; + routeModuleList.push(...modList); }); export const asyncRoutes = [PAGE_NOT_FOUND_ROUTE, ...routeModuleList]; export const RootRoute: AppRouteRecordRaw = { - path: '/', - name: 'Root', - redirect: PageEnum.BASE_HOME, - meta: { - title: 'Root', - }, + path: '/', + name: 'Root', + redirect: PageEnum.BASE_HOME, + meta: { + title: 'Root' + } }; export const LoginRoute: AppRouteRecordRaw = { - path: '/login', - name: 'Login', - component: () => import('/@/views/sys/login/Login.vue'), - meta: { - title: t('登录页'), - }, + path: '/login', + name: 'Login', + component: () => import('/@/views/secondDev/Login.vue'), + meta: { + title: t('登录页') + } }; // Basic routing without permissions // 未经许可的基本路由 export const basicRoutes = [ - LoginRoute, - RootRoute, - ...mainOutRoutes, - REDIRECT_ROUTE, - PAGE_NOT_FOUND_ROUTE, - SYSTEM_ROUTE, - USERCENTER_ROUTE, - FLOW_ROUTE, - // CUSTOMFORM_ROUTE, + LoginRoute, + RootRoute, + ...mainOutRoutes, + REDIRECT_ROUTE, + PAGE_NOT_FOUND_ROUTE, + SYSTEM_ROUTE, + USERCENTER_ROUTE, + FLOW_ROUTE + // CUSTOMFORM_ROUTE, ]; diff --git a/src/views/secondDev/Login.vue b/src/views/secondDev/Login.vue new file mode 100644 index 0000000..52732d6 --- /dev/null +++ b/src/views/secondDev/Login.vue @@ -0,0 +1,254 @@ + + + diff --git a/src/views/secondDev/LoginForm.vue b/src/views/secondDev/LoginForm.vue new file mode 100644 index 0000000..e86c6d5 --- /dev/null +++ b/src/views/secondDev/LoginForm.vue @@ -0,0 +1,226 @@ + + +