diff --git a/src/components/List/List.vue b/src/components/List/List.vue index 7cd7cc2..5a962b2 100644 --- a/src/components/List/List.vue +++ b/src/components/List/List.vue @@ -321,6 +321,7 @@ export default { async setParams() { const { projectId, startTime, endTime, memberIdList, roleId } = this; + console.log('111111111', startTime, endTime); const params = { param: { projectId, memberIdList, startTime, endTime, roleId } }; await this.getClockQuery(params); }, diff --git a/src/components/TimePicker/TimePicker.vue b/src/components/TimePicker/TimePicker.vue index e2bbfb4..421ea4c 100644 --- a/src/components/TimePicker/TimePicker.vue +++ b/src/components/TimePicker/TimePicker.vue @@ -97,16 +97,20 @@ export default { // 昨天 setYesterday(open) { const day = this.$moment(new Date().getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD'); - this.startValue = day; - this.endValue = day; + // this.startValue = day; + // this.endValue = day; + this.setStartTime(this.$moment(`${day} 00:00`).format('x') - 0); + this.setEndTime(this.$moment(`${day} 23:59`).format('x') - 0); this[open] = false; }, // 今天 setToday(open) { const today = this.$moment(new Date()).format('YYYY-MM-DD'); - this.startValue = today; - this.endValue = today; + // this.startValue = today; + // this.endValue = today; + this.setStartTime(this.$moment(`${today} 00:00`).format('x') - 0); + this.setEndTime(this.$moment(`${today} 23:59`).format('x') - 0); this[open] = false; },