From d5e56c3a3b1c497e6ddb7ea499e8d5e9b71e5291 Mon Sep 17 00:00:00 2001
From: X_Rian <904416525@qq.com>
Date: Tue, 25 Jun 2024 10:37:48 +0800
Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E4=BF=AE=E6=94=B9=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E6=9D=83=E9=99=90=E5=88=A4=E6=96=AD=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=9C=8B=E6=9D=BF=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/config.ts                          |  4 ++--
 src/routers/modules/staticRouter.ts           |  4 ++--
 .../projectOverview/centerBottom.vue          |  4 ++++
 src/views/login/index.vue                     | 22 ++++++++++++-------
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/config/config.ts b/src/config/config.ts
index 7fdbcd26..ff607076 100644
--- a/src/config/config.ts
+++ b/src/config/config.ts
@@ -28,9 +28,9 @@ export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL;
 // export const COMPANY: string = "zsbf"; //中水北方
 // export const COMPANY: string = "as"; //鞍山项目
 // export const COMPANY: string = "agjt"; //鞍钢集团
-export const COMPANY: string = "agjtLive"; //鞍钢集团现场大屏
+// export const COMPANY: string = "agjtLive"; //鞍钢集团现场大屏
 // export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏
-// export const COMPANY: string = "agjtProjectKanban"; //鞍钢集团项目看板大屏
+export const COMPANY: string = "agjtProjectKanban"; //鞍钢集团项目看板大屏
 // export const COMPANY: string = "agjtOverviewScreen"; //鞍钢集团项目总览
 // export const COMPANY: string = "zkjc"; //中科佳成项目
 // export const COMPANY: string = "cqna"; //重庆南岸项目
diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts
index 1ac72047..fbcf6885 100644
--- a/src/routers/modules/staticRouter.ts
+++ b/src/routers/modules/staticRouter.ts
@@ -26,9 +26,9 @@ export const staticRouter: RouteRecordRaw[] = [
 		name: "大屏",
 		// component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版
 		// component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏
-		component: () => import("@/views/agjtLiveScreen/indexLive.vue"), //鞍钢现场大屏
+		// component: () => import("@/views/agjtLiveScreen/indexLive.vue"), //鞍钢现场大屏
 		// component: () => import("@/views/overviewScreen/indexCommand.vue"), //总览大屏
-		// component: () => import("@/views/agjtProjectKanban/indexL.vue"), //鞍钢集团项目看板大屏
+		component: () => import("@/views/agjtProjectKanban/indexL.vue"), //鞍钢集团项目看板大屏
 		// component: () => import("@/views/sevenLargeScreen/indexL_syhy.vue"), // 只有一级路由(盘锦、嘉兴、鄱湖美湾医疗项目需切换至该首页)
 		children: [
 			{
diff --git a/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/centerBottom.vue b/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/centerBottom.vue
index fc50dff8..a92d334a 100644
--- a/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/centerBottom.vue
+++ b/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/centerBottom.vue
@@ -299,6 +299,8 @@ onMounted(async () => {
 							width: 25%;
 							text-align: center;
 							white-space: nowrap;
+							overflow: hidden;
+							text-overflow: ellipsis;
 						}
 					}
 
@@ -391,6 +393,8 @@ onMounted(async () => {
 							width: 17%;
 							text-align: center;
 							white-space: nowrap;
+							overflow: hidden;
+							text-overflow: ellipsis;
 						}
 					}
 
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 5bbbc9a7..7e13c0ae 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -103,13 +103,13 @@ const login = (formEl: FormInstance | undefined) => {
 			// console.log(COMPANY,666777)
 			if (COMPANY === "agjtCommand") {
 				// menuList.value = AGJTCommandMenu;
-				// if (![5, 10].includes(result.accountType)) {
-				// 	ElMessage({
-				// 		message: "账号类型不匹配",
-				// 		type: "warning"
-				// 	});
-				// 	return;
-				// }
+				if (![5, 10].includes(result.accountType)) {
+					ElMessage({
+						message: "账号类型不匹配",
+						type: "warning"
+					});
+					return;
+				}
 				router.push("/commandScreen");
 			} else if (COMPANY === "agjtProjectKanban") {
 				if (![5, 10].includes(result.accountType)) {
@@ -130,8 +130,14 @@ const login = (formEl: FormInstance | undefined) => {
 					return;
 				}
 				router.push("/agjtLiveScreen");
-			} else if (COMPANY === "agjtOverview") {
 			} else if (COMPANY === "agjtOverviewScreen") {
+				if (![5, 10].includes(result.accountType)) {
+					ElMessage({
+						message: "账号类型不匹配",
+						type: "warning"
+					});
+					return;
+				}
 				router.push("/overviewScreen");
 			} else {
 				router.push("/projectOverview");