调整PC端的时间计算

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -2709,33 +2709,24 @@
                 var zhi = ''
                 for(var i in sl) {
                     for(var j in sl[i].worktimeList){
+                        let addUp = 0
                         if(sl[i].worktimeList[j].startTime && sl[i].worktimeList[j].endTime) {
-                            // var date2 = '2021/12/12 ' + sl[i].worktimeList[j].endTime +':00'
-                            // var date1 = '2021/12/12 ' + sl[i].worktimeList[j].startTime +':00'
-                            // var date3 = new Date(date2).getTime() - new Date(date1).getTime();
-                            // var leave1=date3%(24*3600*1000)
-                            // var hours=Math.floor(leave1/(3600*1000))
-                            // var leave2=leave1%(3600*1000)
-                            // var minutes=Math.floor(leave2/(60*1000))
-                            // var shi = hours+'.'+ minutes
-                            // var sll = +shi + 0
-                            // zhi = this.jsDay * sll
-                            // quanbu = +quanbu + zhi
                             let selectionTime = this.getHour(sl[i].worktimeList[j].startTime, sl[i].worktimeList[j].endTime)
                             let subtractedData = 0
                             console.log(selectionTime)
                             let arr = JSON.parse(JSON.stringify(this.vacationTime))
                             arr.unshift({s: sl[i].worktimeList[j].startTime, e: sl[i].worktimeList[j].endTime})
-                            console.log(arr, '要看的数据')
-
                             for(var j in arr) {
                                 subtractedData += +this.timeOverlap(j, arr)
                             }
-                            console.log(subtractedData, '要减去的数据')
-                            quanbu = +selectionTime - +subtractedData
-                            console.log(quanbu, '赋值的数据')
-                            console.log(this._computedWatchers.totalReportHours)
-                            // this.workForm.domains = JSON.parse(JSON.stringify(this.workForm.domains))
+                            if(this.reportTimeType.multiWorktime == 1) {
+                                addUp = +selectionTime - +subtractedData
+                            } else {
+                                quanbu = +selectionTime - +subtractedData
+                            }
+                        }
+                        if(this.reportTimeType.multiWorktime == 1) {
+                            quanbu += addUp
                         }
                     }
                 }
@@ -5224,16 +5215,6 @@
                     var he = 0
                     for(var i in zhi) {
                         if(zhi[i].time && zhi[i].time.length > 0  && i != 'zhoDataTime' && i != 'he') {
-                            // var date2 = '2021/12/12 ' + zhi[i].time[1] +':00'
-                            // var date1 = '2021/12/12 ' + zhi[i].time[0] +':00'
-                            // var date3 = new Date(date2).getTime() - new Date(date1).getTime();
-                            // var leave1=date3%(24*3600*1000)
-                            // var hours=Math.floor(leave1/(3600*1000))
-                            // var leave2=leave1%(3600*1000)
-                            // var minutes=Math.floor(leave2/(60*1000))
-                            // var shi = hours+'.'+ minutes
-                            // he += +shi
-                            // let selectionTime = this.getHourMinutes(zhi[i].time[0], zhi[i].time[1])
                             let selectionTime = this.getHour(zhi[i].time[0], zhi[i].time[1])
                             let subtractedData = 0
                             // he += +this.getHour(zhi[i].time[0], zhi[i].time[1])