flx：冲突

src/routers/modules/staticRouter.ts

@@ -25,8 +25,8 @@ export const staticRouter: RouteRecordRaw[] = [
 		path: "/large",
 		name: "大屏",
 		// component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版
-		component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏
+		// component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏
-		// component: () => import("@/views/agjtProjectKanban/indexL.vue"), //鞍钢集团项目看板大屏
+		component: () => import("@/views/overviewScreen/indexCommand.vue"), //总览大屏
 		// component: () => import("@/views/sevenLargeScreen/indexL_syhy.vue"), // 只有一级路由(盘锦、嘉兴、鄱湖美湾医疗项目需切换至该首页)
 		children: [
 			{
@@ -275,6 +275,11 @@ export const staticRouter: RouteRecordRaw[] = [
 				path: "/agjtProjectKanban",
 				name: "鞍钢项目看板大屏",
 				component: () => import("@/views/agjtProjectKanban/comprehensiveManage/projectOverview/index.vue")
+			},
+			{
+				path: "/overviewScreen",
+				name: "总览大屏",
+				component: () => import("@/views/overviewScreen/commandCenter/index.vue")
 			}
 		],
 		meta: {

src/views/login/index.vue

@@ -110,9 +110,18 @@ const login = (formEl: FormInstance | undefined) => {
 				// 	});
 				// 	return;
 				// }
-				// router.push("/commandScreen");
+				router.push("/commandScreen");
 			} else if(COMPANY === "agjtProjectKanban") {
 				router.push("/agjtProjectKanban");
+				if (![5, 10].includes(result.accountType)) {
+					ElMessage({
+						message: "账号类型不匹配",
+						type: "warning"
+					});
+					return;
+				}
+				// router.push("/commandScreen");
+				router.push("/overviewScreen");
 			} else {
 				// router.push("/projectOverview");
 			}