|
@@ -2780,15 +2780,16 @@
|
|
|
var sl = this.workForm.domains
|
|
|
var quanbu = 0
|
|
|
var zhi = ''
|
|
|
+ let timeArr = []
|
|
|
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) {
|
|
|
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})
|
|
|
+ timeArr.push({startTime: sl[i].worktimeList[j].startTime, endTime: sl[i].worktimeList[j].endTime})
|
|
|
for(var j in arr) {
|
|
|
subtractedData += +this.timeOverlap(j, arr)
|
|
|
}
|
|
@@ -2803,8 +2804,21 @@
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- // this.jsTime = quanbu
|
|
|
this.$set(this, 'jsTime', quanbu)
|
|
|
+ this.getTimeHours(timeArr)
|
|
|
+ },
|
|
|
+ // 调用接口或去数据
|
|
|
+ getTimeHours(arr) {
|
|
|
+ this.http.post('/report/getHoursByTimeRange',{
|
|
|
+ timeJsonStr: JSON.stringify(arr)
|
|
|
+ },res => {
|
|
|
+ this.$set(this, 'jsTime', res.data)
|
|
|
+ },err => {
|
|
|
+ this.$message({
|
|
|
+ message: err,
|
|
|
+ type: 'error'
|
|
|
+ })
|
|
|
+ })
|
|
|
},
|
|
|
removeTimeItem(item, index) {
|
|
|
item.worktimeList.splice(index, 1);
|
|
@@ -5332,7 +5346,6 @@
|
|
|
if (((dateAr[k].s <= dateAr[idx].s && dateAr[k].e >= dateAr[idx].s) || (dateAr[k].s <= dateAr[idx].s && dateAr[k].e <= dateAr[idx].e))) {
|
|
|
// 选择的时间包含设置的休息时间段 (选择的开始时间和结束时间大于设置的休息时间段)
|
|
|
if(dateAr[idx].s > dateAr[k].s && dateAr[idx].e < dateAr[k].e) {
|
|
|
- // zhi += 2
|
|
|
zhi += +this.getHour(dateAr[idx].s, dateAr[idx].e)
|
|
|
}
|
|
|
// 选择的时间包含在设置的休息时间 (选择的开始时间和结束时间都处于在设置的休息时间段内)
|