From 9e3205060a657ac9df3933b005f0356fadaa1759 Mon Sep 17 00:00:00 2001 From: haha Date: Sun, 1 Jun 2025 21:13:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A7=E5=B1=8F=E5=8A=B3?= =?UTF-8?q?=E5=8A=A1=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yanzhu-bigscreen/src/views/projectDetail.vue | 10 +- yanzhu-bigscreen/src/views/projectLabor.vue | 5 +- .../ProProjectInfoSubdeptsUsersMapper.xml | 4 +- ...roProjectInfoSubdeptsUsersServiceImpl.java | 5 +- .../views/bim/bimSetting/PersonRoaming.vue | 6 +- .../src/views/bim/bimSetting/index.vue | 9 +- .../src/views/manage/videoMonitor/index.vue | 487 +++++++++--------- 7 files changed, 263 insertions(+), 263 deletions(-) diff --git a/yanzhu-bigscreen/src/views/projectDetail.vue b/yanzhu-bigscreen/src/views/projectDetail.vue index 9b64e308..8a405494 100644 --- a/yanzhu-bigscreen/src/views/projectDetail.vue +++ b/yanzhu-bigscreen/src/views/projectDetail.vue @@ -577,6 +577,7 @@ export default { } this.$api.project.getProjectInfo(this.selProject.id).then((d) => { this.prjInfo = d.data || {} + this.prjInfo.vendorsCode = 'uni' let tmps = this.prjInfo.projectDeptsList || [] const func = (t) => { let objs = tmps.filter((it) => it.deptType == t) @@ -613,12 +614,11 @@ export default { }) this.getWeatherNowInfo() } + this.loadAttendanceData() + this.loadMilestoneData() + this.loadCostOutput() + this.initPhotographyList() }) - - this.loadAttendanceData() - this.loadMilestoneData() - this.loadCostOutput() - this.initPhotographyList() }, initPhotographyList() { this.$api.detail.photographyList(this.selProject.id).then((d) => { diff --git a/yanzhu-bigscreen/src/views/projectLabor.vue b/yanzhu-bigscreen/src/views/projectLabor.vue index 76181cbf..30180ed1 100644 --- a/yanzhu-bigscreen/src/views/projectLabor.vue +++ b/yanzhu-bigscreen/src/views/projectLabor.vue @@ -62,7 +62,7 @@ { let sum = 0 d.data.forEach((item) => { + item.id = item.id || item.comId sum += item.id ? item.id : 0 }) this.workerTotal = sum this.workerGroupList = d.data.map((item) => { return { - name: item.workTypeName, + name: item.workTypeName || item.craftPostName, value: item.id ? item.id : 0, } }) diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml index aa285374..0744dea1 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml @@ -420,7 +420,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - select psu.card_code cardCode,nav.address comName from pro_project_info_subdepts_users psu left join sys_native nav on left(psu.card_code,6)=nav.id @@ -431,7 +431,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"