Commit 1b3147eb authored by wangxuelai's avatar wangxuelai

Merge remote-tracking branch 'origin/bww-develop' into wxl-develop

parents 9c067139 8668355f
......@@ -253,13 +253,14 @@ class StaticCenter extends React.Component {
return time >= that.ds.state.start && time <= that.ds.state.end;
},
});
console.log(dv, 'dv');
const cols = {
month: {
type: 'time',
tickCount: 10,
},
};
const yesterday = moment(moment().subtract(6, 'days').unix() * 1000);
const today = moment(moment().unix() * 1000);
return (
<div className={pageStyle.container}>
<ClassRoomMgt
......@@ -335,7 +336,7 @@ class StaticCenter extends React.Component {
' 最近7天': [moment().subtract(6, 'days'), moment()],
' 最近三十天 ': [moment().subtract(29, 'days'), moment()],
}}
defaultValue={[moment(chartStartDate), moment(chartEndDate)]}
defaultValue={[yesterday, today]}
disabledDate={this.disabledDate}
onChange={this.onRangePickerChange}
allowClear={false}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment