Skip to content

Commit

Permalink
Merge pull request #279 from joe511230/bugfix_ce_v4
Browse files Browse the repository at this point in the history
bugfix:修复主机切换时变更记录时间选择器未重置的问题
  • Loading branch information
joe511230 authored Apr 24, 2018
2 parents 3481dca + b167325 commit df7335a
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions src/ui/src/components/history/history.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<div class="history-filter clearfix">
<div class="filter-group date fl">
<label>时间范围</label>
<bk-daterangepicker class="filter-field"
<bk-daterangepicker class="filter-field" ref="dateRangePicker"
@change="setFilterDate"
:range-separator="'-'"
:quick-select="false"
Expand Down Expand Up @@ -128,7 +128,11 @@
if (active) {
this.getHistory()
} else {
// this.filter.date = [`${this.initDate.start} 00:00:00`, `${this.initDate.end} 23:59:59`]
let $dateRangePicker = this.$refs.dateRangePicker
$dateRangePicker.selectedDateView = `${this.initDate.start} - ${this.initDate.end}`
$dateRangePicker.selectedDateRange = [this.initDate.start, this.initDate.end]
$dateRangePicker.selectedDateRangeTmp = [this.initDate.start, this.initDate.end]
this.filter.date = [`${this.initDate.start} 00:00:00`, `${this.initDate.end} 23:59:59`]
this.filter.user = ''
}
}
Expand Down

0 comments on commit df7335a

Please sign in to comment.