diff --git a/src/config/config.ts b/src/config/config.ts index 7fdbcd2..ff60707 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 1ac7204..fbcf688 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 fc50dff..a92d334 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 5bbbc9a..7e13c0a 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");