diff --git a/yanzhu-bigscreen/src/components/header.vue b/yanzhu-bigscreen/src/components/header.vue index 367816c4..15b45864 100644 --- a/yanzhu-bigscreen/src/components/header.vue +++ b/yanzhu-bigscreen/src/components/header.vue @@ -143,6 +143,7 @@ export default { isFullScreen: false, showMenus: [], showMenusNavIds: [], + notDetail:false, }; }, computed: { @@ -175,7 +176,9 @@ export default { const prjId = urlParams.get("prjId"); localStorage.setItem("selProj", prjId); setTimeout(() => { - location.hash = "#/detail"; + if(this.notDetail == false){ + location.hash = "#/detail"; + } }, 800); } window.xapp = this; @@ -216,7 +219,6 @@ export default { }, loadMenu() { this.$api.project.bigScreenGetMenuByProjectId(this.selProjectId).then((d) => { - let objs = d.data || []; if (objs.length == 0) { objs = [ @@ -232,6 +234,18 @@ export default { } this.showMenus = objs; this.showMenusNavIds = this.showMenus.map((d) => d.navId); + let tmps = this.showMenusNavIds.filter((item) => [1, 2, 3, 4, 5, 6, 7].includes(+item)); + if (!tmps.includes(2)) { + let nav = tmps[0]; + nav = tmps[0]; + tmps = this.showMenusNavIds.filter((item) => String(item).startsWith(nav+"")); + if (tmps.length > 1) { + nav= tmps[1]; + } + this.$store.dispatch("ChangeNav", nav); + this.doNav(+nav); + this.notDetail=true; + } console.log(this.showMenusNavIds); }); }, diff --git a/yanzhu-bigscreen/src/views/bimRoaming.vue b/yanzhu-bigscreen/src/views/bimRoaming.vue index 1a373779..762dc48d 100644 --- a/yanzhu-bigscreen/src/views/bimRoaming.vue +++ b/yanzhu-bigscreen/src/views/bimRoaming.vue @@ -746,7 +746,7 @@ export default { margin: 10px; line-height: 50px; text-align: center; - color: #909399; + color: #edffff85; } @media (max-width: 1920px) {