From f5aa4c956e019045d3d1c01be5bac79307748e05 Mon Sep 17 00:00:00 2001 From: Kane Wang Date: Sat, 28 Jan 2023 16:02:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E9=BD=90=E9=9C=80=E6=B1=82=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E9=A1=B5=E9=9D=A2=E8=A1=A8=E5=8D=95=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=99=BB=E5=BD=95=E5=90=8E=E9=BB=98=E8=AE=A4=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=201=E3=80=81=E9=9C=80=E6=B1=82=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E8=A1=A8=E5=8D=95=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E5=AF=B9=E9=BD=90=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BA=86title?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BA=86=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC=E5=86=85=E5=AE=B9=E7=AD=9B=E9=80=89=EF=BC=9B=202?= =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9=E4=BA=86=E8=B7=AF=E7=94=B1=E5=AE=88?= =?UTF-8?q?=E5=8D=AB=EF=BC=8C=E5=BD=93=E8=B7=AF=E7=94=B1=E8=B5=B0=E5=90=91?= =?UTF-8?q?"Home"=E6=97=B6=EF=BC=8C=E8=B7=B3=E8=BD=AC=E5=88=B0=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E5=8F=B0"Desktop"=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/layout/components/Aside.vue | 8 +- .../web/admin_system/src/router/index.js | 13 +- .../src/views/overview/OverView.vue | 52 +- .../views/requirement/RequirementManager.vue | 80 +- 提交总公司需求状态 2022-12-15.csv | 1 - 提交总公司需求状态 2022-12-15.json | 847 ++++++++++++++++++ 6 files changed, 976 insertions(+), 25 deletions(-) delete mode 100644 提交总公司需求状态 2022-12-15.csv create mode 100644 提交总公司需求状态 2022-12-15.json diff --git a/企业级管理系统/web/admin_system/src/layout/components/Aside.vue b/企业级管理系统/web/admin_system/src/layout/components/Aside.vue index ad31cf5..dae875a 100644 --- a/企业级管理系统/web/admin_system/src/layout/components/Aside.vue +++ b/企业级管理系统/web/admin_system/src/layout/components/Aside.vue @@ -2,7 +2,7 @@ * @Author: Kane * @Date: 2023-01-04 11:30:33 * @LastEditors: Kane - * @LastEditTime: 2023-01-26 08:10:40 + * @LastEditTime: 2023-01-28 16:01:49 * @FilePath: \admin_system\src\layout\components\Aside.vue * @Description: * @@ -85,7 +85,9 @@ export default { //获取当前的路由 currentPath() { - return useRoute().path; + let path = useRoute().path; + + return path; }, //获取导航栏是否折叠的标志 asideCollapse() @@ -96,8 +98,6 @@ export default { created() { this.routers = useRouter().options.routes; - - console.log(this.routers); } }; diff --git a/企业级管理系统/web/admin_system/src/router/index.js b/企业级管理系统/web/admin_system/src/router/index.js index ebc9c4c..70208f7 100644 --- a/企业级管理系统/web/admin_system/src/router/index.js +++ b/企业级管理系统/web/admin_system/src/router/index.js @@ -2,7 +2,7 @@ * @Author: Kane * @Date: 2022-12-14 15:12:46 * @LastEditors: Kane - * @LastEditTime: 2023-01-25 23:33:05 + * @LastEditTime: 2023-01-28 16:00:58 * @FilePath: \admin_system\src\router\index.js * @Description: 定义应用路由配置 * @@ -179,6 +179,7 @@ router.beforeEach((to) => { const token = window.localStorage.getItem("token"); + //先检查token if (!token) { //如果token不存在,判断路由是否走向login,如果不是则指向login @@ -190,6 +191,16 @@ router.beforeEach((to) => }; } } + + //修改默认打开的页面,跳向工作台 + if (to.name === "Home") + { + console.log("跳向工作台"); + + return { + name: "DeskTop", + }; + } }); export default router; diff --git a/企业级管理系统/web/admin_system/src/views/overview/OverView.vue b/企业级管理系统/web/admin_system/src/views/overview/OverView.vue index 1590d41..5e2752e 100644 --- a/企业级管理系统/web/admin_system/src/views/overview/OverView.vue +++ b/企业级管理系统/web/admin_system/src/views/overview/OverView.vue @@ -2,14 +2,56 @@ * @Author: Kane * @Date: 2023-01-06 15:30:12 * @LastEditors: Kane - * @LastEditTime: 2023-01-07 20:37:55 + * @LastEditTime: 2023-01-28 09:44:31 * @FilePath: \admin_system\src\views\overview\OverView.vue * @Description: * * Copyright (c) ${2022} by Kane, All Rights Reserved. --> \ No newline at end of file diff --git a/企业级管理系统/web/admin_system/src/views/requirement/RequirementManager.vue b/企业级管理系统/web/admin_system/src/views/requirement/RequirementManager.vue index 99d0913..de3b471 100644 --- a/企业级管理系统/web/admin_system/src/views/requirement/RequirementManager.vue +++ b/企业级管理系统/web/admin_system/src/views/requirement/RequirementManager.vue @@ -2,7 +2,7 @@ * @Author: Kane * @Date: 2023-01-25 23:13:47 * @LastEditors: Kane - * @LastEditTime: 2023-01-27 00:26:34 + * @LastEditTime: 2023-01-28 15:08:25 * @FilePath: \admin_system\src\views\requirement\RequirementManager.vue * @Description: * @@ -11,6 +11,14 @@