From 99b9501c61c70b849e514f11f3963839048eb584 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Tue, 31 Jan 2023 02:13:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=95=E7=A4=BA=E8=80=83=E5=8B=A4=E4=BA=BA?=
 =?UTF-8?q?=E8=84=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../todayAttendanceDetail/todayAttendanceDetail.html      | 8 +++-----
 .../todayAttendanceDetail/todayAttendanceDetail.js        | 2 +-
 .../property/attendanceLogManage/attendanceLogManage.html | 8 ++++++++
 .../property/attendanceLogManage/attendanceLogManage.js   | 7 ++++++-
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/public/components/property/todayAttendanceDetail/todayAttendanceDetail.html b/public/components/property/todayAttendanceDetail/todayAttendanceDetail.html
index 59f2d7d5c..a1a4a29ba 100755
--- a/public/components/property/todayAttendanceDetail/todayAttendanceDetail.html
+++ b/public/components/property/todayAttendanceDetail/todayAttendanceDetail.html
@@ -1,4 +1,4 @@
-<div id="todayAttendanceDetailModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="todayAttendanceDetailModelLabel" aria-hidden="true">
+<div id="todayAttendanceDetailModel" class="modal fade" role="dialog" aria-labelledby="todayAttendanceDetailModelLabel" aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-header">
@@ -34,10 +34,8 @@
                                             <td class="text-center">{{detail.stateName}}</td>
                                             <td class="text-center">{{detail.checkTime || '未打卡' }} </td>
                                             <td class="text-right ">
-                                                <span v-for="_photo in detail.photos">
-                                                <img style="width: 60px; height: 60px;" v-bind:src="_photo.url"
-                                                     v-on:click="openFile(_photo)">
-                                            </span>
+                                                <img style="width: 60px; height: 60px;" v-if="detail.facePath" v-bind:src="detail.facePath"
+                                                     v-on:click="openFile(detail)">
                                             </td>
                                         </tr>
                                     </tbody>
diff --git a/public/components/property/todayAttendanceDetail/todayAttendanceDetail.js b/public/components/property/todayAttendanceDetail/todayAttendanceDetail.js
index c4dbc7ccd..35ff9f03d 100755
--- a/public/components/property/todayAttendanceDetail/todayAttendanceDetail.js
+++ b/public/components/property/todayAttendanceDetail/todayAttendanceDetail.js
@@ -23,7 +23,7 @@
             },
             openFile: function (_photo) {
                 vc.emit('viewImage', 'showImage', {
-                    url: _photo.url
+                    url: _photo.facePath
                 });
             }
         }
diff --git a/public/pages/property/attendanceLogManage/attendanceLogManage.html b/public/pages/property/attendanceLogManage/attendanceLogManage.html
index 3d44309b7..169e98317 100755
--- a/public/pages/property/attendanceLogManage/attendanceLogManage.html
+++ b/public/pages/property/attendanceLogManage/attendanceLogManage.html
@@ -70,6 +70,9 @@
                     <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
                         <thead>
                         <tr>
+                            <th class="text-center">
+                                <span><vc:i18n name="人脸" namespace="attendanceLogManage"></vc:i18n></span>
+                            </th>
                             <th class="text-center">
                                 <span><vc:i18n name="部门名称" namespace="attendanceLogManage"></vc:i18n></span>
                             </th>
@@ -86,6 +89,10 @@
                         </thead>
                         <tbody>
                         <tr v-for="attendance in attendanceLogManageInfo.attendances">
+                            <td class="text-center" style="white-space: nowrap;">
+                                <img style="width: 60px; height: 60px;" class="border-radius" v-if="attendance.facePath" v-bind:src="attendance.facePath" v-on:click="_viewOwnerFace(attendance.facePath)" />
+                                <img style="width: 60px; height: 60px;" class="border-radius" v-else src="/img/noPhoto.jpg" />
+                            </td>
                             <td class="text-center">{{attendance.departmentName}}</td>
                             <td class="text-center">{{attendance.staffName}}</td>
                             <td class="text-center">{{attendance.staffId}}</td>
@@ -106,4 +113,5 @@
             </div>
         </div>
     </div>
+    <vc:create path="common/viewImage"></vc:create>
 </div>
\ No newline at end of file
diff --git a/public/pages/property/attendanceLogManage/attendanceLogManage.js b/public/pages/property/attendanceLogManage/attendanceLogManage.js
index 34e53ebe2..5bdcff0e1 100755
--- a/public/pages/property/attendanceLogManage/attendanceLogManage.js
+++ b/public/pages/property/attendanceLogManage/attendanceLogManage.js
@@ -99,7 +99,12 @@
                 } else {
                     vc.component.attendanceLogManageInfo.moreCondition = true;
                 }
-            }
+            },
+            _viewOwnerFace: function(_url) {
+                vc.emit('viewImage', 'showImage', {
+                    url: _url
+                });
+            },
         }
     });
 })(window.vc);
\ No newline at end of file