Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager into dev

src/pages/statistical/building/detail.jsx

@@ -33,8 +33,8 @@ class buildingDetailStats extends React.Component {
   }
 
   componentDidMount() {
-    this.getTimeBarDate(moment().subtract(7, 'day').toDate(),new Date())
-    this.getTimeTableData(moment().subtract(7, 'day').toDate(),new Date())
+    this.getTimeBarDate(moment().subtract(6, 'day').toDate(),new Date())
+    this.getTimeTableData(moment().subtract(6, 'day').toDate(),new Date())
     this.setState({...this.state, endDate: new Date(), startDate: moment().subtract(7, 'day').toDate() })
     
   }
@@ -74,12 +74,12 @@ class buildingDetailStats extends React.Component {
 
   //点击查询
   datalist = () => {
-    this.getTimeBarDate(daterange[0] === undefined ? moment().subtract(7, 'day').toDate() : daterange[0],daterange[1] === undefined ? new Date() : daterange[1])
-    this.getTimeTableData(daterange[0] === undefined ? moment().subtract(7, 'day').toDate() : daterange[0],daterange[1] === undefined ? new Date() : daterange[1])
+    this.getTimeBarDate(daterange[0] === undefined ? moment().subtract(6, 'day').toDate() : daterange[0],daterange[1] === undefined ? new Date() : daterange[1])
+    this.getTimeTableData(daterange[0] === undefined ? moment().subtract(6, 'day').toDate() : daterange[0],daterange[1] === undefined ? new Date() : daterange[1])
     this.setState({ 
       ...this.state,
       endDate: daterange[1] === undefined ? new Date() : daterange[1],
-      startDate: daterange[0] === undefined ? moment().subtract(7, 'day').toDate() : daterange[0],
+      startDate: daterange[0] === undefined ? moment().subtract(6, 'day').toDate() : daterange[0],
     })
     
   }
@@ -154,7 +154,7 @@ class buildingDetailStats extends React.Component {
       <Form layout="inline">
       <Radio.Group buttonStyle="solid" defaultValue="a">
           <Radio.Button value="c" onClick={() => this.getDataOf(0)}>今日</Radio.Button>
-          <Radio.Button value="a" onClick={() => this.getDataOf(7)}>最近7天</Radio.Button>
+          <Radio.Button value="a" onClick={() => this.getDataOf(6)}>最近7天</Radio.Button>
           <Radio.Button value="b" onClick={() => this.getDataOf(30)}>最近1月</Radio.Button>
         </Radio.Group>
         <Form.Item>
@@ -173,9 +173,9 @@ class buildingDetailStats extends React.Component {
         )}
         </Form.Item>
         <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }} onClick={() => this.datalist()}>
-          查询
+          搜索
         </Button>
-        <Button type="danger" onClick={this.handleReset} style={{ marginBottom: '18px', marginLeft: '30px' }}>重置</Button>
+        <Button onClick={this.handleReset} style={{ marginBottom: '18px', marginLeft: '30px' }}>重置</Button>
         </Form>
         <StatsChartLine title={this.state.buildingName} data={this.state.barData} />
         <Row>

src/pages/statistical/building/index.jsx

@@ -32,8 +32,8 @@ class buildingStats extends React.Component {
   }
 
   componentDidMount() {
-    this.getBarData(moment().subtract(7, 'day').toDate(), new Date())
-    this.getTableData(moment().subtract(7, 'day').toDate(), new Date(), this.state.buildingId)
+    this.getBarData(moment().subtract(6, 'day').toDate(), new Date())
+    this.getTableData(moment().subtract(6, 'day').toDate(), new Date(), this.state.buildingId)
     this.setState({ ...this.state, endDate: new Date(), startDate: moment().subtract(7, 'day').toDate() })
 
   }
@@ -73,12 +73,12 @@ class buildingStats extends React.Component {
 
   //点击查询
   datalist = () => {
-    this.getBarData(daterange[0] === undefined ? moment().subtract(7, 'day').toDate() : daterange[0], daterange[1] === undefined ? new Date() : daterange[1])
-    this.getTableData(daterange[0] === undefined ? moment().subtract(7, 'day').toDate() : daterange[0], daterange[1] === undefined ? new Date() : daterange[1], this.state.buildingId)
+    this.getBarData(daterange[0] === undefined ? moment().subtract(6, 'day').toDate() : daterange[0], daterange[1] === undefined ? new Date() : daterange[1])
+    this.getTableData(daterange[0] === undefined ? moment().subtract(6, 'day').toDate() : daterange[0], daterange[1] === undefined ? new Date() : daterange[1], this.state.buildingId)
     this.setState({
       ...this.state,
       endDate: daterange[1] === undefined ? new Date() : daterange[1],
-      startDate: daterange[0] === undefined ? moment().subtract(7, 'day').toDate() : daterange[0],
+      startDate: daterange[0] === undefined ? moment().subtract(6, 'day').toDate() : daterange[0],
     })
 
   }
@@ -183,7 +183,7 @@ class buildingStats extends React.Component {
       <Form layout="inline">
       <Radio.Group buttonStyle="solid" defaultValue="a">
           <Radio.Button value="c" onClick={() => this.getDataOf(0)}>今日</Radio.Button>
-          <Radio.Button value="a" onClick={() => this.getDataOf(7)}>最近7天</Radio.Button>
+          <Radio.Button value="a" onClick={() => this.getDataOf(6)}>最近7天</Radio.Button>
           <Radio.Button value="b" onClick={() => this.getDataOf(30)}>最近1月</Radio.Button>
         </Radio.Group>
         <Form.Item>
@@ -202,9 +202,9 @@ class buildingStats extends React.Component {
         )}
         </Form.Item>
         <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }} onClick={() => this.datalist()}>
-          查询
+          搜索
         </Button>
-        <Button type="danger" onClick={this.handleReset} style={{ marginBottom: '18px', marginLeft: '30px' }}>重置</Button>
+        <Button onClick={this.handleReset} style={{ marginBottom: '18px', marginLeft: '30px' }}>重置</Button>
         </Form>
         <div style={{fontSize:'0.09rem',color:'#999',marginBottom:'0.16rem'}}>最多显示6个项目，其他项目请在下方详细数据中搜索</div>
         <Row>