diff --git a/.merge_file_a03828 b/.merge_file_a03828 index 8368c88..06ef522 100644 --- a/.merge_file_a03828 +++ b/.merge_file_a03828 @@ -29,7 +29,7 @@ export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL; // export const COMPANY: string = "as"; //鞍山项目 // export const COMPANY: string = "agjt"; //鞍钢集团 // export const COMPANY: string = "agjtLive"; //鞍钢集团现场大屏 -export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏 +// export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏 // export const COMPANY: string = "agjtProjectKanban"; //鞍钢集团项目看板大屏 // export const COMPANY: string = "agjtOverviewScreen"; //鞍钢集团项目总览 // export const COMPANY: string = "cqna"; //重庆市南岸区 @@ -42,3 +42,4 @@ export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏 // export const COMPANY: string = "xjnb"; // 新建宁波项目 // export const COMPANY: string = "ahsa"; // 安徽水安项目 // export const COMPANY: string = "zkax"; // 中科安信项目 +// export const COMPANY: string = "ztsyj"; // 中铁十一局 diff --git a/dist.rar b/dist.rar new file mode 100644 index 0000000..81969d3 Binary files /dev/null and b/dist.rar differ diff --git a/src/config/config.ts b/src/config/config.ts index d7633e1..8e40440 100644 --- a/src/config/config.ts +++ b/src/config/config.ts @@ -23,7 +23,7 @@ export const BAIDU_MAP_KEY: string = ""; export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL; // 项目环境标识配置 部署时需更改对应的项目 -export const COMPANY: string = ""; //标准版 +// export const COMPANY: string = ""; //标准版 // export const COMPANY: string = "zhzrf"; //中海·臻如府 // export const COMPANY: string = "zsbf"; //中水北方 // export const COMPANY: string = "as"; //鞍山项目 @@ -51,3 +51,4 @@ export const COMPANY: string = ""; //标准版 // export const COMPANY: string = "ahsa"; // 安徽水安项目 // export const COMPANY: string = "zkax"; // 中科安信项目 // export const COMPANY: string = "jzjt"; //九柱集团 +export const COMPANY: string = "ztsyj"; // 中铁十一局 diff --git a/src/config/staticMenu.ts b/src/config/staticMenu.ts index 38ceec5..e5e9ef7 100644 --- a/src/config/staticMenu.ts +++ b/src/config/staticMenu.ts @@ -1872,8 +1872,8 @@ export const ZTSYJMenu: Array = [ modulePath: "/projectOverview", }, { - menuName: "视频管理", - companyPath: "/videoManagement" + moduleName: "视频管理", + modulePath: "/videoManagement" }, { moduleName: "绿色施工", @@ -1890,8 +1890,8 @@ export const ZTSYJMenu: Array = [ ] }, { - menuName: "人员定位", - companyPath: "/smartSafeHater" + moduleName: "人员定位", + modulePath: "/smartSafeHater" }, ] // 中铁十一局 diff --git a/src/views/sevenLargeScreen/indexL.vue b/src/views/sevenLargeScreen/indexL.vue index a6eb1b8..6700f55 100644 --- a/src/views/sevenLargeScreen/indexL.vue +++ b/src/views/sevenLargeScreen/indexL.vue @@ -643,7 +643,7 @@ onMounted(async () => { } console.log("配置菜单", menuList.value); console.log("当前跳转的路由", router.currentRoute.value); - // await getAllModelMenu(); + await getAllModelMenu(); // activeTab2.value = router.currentRoute.value; activeTab.value = menuList.value[0].modulePath; activeTab2.value = menuList.value[0].modulePath; @@ -722,7 +722,7 @@ function loginOut() { } //跳转后台 function jumpBgd() { - const envList = ["agjt", "zkax", "zkjc", "hfqc", "cpgs", "cqna", "jzjt", "tj", "scwc", "bthg", "zmml"]; // 环境标识 + const envList = ["agjt", "zkax", "zkjc", "hfqc", "cpgs", "cqna", "jzjt", "tj", "scwc", "bthg", "zmml","ztsyj"]; // 环境标识 // 标准版——跳转演示平台项目后台 if (COMPANY == "") { window.location.replace("http://jxj.zhgdyun.com:100/#/login?token=" + store.token);