From 749aaa7b285a47467f397e765c6e3f0719585291 Mon Sep 17 00:00:00 2001 From: "lj7788@126.com" Date: Tue, 17 Jun 2025 16:21:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E8=8F=9C=E5=8D=95=E5=AE=9A?= =?UTF-8?q?=E5=88=B6=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yanzhu-bigscreen/src/api/project.js | 10 +- yanzhu-bigscreen/src/components/header.vue | 109 +++++++++++------ .../mapper/manage/ProProjectInfoMapper.xml | 4 +- .../resources/mapper/system/SysDeptMapper.xml | 7 +- .../controller/ProProjectInfoController.java | 1 + .../controller/bim/BimModelController.java | 14 +++ .../com/yanzhu/manage/hasor/HasorModule.java | 20 +++- .../src/api/system/bigscreenMenu.js | 31 +++++ .../src/views/manage/proProjectInfo/index.vue | 10 +- .../src/views/system/bigscreenMenu/index.vue | 110 ++++++++++++++++++ 10 files changed, 265 insertions(+), 51 deletions(-) create mode 100644 yanzhu-ui-vue3/src/api/system/bigscreenMenu.js create mode 100644 yanzhu-ui-vue3/src/views/system/bigscreenMenu/index.vue diff --git a/yanzhu-bigscreen/src/api/project.js b/yanzhu-bigscreen/src/api/project.js index 97b78fd4..39c2894a 100644 --- a/yanzhu-bigscreen/src/api/project.js +++ b/yanzhu-bigscreen/src/api/project.js @@ -14,7 +14,15 @@ const getProjectInfo=id=>{ }); } +const bigScreenGetMenuByProjectId=id=>{ + return request({ + url: "/manage/api/project/bigscreenMenu/bigScreenGetMenuByProjectId?projectId="+id, + method: "get", + }); +} + export default { findMyProjectList, - getProjectInfo + getProjectInfo, + bigScreenGetMenuByProjectId }; diff --git a/yanzhu-bigscreen/src/components/header.vue b/yanzhu-bigscreen/src/components/header.vue index 8062f2ee..367816c4 100644 --- a/yanzhu-bigscreen/src/components/header.vue +++ b/yanzhu-bigscreen/src/components/header.vue @@ -7,73 +7,71 @@
项目详情
劳务管理
-
+
项目概况
-
+
安全管理
-
+
质量管理
+ + -
-
+
进度管理
@@ -86,22 +84,22 @@
-
绿碳中心
-
+
绿碳中心
+
数字孪生
@@ -143,6 +141,8 @@ export default { selProjectId: "", projects: [], isFullScreen: false, + showMenus: [], + showMenusNavIds: [], }; }, computed: { @@ -159,6 +159,17 @@ export default { }, }, mounted() { + this.showMenus = [ + { + id: 1, + navId: "1", + }, + { + id: 2, + navId: "101", + }, + ]; + this.showMenusNavIds = this.showMenus.map((d) => d.navId); if (location.href.includes("#/detail?prjId=")) { const urlParams = new URLSearchParams(location.href.split("?")[1]); const prjId = urlParams.get("prjId"); @@ -188,6 +199,7 @@ export default { }, 400); }, doProjectSelect() { + this.loadMenu(); let tmps = this.projects.filter((d) => d.id == this.selProjectId); if (tmps.length > 0) { this.$store.dispatch("SetSelProject", tmps[0]); @@ -202,6 +214,27 @@ export default { localStorage.setItem("selProj", this.selProjectId); localStorage.setItem("prj_title", document.title); }, + loadMenu() { + this.$api.project.bigScreenGetMenuByProjectId(this.selProjectId).then((d) => { + + let objs = d.data || []; + if (objs.length == 0) { + objs = [ + { + id: 1, + navId: "1", + }, + { + id: 2, + navId: "101", + }, + ]; + } + this.showMenus = objs; + this.showMenusNavIds = this.showMenus.map((d) => d.navId); + console.log(this.showMenusNavIds); + }); + }, doNav(n) { if (this.nav == n) { return; @@ -243,7 +276,7 @@ export default { break; case 6: this.$router.push("/greenCarbon"); - break; + break; case 702: this.$router.push("/bimRoaming"); break; diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml index 341e7fd0..af45bfb8 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml @@ -109,7 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and pi.project_person_phone = #{projectPersonPhone} and pi.project_status = #{projectStatus} and pi.is_del = #{isDel} - and pi.is_del !=2 + and pi.is_del not in (1,2) order by pi.project_sort, pi.id desc order by psu.sort_by, pi.id desc @@ -423,7 +423,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and pi.project_person_phone = #{projectPersonPhone} and pi.project_status = #{projectStatus} and pi.is_del = #{isDel} - and pi.is_del!= 2 + and pi.is_del=0 order by pi.project_sort, pi.id desc order by psu.sort_by, pi.id desc diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysDeptMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysDeptMapper.xml index 8c5c99bf..63e3dece 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysDeptMapper.xml @@ -71,7 +71,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select d.dept_id from sys_dept d left join sys_role_dept rd on d.dept_id = rd.dept_id - where rd.role_id = #{roleId} + where d.del_flag = '0' and + rd.role_id = #{roleId} and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id = rd.dept_id and rd.role_id = #{roleId}) @@ -80,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"