flx:修改登录权限判断 修改看板样式问题

This commit is contained in:
X_Rian 2024-06-25 10:37:48 +08:00
parent 69843e72c7
commit d5e56c3a3b
4 changed files with 22 additions and 12 deletions

View File

@ -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"; //重庆南岸项目

View File

@ -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: [
{

View File

@ -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;
}
}

View File

@ -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");