diff --git a/src/views/ebiz/attendance/Monthly.vue b/src/views/ebiz/attendance/Monthly.vue index ba54f67be..ad407f8ae 100644 --- a/src/views/ebiz/attendance/Monthly.vue +++ b/src/views/ebiz/attendance/Monthly.vue @@ -234,13 +234,12 @@ export default { let workTime = res.content.rest[i].split(' ') let workTime1 = workTime[0] if (Date.parse(workTime1) < Date.parse(formatDate(new Date(), 'YY-MM-DD'))) { - let arr2 = res.content.rest.slice(0, i + 1) - obj1.date = arr2 - // console.log(arr2) + date1.push(workTime1) } } + obj1.date=date1 arr1.push(obj1) - // console.log(obj1) + console.log(obj1) // this.mask=arr1 let arr = arr1 let obj = {} @@ -254,11 +253,10 @@ export default { // console.log(date) obj.date = date } + console.log(obj) arr.push(obj) - // arr3=arr3.concat(arr1,arr) - this.markDate = arr - console.log(this.markDate) + // console.log(this.markDate) } }) } diff --git a/src/views/ebiz/performance/Performance.vue b/src/views/ebiz/performance/Performance.vue index 83278a773..c4498b185 100644 --- a/src/views/ebiz/performance/Performance.vue +++ b/src/views/ebiz/performance/Performance.vue @@ -96,7 +96,7 @@