From 1e9163636643b47de87db7df725b834dbd943f4e Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Fri, 6 Jun 2025 23:30:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A7=E5=B1=8F=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yanzhu-bigscreen/src/views/projectDetail.vue | 11 ++++++++++-
 yanzhu-bigscreen/src/views/projectLabor.vue  | 14 ++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/yanzhu-bigscreen/src/views/projectDetail.vue b/yanzhu-bigscreen/src/views/projectDetail.vue
index 8a405494..92161cb2 100644
--- a/yanzhu-bigscreen/src/views/projectDetail.vue
+++ b/yanzhu-bigscreen/src/views/projectDetail.vue
@@ -3,7 +3,9 @@
         <el-col :span="6" class="h100">
             <module-one-1-1 label="项目概况">
                 <img src="images/icon2001.png" class="img-openwin" @click="showDetailDlg" />
-                <div class="glr-title prj-info-title">{{ selProject?.projectName || "" }}</div>
+                <el-tooltip :content="selProject?.projectName || ''" placement="top">
+                    <div class="glr-title prj-info-title">{{ selProject?.projectName || "" }}</div>
+                </el-tooltip>
                 <div class="dept-info-list">
                     <el-row>
                         <el-col :span="12" class="dept-item">
@@ -807,6 +809,13 @@ export default {
 <style lang="less">
 .project-detail {
     color: #c2d5f6;
+    .prj-info-title {
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        width: calc(100% - 30px);
+        display: inline-block;
+    }
     .photography-list {
         width: calc(100% - 4px);
         height: calc(100% - 26px);
diff --git a/yanzhu-bigscreen/src/views/projectLabor.vue b/yanzhu-bigscreen/src/views/projectLabor.vue
index 30180ed1..de838378 100644
--- a/yanzhu-bigscreen/src/views/projectLabor.vue
+++ b/yanzhu-bigscreen/src/views/projectLabor.vue
@@ -215,10 +215,16 @@ export default {
         getRealAttendance() {
             this.$api.labor.getRealAttendance(this.selProject.vendorsCode, this.selProject.id).then((d) => {
                 this.realList = d.data.map((it) => {
-                    it.name = it.workerName
-                    it.workType = it.workTypeName
-                    it.img = it.scanPhoto
-                    if (it.attendanceOutTime) {
+                    it.name = it.workerName||it.userName;
+                    it.workType = it.workTypeName||it.subDeptGroupName
+                    it.img = it.scanPhoto||it.inPhoto||it.outPhoto
+                    if(it.outTime){
+                        it.inOutType = 'out'
+                        it.inoutDate = it.outTime
+                    }else if(it.inTime){
+                        it.inOutType = 'in'
+                        it.inoutDate = it.inTime
+                    }else if (it.attendanceOutTime) {
                         it.inOutType = 'out'
                         it.inoutDate = it.attendanceInTime
                     } else {