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

src/pages/statistical/building/detail.jsx

@@ -109,6 +109,12 @@ class buildingDetailStats extends React.Component {
       })
   }
 
+   //重置搜索
+  handleReset = () => {
+    daterange = []
+    this.props.form.resetFields();
+  }
+
   render() {
     const columns = [
         {
@@ -142,26 +148,35 @@ class buildingDetailStats extends React.Component {
         },
       ];
 
+    const { getFieldDecorator } = this.props.form;
     return (
     <div>
+      <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="b" onClick={() => this.getDataOf(30)}>最近1月</Radio.Button>
         </Radio.Group>
-        <RangePicker
-          style={{ paddingLeft: '30px' }}
-          ranges={{
-            Today: [moment(), moment()],
-            'This Month': [moment().startOf('month'), moment().endOf('month')],
-          }}
-          onChange={(_dates, dateStrings) => this.onChangetime(_dates, dateStrings)}
-        />
+        <Form.Item>
+        {getFieldDecorator('time', {
+            initialValue: [],
+            rules: [{ required: true, message: '请上传封面图1' }],
+        })(
+          <RangePicker
+            style={{ paddingLeft: '30px' }}
+            ranges={{
+              Today: [moment(), moment()],
+              'This Month': [moment().startOf('month'), moment().endOf('month')],
+            }}
+            onChange={(_dates, dateStrings) => this.onChangetime(_dates, dateStrings)}
+          />
+        )}
+        </Form.Item>
         <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }} onClick={() => this.datalist()}>
           查询
         </Button>
-        <Button type="danger" onClick={() => router.go(-1)} style={{ marginBottom: '18px', marginLeft: '30px' }}>重置</Button>
-
+        <Button type="danger" onClick={this.handleReset} style={{ marginBottom: '18px', marginLeft: '30px' }}>重置</Button>
+        </Form>
         <StatsChartLine title={this.state.buildingName} data={this.state.barData} />
         <Row>
             <Col span={22}>
@@ -179,5 +194,6 @@ class buildingDetailStats extends React.Component {
     )
   }
 }
+const WrappedHeader = Form.create({ name: 'record' })(buildingDetailStats);
 
-export default buildingDetailStats
+export default WrappedHeader

src/pages/statistical/building/index.jsx

@@ -125,6 +125,12 @@ class buildingStats extends React.Component {
     });
   }
 
+  //重置搜索
+  handleReset = () => {
+    daterange = []
+    this.props.form.resetFields();
+  }
+
   render() {
     const columns = [
       {
@@ -170,25 +176,36 @@ class buildingStats extends React.Component {
       },
     ];
 
+    const { getFieldDecorator } = this.props.form;
     return (
-      <div>
-        <Radio.Group buttonStyle="solid" defaultValue="a">
+
+    <div>
+      <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="b" onClick={() => this.getDataOf(30)}>最近1月</Radio.Button>
         </Radio.Group>
-        <RangePicker
-          style={{ paddingLeft: '30px' }}
-          ranges={{
-            Today: [moment(), moment()],
-            'This Month': [moment().startOf('month'), moment().endOf('month')],
-          }}
-          onChange={(_dates, dateStrings) => this.onChangetime(_dates, dateStrings)}
-        />
+        <Form.Item>
+        {getFieldDecorator('time', {
+            initialValue: [],
+            rules: [{ required: true, message: '请上传封面图1' }],
+        })(
+          <RangePicker
+              style={{ paddingLeft: '30px' }}
+              ranges={{
+                Today: [moment(), moment()],
+                'This Month': [moment().startOf('month'), moment().endOf('month')],
+              }}
+              onChange={(_dates, dateStrings) => this.onChangetime(_dates, dateStrings)}
+            />
+        )}
+        </Form.Item>
         <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }} onClick={() => this.datalist()}>
           查询
         </Button>
-        <Button type="danger" onClick={() => router.go(-1)} style={{ marginBottom: '18px', marginLeft: '30px' }}>重置</Button>
+        <Button type="danger" onClick={this.handleReset} style={{ marginBottom: '18px', marginLeft: '30px' }}>重置</Button>
+        </Form>
         <div style={{fontSize:'0.09rem',color:'#999',marginBottom:'0.16rem'}}>最多显示6个项目，其他项目请在下方详细数据中搜索</div>
         <Row>
           <Col span={12} style={{paddingRight:'0.08rem'}}>
@@ -225,4 +242,6 @@ class buildingStats extends React.Component {
   }
 }
 
-export default buildingStats
+const WrappedHeader = Form.create({ name: 'record' })(buildingStats);
+
+export default WrappedHeader