diff --git a/src/components/Ems/DateRangeSelect/index.vue b/src/components/Ems/DateRangeSelect/index.vue index 10196c2..fb026df 100644 --- a/src/components/Ems/DateRangeSelect/index.vue +++ b/src/components/Ems/DateRangeSelect/index.vue @@ -38,9 +38,9 @@ export default { } }, methods: { - init(){ + init(today=false){ const now = new Date(),formatNow = formatDate(now); - const weekAgo = formatDate(new Date(now.getTime() - 7 * 24 * 60 * 60 * 1000)) + const weekAgo = formatDate(today ? new Date(now.getTime()) : new Date(now.getTime() - 7 * 24 * 60 * 60 * 1000)) this.dateRange = [weekAgo, formatNow]; this.defaultDateRange=[weekAgo, formatNow]; this.$emit('updateDate',this.dateRange) diff --git a/src/components/Ems/ZdSelect/index.vue b/src/components/Ems/ZdSelect/index.vue index 83e85cc..bfe869f 100644 --- a/src/components/Ems/ZdSelect/index.vue +++ b/src/components/Ems/ZdSelect/index.vue @@ -3,13 +3,13 @@