From a28408bcd6baff155d87d1fc73822daa7a66e134 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Wed, 12 Mar 2025 16:46:23 +0800
Subject: [PATCH] =?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       | 26 +++++++++++++-------------
 src/tool/canvasGeneral.js |  3 +--
 src/views/Upgrade.vue     |  7 ++++---
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/router/index.ts b/src/router/index.ts
index 77f898da..c1079fdf 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -13,8 +13,8 @@ const routes: Array<RouteRecordRaw> = [
 		path: "/",
 		// redirect重定向
 		meta:{enter:'all',},
-		redirect: "/Square"
-		// redirect: "/upgrade"
+		// redirect: "/Square"
+		redirect: "/upgrade"
 		
 	},
 	{
@@ -412,17 +412,17 @@ const setViewsIncrease = (value:any)=>{
 let upgradeList = ['/feedbackSurvey','/feedbackSurveyCN','emailVerify']//指定页面系统维护也可以访问
 router.beforeEach((to:any, from, next) => {
 	// 	系统维护
-	// const toName = to.name === 'upgrade';
-	// if(upgradeList.indexOf(to.path) > -1){
-	// 	next();
-	// }else{
-	// 	if (toName) {
-	// 		next();
-	// 	} else {
-	// 		next({ name: 'upgrade' });
-	// 	}
-	// }
-	// return
+	const toName = to.name === 'upgrade';
+	if(upgradeList.indexOf(to.path) > -1){
+		next();
+	}else{
+		if (toName) {
+			next();
+		} else {
+			next({ name: 'upgrade' });
+		}
+	}
+	return
 	// 检查路由是否存在
 	// 机房用户
 	let herfData = window.location.search.substring(1)
diff --git a/src/tool/canvasGeneral.js b/src/tool/canvasGeneral.js
index 85853c7d..c092bcd8 100644
--- a/src/tool/canvasGeneral.js
+++ b/src/tool/canvasGeneral.js
@@ -106,8 +106,7 @@ class myCanvas {
 		// this.canvas.on('mouse:up', function(event) {
 		// 	if(this.canvasState != 'move')this.updateCanvasState('')
 		// });
-		this.canvas.on("object:added", (event)=>{
-			if(!this.isLoadCanvas)this.updateCanvasState('')
+		this.canvas.on("object:added", (event)=>			if(!this.isLoadCanvas)this.updateCanvasState('')
 		});
 		return this.canvas
 	}
diff --git a/src/views/Upgrade.vue b/src/views/Upgrade.vue
index 3f7544e7..0a90c838 100644
--- a/src/views/Upgrade.vue
+++ b/src/views/Upgrade.vue
@@ -8,14 +8,15 @@
 			<!-- <div class="upgrade-content-text">System upgrading</div> -->
 			<div class="upgrade-content-text">System maintenance</div>
 			<!-- 没有截至时间 -->
+			<div class="upgrade-content-textab">The AiDA system cannot be accessed temporarily due to system server maintenance. We apologize for any inconvenience this may cause and thank you for your understanding.</div>
 			<!-- <div class="upgrade-content-textab">Due to the system server upgrade, we will start the upgrade from 9:30 am Hong Kong time on the weekend of October 20th until October 21st. During this time,<br> the AiDA system will be temporarily inaccessible. We apologize for any inconvenience this may cause and thank you for your understanding.</div> -->
 			<!-- 有截至时间 -->
-			<div class="upgrade-content-textab">Due to system server upgrades, we will be upgrading from Tuesday, February 4 at 9:30am (HKT) to Thursday, February 6. During this period, the AiDA system will be temporarily inaccessible. <br>We sincerely apologize for the inconvenience caused and thank you for your understanding</div>
+			<!-- <div class="upgrade-content-textab">Due to system server upgrades, we will be upgrading from Tuesday, February 4 at 9:30am (HKT) to Thursday, February 6. During this period, the AiDA system will be temporarily inaccessible. <br>We sincerely apologize for the inconvenience caused and thank you for your understanding</div> -->
 			<br>
 			<br>
 			<br>
-			<div class="upgrade-content-textab">由于系统服务器升级，我们将于2月4日（星期二）上午9:30（香港时间）至2月6日（星期四）进行升级。<br>在此期间，AiDA系统将暂时无法访问。给您带来的不便，我们深表歉意，并感谢您的理解</div>
-			<!-- <div class="upgrade-content-textab">The AiDA system cannot be accessed temporarily due to system server maintenance. We apologize for any inconvenience this may cause and thank you for your understanding.</div> -->
+			<div class="upgrade-content-textab">由于系统服务器维护，AiDA系统暂时无法访问。对于由此造成的任何不便，我们深表歉意，并感谢您的理解</div>
+			<!-- <div class="upgrade-content-textab">由于系统服务器升级，我们将于2月4日（星期二）上午9:30（香港时间）至2月6日（星期四）进行升级。<br>在此期间，AiDA系统将暂时无法访问。给您带来的不便，我们深表歉意，并感谢您的理解</div> -->
 		</div>
 	</div>
 </template>