From 7b3c4598229b86a99691aa08629f94292f3dbb09 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Thu, 22 Feb 2024 14:23:10 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=20=E6=9C=8D=E5=8A=A1=E5=99=A8=E9=87=8D?= =?UTF-8?q?=E6=96=B0=E8=AE=BE=E7=BD=AE=E7=BD=91=E8=B7=AF?= 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 71e9f5ae..33aa408c 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 12:00.
+
System maintenance will start at 14:20 and is expected to be completed at 15:00.
From 31ed2df95867b2864a7af15ccd770beea6623f09 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Thu, 22 Feb 2024 16:04:10 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=B0=83=E6=95=B4=E5=85=AD=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Upgrade.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/Upgrade.vue b/src/views/Upgrade.vue index 33aa408c..1049c2cc 100644 --- a/src/views/Upgrade.vue +++ b/src/views/Upgrade.vue @@ -7,7 +7,7 @@
System maintenance
-
System maintenance will start at 14:20 and is expected to be completed at 15:00.
+
System maintenance will start at 14:20 and is expected to be completed at 18:00.
From 1f44a709dd54a045e0239c1e78fb64ccd39b8cef Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Thu, 22 Feb 2024 16:07:37 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=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 | 77 ++++++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 36 deletions(-) diff --git a/src/router/index.ts b/src/router/index.ts index ba81de8a..d6e73bac 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,48 @@ 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 { + // 如果页面存在，正常跳转 + const toName = to.name === 'upgrade'; + if (toName) { + next({ name: 'home' }); + } else { + next(); + } + } + next(); + } else { + // 如果页面不存在，可以跳转到404页面或者其他页面 + next('/404'); + } }); From 9adad96dc3e3d958e693daf29608b50ccc08049a Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 4 Mar 2024 09:58:51 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.ts | 82 +++++++++++++++++++++---------------------- src/views/Upgrade.vue | 2 +- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/router/index.ts b/src/router/index.ts index d6e73bac..4c2cf90e 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,48 +70,48 @@ 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 { - // 如果页面存在，正常跳转 - const toName = to.name === 'upgrade'; - if (toName) { - next({ name: 'home' }); - } 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 { + // // 如果页面存在，正常跳转 + // const toName = to.name === 'upgrade'; + // if (toName) { + // next({ name: 'home' }); + // } else { + // next(); + // } + // } + // next(); + // } else { + // // 如果页面不存在，可以跳转到404页面或者其他页面 + // next('/404'); + // } }); diff --git a/src/views/Upgrade.vue b/src/views/Upgrade.vue index 1049c2cc..12760a20 100644 --- a/src/views/Upgrade.vue +++ b/src/views/Upgrade.vue @@ -7,7 +7,7 @@
System maintenance
-
System maintenance will start at 14:20 and is expected to be completed at 18:00.
+
Due to system server upgrades, we will be conducting maintenance on Monday, March 4th, from 10:00 AM to 3:00 PM Hong Kong time. During this period, access to the AiDA system will be temporarily unavailable. We apologize for any inconvenience this may cause and appreciate your understanding.
From 37c67326272a74ebda095645c77e83f262b7ceab Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 4 Mar 2024 10:00:30 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.ts | 82 ++++++++++++++++++++++----------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/src/router/index.ts b/src/router/index.ts index 4c2cf90e..d6e73bac 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,48 +70,48 @@ 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 { - // // 如果页面存在，正常跳转 - // const toName = to.name === 'upgrade'; - // if (toName) { - // next({ name: 'home' }); - // } 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 { + // 如果页面存在，正常跳转 + const toName = to.name === 'upgrade'; + if (toName) { + next({ name: 'home' }); + } else { + next(); + } + } + next(); + } else { + // 如果页面不存在，可以跳转到404页面或者其他页面 + next('/404'); + } }); From 89979a2131d26a8e795116be8ff31ad5e3128318 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 4 Mar 2024 10:02:55 +0800 Subject: [PATCH 06/14] fix --- src/router/index.ts | 82 +++++++++++++++++++++---------------------- src/views/Upgrade.vue | 3 +- 2 files changed, 43 insertions(+), 42 deletions(-) diff --git a/src/router/index.ts b/src/router/index.ts index d6e73bac..4c2cf90e 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,48 +70,48 @@ 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 { - // 如果页面存在，正常跳转 - const toName = to.name === 'upgrade'; - if (toName) { - next({ name: 'home' }); - } 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 { + // // 如果页面存在，正常跳转 + // const toName = to.name === 'upgrade'; + // if (toName) { + // next({ name: 'home' }); + // } else { + // next(); + // } + // } + // next(); + // } else { + // // 如果页面不存在，可以跳转到404页面或者其他页面 + // next('/404'); + // } }); diff --git a/src/views/Upgrade.vue b/src/views/Upgrade.vue index 12760a20..32293322 100644 --- a/src/views/Upgrade.vue +++ b/src/views/Upgrade.vue @@ -7,7 +7,7 @@
System maintenance
-
Due to system server upgrades, we will be conducting maintenance on Monday, March 4th, from 10:00 AM to 3:00 PM Hong Kong time. During this period, access to the AiDA system will be temporarily unavailable. We apologize for any inconvenience this may cause and appreciate your understanding.
+
Due to system server upgrades, we will be conducting maintenance on Monday, March 4th, from 10:00 AM to 3:00 PM Hong Kong time. During this period, access to the AiDA system will be temporarily unavailable.
We apologize for any inconvenience this may cause and appreciate your understanding.
@@ -85,6 +85,7 @@ export default defineComponent({ transform: translateX(-50%); font-size: 1.8rem; color: #8e8e8e; + text-align: center; } } From 16268a23cf33faf9a912e50f3fd9507859db2a64 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 4 Mar 2024 10:04:00 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.ts | 82 ++++++++++++++++++++++----------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/src/router/index.ts b/src/router/index.ts index 4c2cf90e..d6e73bac 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,48 +70,48 @@ 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 { - // // 如果页面存在，正常跳转 - // const toName = to.name === 'upgrade'; - // if (toName) { - // next({ name: 'home' }); - // } 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 { + // 如果页面存在，正常跳转 + const toName = to.name === 'upgrade'; + if (toName) { + next({ name: 'home' }); + } else { + next(); + } + } + next(); + } else { + // 如果页面不存在，可以跳转到404页面或者其他页面 + next('/404'); + } }); From 03d11ed8fb800c73f3de4af29a6c9f128d8494b3 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 4 Mar 2024 16:13:09 +0800 Subject: [PATCH 08/14] fix --- src/router/index.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/router/index.ts b/src/router/index.ts index d6e73bac..9e5c7cda 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -107,7 +107,6 @@ router.beforeEach((to, from, next) => { next(); } } - next(); } else { // 如果页面不存在，可以跳转到404页面或者其他页面 next('/404'); From 8f06235e63e90fb218c791bc97101a60c338c58c Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 4 Mar 2024 16:17:48 +0800 Subject: [PATCH 09/14] fix --- src/router/index.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/router/index.ts b/src/router/index.ts index 9e5c7cda..d6d41769 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -101,8 +101,10 @@ router.beforeEach((to, from, next) => { } else { // 如果页面存在，正常跳转 const toName = to.name === 'upgrade'; + console.log(toName); + if (toName) { - next({ name: 'home' }); + next({ name: 'login' }); } else { next(); } From 2d46e40d44c12896dfbd590a42e5fe958dbfa568 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 4 Mar 2024 16:21:03 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E9=87=8D=E5=AE=9A=E5=90=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/router/index.ts b/src/router/index.ts index d6d41769..f64aa177 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -90,7 +90,11 @@ router.beforeEach((to, from, next) => { return false } }); + console.log(routeExists); + if (routeExists) { + console.log(isMurmur, murmurStr, token); + if (isMurmur && murmurStr && token) { const toName = to.name === 'login'; if (toName) { From e9588caa0382342e1bf658ff3c8ac6360fed4769 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 4 Mar 2024 16:35:32 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E9=87=8D=E5=AE=9A=E5=90=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.ts | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/router/index.ts b/src/router/index.ts index f64aa177..4a813e85 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -9,7 +9,7 @@ const routes: Array = [ path: "/", // redirect重定向 redirect: "/login" - // redirect: "/Upgrade" + // redirect: "/upgrade" }, { path: '/login', @@ -68,6 +68,8 @@ const router = createRouter({ // history: createWebHashHistory(), routes }) +console.log(123123123); + router.beforeEach((to, from, next) => { // 系统维护 // const toName = to.name === 'upgrade'; @@ -90,11 +92,8 @@ router.beforeEach((to, from, next) => { return false } }); - console.log(routeExists); if (routeExists) { - console.log(isMurmur, murmurStr, token); - if (isMurmur && murmurStr && token) { const toName = to.name === 'login'; if (toName) { @@ -105,7 +104,6 @@ router.beforeEach((to, from, next) => { } else { // 如果页面存在，正常跳转 const toName = to.name === 'upgrade'; - console.log(toName); if (toName) { next({ name: 'login' }); From 10e5d354983faeefd1a7a045841fbf6dd97176ff Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 4 Mar 2024 16:48:06 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/router/index.ts b/src/router/index.ts index 4a813e85..fa7a54bf 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -68,8 +68,6 @@ const router = createRouter({ // history: createWebHashHistory(), routes }) -console.log(123123123); - router.beforeEach((to, from, next) => { // 系统维护 // const toName = to.name === 'upgrade'; From fe81175782c963d5af77af48c7056f9f9990e9dd Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Tue, 5 Mar 2024 10:33:52 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=A1=B5=E9=9D=A2rem?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/tool/flexible.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/tool/flexible.js b/src/tool/flexible.js index 39d359c1..53e32331 100644 --- a/src/tool/flexible.js +++ b/src/tool/flexible.js @@ -4,17 +4,21 @@ let flexible = (designWidth, maxWidth,minWidth) =>{ maxWidth = maxWidth || 2560; minWidth = minWidth || 1024; function refreshRem() { + console.log(1); var width = docEl.getBoundingClientRect().width; maxWidth = maxWidth || 1920; width > maxWidth && (width = maxWidth); width > maxWidth && (width = maxWidth); width < minWidth && (width = minWidth); var rem = width * 10 / designWidth; + console.log(2); remStyle.innerHTML = 'html{font-size:' + rem + 'px;}'; } if (docEl.firstElementChild) { + console.log(22); docEl.firstElementChild.appendChild(remStyle); } else { + console.log(33); var wrap = doc.createElement("div"); wrap.appendChild(remStyle); doc.write(wrap.innerHTML); From 3cff0b64f06524b8a1420a1b5a23ce27947e8b84 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Tue, 5 Mar 2024 10:53:01 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E8=B0=83=E6=95=B4rem=E9=80=82=E9=85=8D?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/tool/flexible.js | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/tool/flexible.js b/src/tool/flexible.js index 53e32331..34aa2d53 100644 --- a/src/tool/flexible.js +++ b/src/tool/flexible.js @@ -4,26 +4,23 @@ let flexible = (designWidth, maxWidth,minWidth) =>{ maxWidth = maxWidth || 2560; minWidth = minWidth || 1024; function refreshRem() { - console.log(1); var width = docEl.getBoundingClientRect().width; maxWidth = maxWidth || 1920; width > maxWidth && (width = maxWidth); width > maxWidth && (width = maxWidth); width < minWidth && (width = minWidth); var rem = width * 10 / designWidth; - console.log(2); + docEl.style.fontSize = rem+'px' remStyle.innerHTML = 'html{font-size:' + rem + 'px;}'; } - if (docEl.firstElementChild) { - console.log(22); - docEl.firstElementChild.appendChild(remStyle); - } else { - console.log(33); - var wrap = doc.createElement("div"); - wrap.appendChild(remStyle); - doc.write(wrap.innerHTML); - wrap = null; - } + // if (docEl.firstElementChild) { + // docEl.firstElementChild.appendChild(remStyle); + // } else { + // var wrap = doc.createElement("div"); + // wrap.appendChild(remStyle); + // doc.write(wrap.innerHTML); + // wrap = null; + // } //要等 wiewport 设置好后才能执行 refreshRem，不然 refreshRem 会执行2次； refreshRem(); win.addEventListener("resize", function() {