From 0edc3c6a54ba9c759975aa03d813197abfa04dd0 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Tue, 13 Dec 2022 02:28:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=80=83=E5=8B=A4=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../parkingAreaControlVideo.js                | 14 +++----
 .../todayAttendanceDetail.html                | 13 ++++--
 public/vcCore/vcFramework.js                  | 42 ++++++++++++-------
 3 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/public/components/property/parkingAreaControlVideo/parkingAreaControlVideo.js b/public/components/property/parkingAreaControlVideo/parkingAreaControlVideo.js
index 5740a74a2..50c249c6e 100644
--- a/public/components/property/parkingAreaControlVideo/parkingAreaControlVideo.js
+++ b/public/components/property/parkingAreaControlVideo/parkingAreaControlVideo.js
@@ -171,13 +171,13 @@
                 });
                 wsUrl = wsUrl.replace(':8131', ':9080')
                 let _protocol = window.location.protocol;
-                if (_protocol.startsWith('https')) {
-                    wsUrl =
-                        "wss://" + wsUrl;
-                } else {
-                    wsUrl =
-                        "ws://" + wsUrl;
-                }
+                // if (_protocol.startsWith('https')) {
+                //     wsUrl =
+                //         "wss://" + wsUrl;
+                // } else {
+                wsUrl =
+                    "ws://" + wsUrl;
+                // }
 
                 let image = document.getElementById("receiver2");
                 if (wsUrl.endsWith(".flv")) {
diff --git a/public/components/property/todayAttendanceDetail/todayAttendanceDetail.html b/public/components/property/todayAttendanceDetail/todayAttendanceDetail.html
index ab10dce8a..59f2d7d5c 100755
--- a/public/components/property/todayAttendanceDetail/todayAttendanceDetail.html
+++ b/public/components/property/todayAttendanceDetail/todayAttendanceDetail.html
@@ -16,18 +16,23 @@
                                     <thead>
                                         <tr>
                                             <th class="text-center"><span><vc:i18n name="名称" namespace="todayAttendanceDetail"></vc:i18n></span></th>
+
+                                            <th class="text-center"><span><vc:i18n name="打卡范围" namespace="todayAttendanceDetail"></vc:i18n></span></th>
+                                            <th class="text-center"><span><vc:i18n name="迟到/早退" namespace="todayAttendanceDetail"></vc:i18n></span></th>
                                             <th class="text-center"><span><vc:i18n name="状态" namespace="todayAttendanceDetail"></vc:i18n></span></th>
-                                            <th class="text-center"><span><vc:i18n name="考勤时间" namespace="todayAttendanceDetail"></vc:i18n></span></th>
                                             <th class="text-center"><span><vc:i18n name="打卡时间" namespace="todayAttendanceDetail"></vc:i18n></span></th>
                                             <th class="text-center"><span><vc:i18n name="抓拍" namespace="todayAttendanceDetail"></vc:i18n></span></th>
                                         </tr>
                                     </thead>
                                     <tbody>
                                         <tr v-for="detail in todayAttendanceDetailInfo.attendanceClassesTaskDetails">
-                                            <td class="text-center">{{detail.specName}}</td>
+                                            <td class="text-center">{{detail.specCd == '1001'?'上班':'下班'}}</td>
+                                            <td class="text-center" v-if="detail.specCd == '1001'">{{vc.timeMinFormat(detail.leaveValue)}}~{{vc.timeMinFormat(detail.value)}}</td>
+                                            <td class="text-center" v-else>{{vc.timeMinFormat(detail.value)}}~{{vc.timeMinFormat(detail.lateValue)}}</td>
+                                            <td class="text-center" v-if="detail.specCd == '1001'">{{vc.timeMinFormat(detail.value)}}~{{vc.timeMinFormat(detail.lateValue)}}</td>
+                                            <td class="text-center" v-else>{{vc.timeMinFormat(detail.leaveValue)}}~{{vc.timeMinFormat(detail.value)}}</td>
                                             <td class="text-center">{{detail.stateName}}</td>
-                                            <td class="text-center">{{detail.value}}</td>
-                                            <td class="text-center">{{detail.checkTime}}</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"
diff --git a/public/vcCore/vcFramework.js b/public/vcCore/vcFramework.js
index eb41bdaf4..ba317d5d5 100755
--- a/public/vcCore/vcFramework.js
+++ b/public/vcCore/vcFramework.js
@@ -1728,6 +1728,20 @@
         return y + '-' + add0(m) + '-' + add0(d);
     }
 
+    vcFramework.timeFormat = function(_time) {
+        let _date = new Date(_time);
+        let h = _date.getHours();
+        let mm = _date.getMinutes();
+        let s = _date.getSeconds();
+        return add0(h) + ':' + add0(mm) + ':' + add0(s);
+    }
+    vcFramework.timeMinFormat = function(_time) {
+        let _date = new Date(_time);
+        let h = _date.getHours();
+        let mm = _date.getMinutes();
+        return add0(h) + ':' + add0(mm);
+    }
+
     vcFramework.dateSubOneDay = function(_startTime, _endTime, feeFlag) {
         if (!_endTime || _endTime == '-') {
             return _endTime
@@ -1970,42 +1984,42 @@
         })
     }
 
-    vcFramework.getWeek = function(_week){
-        if(_week == 1){
+    vcFramework.getWeek = function(_week) {
+        if (_week == 1) {
             return '第一周';
         }
-        if(_week == 2){
+        if (_week == 2) {
             return '第二周';
         }
-        if(_week == 3){
+        if (_week == 3) {
             return '第三周';
         }
-        if(_week == 4){
+        if (_week == 4) {
             return '第四周';
         }
-        
+
     }
 
-    vcFramework.getWorkDay = function(_day){
-        if(_day == 1){
+    vcFramework.getWorkDay = function(_day) {
+        if (_day == 1) {
             return '星期一';
         }
-        if(_day == 2){
+        if (_day == 2) {
             return '星期二';
         }
-        if(_day == 3){
+        if (_day == 3) {
             return '星期三';
         }
-        if(_day == 4){
+        if (_day == 4) {
             return '星期四';
         }
-        if(_day == 5){
+        if (_day == 5) {
             return '星期五';
         }
-        if(_day == 6){
+        if (_day == 6) {
             return '星期六';
         }
-        if(_day == 7){
+        if (_day == 7) {
             return '星期日';
         }
     }