From 3708ca0d34ce3c534410c7e2f715470255fbeb24 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Thu, 22 Feb 2024 10:05:24 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=B3=BB=E7=BB=9F?=
=?UTF-8?q?=E7=BB=B4=E6=8A=A4=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/router/index.ts | 68 +++++++++++++++++++++----------------------
src/views/Upgrade.vue | 5 ++--
2 files changed, 37 insertions(+), 36 deletions(-)
diff --git a/src/router/index.ts b/src/router/index.ts
index 2c6d0eb3..4c96f575 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -70,43 +70,43 @@ const router = createRouter({
})
router.beforeEach((to, from, next) => {
// 系统维护
- // const toName = to.name === 'upgrade';
- // if (toName) {
- // next();
- // } else {
- // next({ name: 'upgrade' });
- // }
- // 检查路由是否存在
- // 机房用户
- let murmurStr: any = localStorage.getItem('murmurStr')
- let getIsMurmur: any = getCookie("isMurmur")
- let token = getCookie("token");
- let isMurmur = JSON.parse(getIsMurmur)
-
- const routeExists = router.getRoutes().some(({ name }) =>{
- if(name){
- return name === to.name
- }else{
- return false
- }
- });
- if (routeExists) {
- if (isMurmur && murmurStr && token) {
- const toName = to.name === 'login';
- if (toName) {
- next({ name: 'home' });
- } else {
- next();
- }
- } else {
- // 如果页面存在，正常跳转
- next();
- }
+ const toName = to.name === 'upgrade';
+ if (toName) {
next();
} else {
- // 如果页面不存在，可以跳转到404页面或者其他页面
- next('/404');
+ next({ name: 'upgrade' });
}
+ // 检查路由是否存在
+ // 机房用户
+ // let murmurStr: any = localStorage.getItem('murmurStr')
+ // let getIsMurmur: any = getCookie("isMurmur")
+ // let token = getCookie("token");
+ // let isMurmur = JSON.parse(getIsMurmur)
+
+ // const routeExists = router.getRoutes().some(({ name }) =>{
+ // if(name){
+ // return name === to.name
+ // }else{
+ // return false
+ // }
+ // });
+ // if (routeExists) {
+ // if (isMurmur && murmurStr && token) {
+ // const toName = to.name === 'login';
+ // if (toName) {
+ // next({ name: 'home' });
+ // } else {
+ // next();
+ // }
+ // } else {
+ // // 如果页面存在，正常跳转
+ // next();
+ // }
+ // next();
+ // } else {
+ // // 如果页面不存在，可以跳转到404页面或者其他页面
+ // next('/404');
+ // }
});
diff --git a/src/views/Upgrade.vue b/src/views/Upgrade.vue
index 609c4650..3f998a8c 100644
--- a/src/views/Upgrade.vue
+++ b/src/views/Upgrade.vue
@@ -5,8 +5,9 @@
- System upgrading
- The system update will begin at January 26th and is expected to be completed by January 28th.
+
+ System maintenance
+
From ea6425b68f9aa0363a9f896214d2e09ebce23fb9 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Thu, 22 Feb 2024 10:29:14 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=B3=BB=E7=BB=9F?=
=?UTF-8?q?=E7=BB=B4=E6=8A=A4=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/router/index.ts | 68 +++++++++++++++++++++----------------------
src/views/Upgrade.vue | 2 +-
2 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/src/router/index.ts b/src/router/index.ts
index 4c96f575..2c6d0eb3 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -70,43 +70,43 @@ const router = createRouter({
})
router.beforeEach((to, from, next) => {
// 系统维护
- const toName = to.name === 'upgrade';
- if (toName) {
- next();
- } else {
- next({ name: 'upgrade' });
- }
- // 检查路由是否存在
- // 机房用户
- // let murmurStr: any = localStorage.getItem('murmurStr')
- // let getIsMurmur: any = getCookie("isMurmur")
- // let token = getCookie("token");
- // let isMurmur = JSON.parse(getIsMurmur)
-
- // const routeExists = router.getRoutes().some(({ name }) =>{
- // if(name){
- // return name === to.name
- // }else{
- // return false
- // }
- // });
- // if (routeExists) {
- // if (isMurmur && murmurStr && token) {
- // const toName = to.name === 'login';
- // if (toName) {
- // next({ name: 'home' });
- // } else {
- // next();
- // }
- // } else {
- // // 如果页面存在，正常跳转
- // next();
- // }
+ // const toName = to.name === 'upgrade';
+ // if (toName) {
// next();
// } else {
- // // 如果页面不存在，可以跳转到404页面或者其他页面
- // next('/404');
+ // next({ name: 'upgrade' });
// }
+ // 检查路由是否存在
+ // 机房用户
+ let murmurStr: any = localStorage.getItem('murmurStr')
+ let getIsMurmur: any = getCookie("isMurmur")
+ let token = getCookie("token");
+ let isMurmur = JSON.parse(getIsMurmur)
+
+ const routeExists = router.getRoutes().some(({ name }) =>{
+ if(name){
+ return name === to.name
+ }else{
+ return false
+ }
+ });
+ if (routeExists) {
+ if (isMurmur && murmurStr && token) {
+ const toName = to.name === 'login';
+ if (toName) {
+ next({ name: 'home' });
+ } else {
+ next();
+ }
+ } else {
+ // 如果页面存在，正常跳转
+ next();
+ }
+ next();
+ } else {
+ // 如果页面不存在，可以跳转到404页面或者其他页面
+ next('/404');
+ }
});
diff --git a/src/views/Upgrade.vue b/src/views/Upgrade.vue
index 3f998a8c..4445a2f8 100644
--- a/src/views/Upgrade.vue
+++ b/src/views/Upgrade.vue
@@ -7,7 +7,7 @@
System maintenance
-
+ System maintenance will start at 10:00 and is expected to be completed at 10:30.
From e1e396bda8cb647d4c8749b6dd147d573fa0d9db Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Thu, 22 Feb 2024 10:51:45 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=B3=BB=E7=BB=9F?=
=?UTF-8?q?=E7=BB=B4=E6=8A=A4=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/router/index.ts | 72 +++++++++++++++++++++----------------------
src/views/Upgrade.vue | 2 +-
2 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/src/router/index.ts b/src/router/index.ts
index 2c6d0eb3..ba81de8a 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -8,8 +8,8 @@ const routes: Array = [
{
path: "/",
// redirect重定向
- redirect: "/login"
- // redirect: "/Upgrade"
+ // redirect: "/login"
+ redirect: "/Upgrade"
},
{
path: '/login',
@@ -70,43 +70,43 @@ const router = createRouter({
})
router.beforeEach((to, from, next) => {
// 系统维护
- // const toName = to.name === 'upgrade';
- // if (toName) {
- // next();
- // } else {
- // next({ name: 'upgrade' });
- // }
- // 检查路由是否存在
- // 机房用户
- let murmurStr: any = localStorage.getItem('murmurStr')
- let getIsMurmur: any = getCookie("isMurmur")
- let token = getCookie("token");
- let isMurmur = JSON.parse(getIsMurmur)
-
- const routeExists = router.getRoutes().some(({ name }) =>{
- if(name){
- return name === to.name
- }else{
- return false
- }
- });
- if (routeExists) {
- if (isMurmur && murmurStr && token) {
- const toName = to.name === 'login';
- if (toName) {
- next({ name: 'home' });
- } else {
- next();
- }
- } else {
- // 如果页面存在，正常跳转
- next();
- }
+ const toName = to.name === 'upgrade';
+ if (toName) {
next();
} else {
- // 如果页面不存在，可以跳转到404页面或者其他页面
- next('/404');
+ next({ name: 'upgrade' });
}
+ // 检查路由是否存在
+ // 机房用户
+ // let murmurStr: any = localStorage.getItem('murmurStr')
+ // let getIsMurmur: any = getCookie("isMurmur")
+ // let token = getCookie("token");
+ // let isMurmur = JSON.parse(getIsMurmur)
+
+ // const routeExists = router.getRoutes().some(({ name }) =>{
+ // if(name){
+ // return name === to.name
+ // }else{
+ // return false
+ // }
+ // });
+ // if (routeExists) {
+ // if (isMurmur && murmurStr && token) {
+ // const toName = to.name === 'login';
+ // if (toName) {
+ // next({ name: 'home' });
+ // } else {
+ // next();
+ // }
+ // } else {
+ // // 如果页面存在，正常跳转
+ // next();
+ // }
+ // next();
+ // } else {
+ // // 如果页面不存在，可以跳转到404页面或者其他页面
+ // next('/404');
+ // }
});
diff --git a/src/views/Upgrade.vue b/src/views/Upgrade.vue
index 4445a2f8..71e9f5ae 100644
--- a/src/views/Upgrade.vue
+++ b/src/views/Upgrade.vue
@@ -7,7 +7,7 @@
System maintenance
- System maintenance will start at 10:00 and is expected to be completed at 10:30.
+ System maintenance will start at 10:00 and is expected to be completed at 12:00.
From 89e55dc837fce2fd58e5c7aaad28e98f217476d6 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Thu, 22 Feb 2024 11:09:49 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=B3=BB=E7=BB=9F?=
=?UTF-8?q?=E7=BB=B4=E6=8A=A4=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/router/index.ts | 72 ++++++++++++++++++++++-----------------------
1 file changed, 36 insertions(+), 36 deletions(-)
diff --git a/src/router/index.ts b/src/router/index.ts
index ba81de8a..2c6d0eb3 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -8,8 +8,8 @@ const routes: Array = [
{
path: "/",
// redirect重定向
- // redirect: "/login"
- redirect: "/Upgrade"
+ redirect: "/login"
+ // redirect: "/Upgrade"
},
{
path: '/login',
@@ -70,43 +70,43 @@ const router = createRouter({
})
router.beforeEach((to, from, next) => {
// 系统维护
- const toName = to.name === 'upgrade';
- if (toName) {
- next();
- } else {
- next({ name: 'upgrade' });
- }
- // 检查路由是否存在
- // 机房用户
- // let murmurStr: any = localStorage.getItem('murmurStr')
- // let getIsMurmur: any = getCookie("isMurmur")
- // let token = getCookie("token");
- // let isMurmur = JSON.parse(getIsMurmur)
-
- // const routeExists = router.getRoutes().some(({ name }) =>{
- // if(name){
- // return name === to.name
- // }else{
- // return false
- // }
- // });
- // if (routeExists) {
- // if (isMurmur && murmurStr && token) {
- // const toName = to.name === 'login';
- // if (toName) {
- // next({ name: 'home' });
- // } else {
- // next();
- // }
- // } else {
- // // 如果页面存在，正常跳转
- // next();
- // }
+ // const toName = to.name === 'upgrade';
+ // if (toName) {
// next();
// } else {
- // // 如果页面不存在，可以跳转到404页面或者其他页面
- // next('/404');
+ // next({ name: 'upgrade' });
// }
+ // 检查路由是否存在
+ // 机房用户
+ let murmurStr: any = localStorage.getItem('murmurStr')
+ let getIsMurmur: any = getCookie("isMurmur")
+ let token = getCookie("token");
+ let isMurmur = JSON.parse(getIsMurmur)
+
+ const routeExists = router.getRoutes().some(({ name }) =>{
+ if(name){
+ return name === to.name
+ }else{
+ return false
+ }
+ });
+ if (routeExists) {
+ if (isMurmur && murmurStr && token) {
+ const toName = to.name === 'login';
+ if (toName) {
+ next({ name: 'home' });
+ } else {
+ next();
+ }
+ } else {
+ // 如果页面存在，正常跳转
+ next();
+ }
+ next();
+ } else {
+ // 如果页面不存在，可以跳转到404页面或者其他页面
+ next('/404');
+ }
});