提交

src/pages/activity/ActivityList.jsx

   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [data, setData] = useState({ list: [], total: 0 })
   //   const [page, changePage] = useState({})
+  const [time, setTime] = useState('')
 
   // 查询列表
   const getList = params => {
     props.form.validateFields((err, values) => {
       if (!err) {
         console.log('提交数据: ', values)
-        values.time = `${moment(values.time).format('YYYY-MM-DDT00:00:00.000')}Z`
+        if (time) {
+          values.time = `${moment(time).format('YYYY-MM-DDT00:00:00.000')}Z`
+        } else {
+          values.time = null
+        }
+        
         getList({ pageNum: 1, pageSize: 10, ...values })
       }
     });
   // 重置搜索
   function handleReset () {
     props.form.resetFields();
+    setTime('')
     getList({ pageNum: 1, pageSize: 10 })
   }
 
+  // 时间回调
+  function timeOnChange(date, dateString) {
+    console.log(date, dateString)
+    setTime(date)
+  }
+
 
   const { getFieldDecorator } = props.form
   return (
         </Form.Item>
         <Form.Item>
           {getFieldDecorator('time')(
-            <DatePicker />,
+            <DatePicker onChange={timeOnChange}/>,
           )}
         </Form.Item>
         <Form.Item>

src/pages/building/list/add/components/base.jsx

 function AddBuilding(props) {
   const { getFieldDecorator } = props.form;
 
+  console.log('props.building: ', props.building)
   if (props.building.buildingId !== undefined) {
     const { buildingId } = props.building
-    if (buildingId !== '') {
-      // eslint-disable-next-line react-hooks/rules-of-hooks
-      useEffect(() => {
+     // eslint-disable-next-line react-hooks/rules-of-hooks
+     useEffect(() => {
+      if (buildingId !== '') {
         getById(buildingId)
-      }, [])
-    }
+      }
+    }, [])
   }
 
    // 获取详情信息
       res.avatarImage = res.buildingImg.map(item => item.url)
       res.mapCoordinate = res.coordinate
       props.form.setFieldsValue(res)
+      props.onSuccess(res)
     })
   }
 
     }
 
     const api = data.buildingId === undefined ? apis.building.addBuilding : apis.building.updateBuilding
-    request({ ...api, data: { ...data } }).then(() => {
+    request({ ...api, data: { ...data } }).then(res => {
       openNotificationWithIcon('success', '操作成功')
-      router.go(-1)
+      // router.go(-1)
+      getById(res.buildingId)
     }).catch(err => {
       openNotificationWithIcon('error', err.message)
     })
 
   return (
         <Form {...formItemLayout} onSubmit={handleSubmit}>
-          <Form.Item label="项目Id"  style={{ display: 'none' }}>
+          <Form.Item label="项目Id" style={{ display: 'none' }}>
             {getFieldDecorator('buildingId')(<Input disabled />)}
           </Form.Item>
           <Form.Item label="楼盘编号" >
             {getFieldDecorator('discount')(<Input />)}
           </Form.Item>
           <Form.Item label="首页推荐" >
-            {getFieldDecorator('isMain')(
+            {getFieldDecorator('isMain',{
+              initialValue: 1,
+            })(
             <Radio.Group>
               <Radio value={1}>是</Radio>
               <Radio value={2}>否</Radio>

src/pages/building/list/add/index.jsx

 function AddBuilding(props) {
 
   const [tab, setTab] = useState('base')
+  const [buildingData, setBuildingData] = useState({ buildingId: undefined })
 
   function tabsCallback(e) {
     console.log(e);
     setTab(e.target.value)
   }
 
-  // console.log(props.location)
+  // building 回调
+  function buildingOnSuccess(e) {
+    setBuildingData(e)
+  }
+
+  console.log('buildingData: ', buildingData)
 
   return (
     <>
       <Radio.Group value={ tab } buttonStyle="solid" onChange={e => tabsCallback(e)}>
         <Radio.Button value="base">基本信息</Radio.Button>
         {
-          props.location.query.id &&
+          buildingData.buildingId &&
           (
             <>
               <Radio.Button value="image">户型库</Radio.Button>
         }
       </Radio.Group>
       <div style={{ marginTop: '20px' }}>
-        { tab === 'base' && <Base building={{ buildingId: props.location.query && props.location.query.id }} /> }
-        { props.location.query.id && (tab === 'image' && <ImageSet building={{ buildingId: props.location.query && props.location.query.id }} />)}
-        { props.location.query.id && (tab === 'poster' && <Poster building={{ buildingId: props.location.query && props.location.query.id }} />)}
-        { props.location.query.id && (tab === 'share' && <Share building={{ buildingId: props.location.query && props.location.query.id }} />)}
+        { tab === 'base' && <Base building={{ buildingId: buildingData.buildingId || (props.location.query && props.location.query.id) }} onSuccess={e => buildingOnSuccess(e)}/> }
+        { buildingData.buildingId && (tab === 'image' && <ImageSet building={buildingData} />)}
+        { buildingData.buildingId && (tab === 'poster' && <Poster building={buildingData} />)}
+        { buildingData.buildingId && (tab === 'share' && <Share building={buildingData} />)}
       </div>
     </>
     // <Tabs defaultActiveKey="1" onChange={tabsCallback}>

src/pages/building/list/index.jsx

           {getFieldDecorator('isMain')(
             <Select style={{ width: '180px' }} placeholder="首页推荐" onChange={handleSelectChange}>
               <Option value="1">首页推荐</Option>
-              <Option value="0">首页未推荐</Option>
+              <Option value="2">首页未推荐</Option>
             </Select>,
           )}
         </Form.Item>

src/pages/indexEcharts/userBehavior.jsx

 import React, { Component, useState, useEffect } from 'react';
-import { Radio, DatePicker, Form, Input, Button, Icon, Select, message, Table } from 'antd';
-import { Row, Col, Menu, Dropdown } from 'antd';
-import UserBehavior from './components/UserBehavior'
+import { Radio, DatePicker, Form, Input, Button, Icon, Select, message, Table , Row, Col, Menu, Dropdown } from 'antd';
+
 import moment from 'moment';
+import UserBehavior from './components/UserBehavior'
 import EChart from '../../components/EchartsTest/EChart';
 import request from '../../utils/request';
 import apis from '../../services/apis';
 import BuildSelect from '../../components/SelectButton/BuildSelect'
+import { func } from 'prop-types';
 
 // const formatDate = (start, end) => {
 //   const startDate = moment(start).format('YYYY-MM-DDT00:00:00.000') + 'Z'
 const { Option } = Select;
 
 const header = props => {
-
+  // eslint-disable-next-line react-hooks/rules-of-hooks
   const [tableData, setTableData] = useState({ records: [] })
 
+  // eslint-disable-next-line react-hooks/rules-of-hooks
   const [endDate, setEndDate] = useState({})
+  // eslint-disable-next-line react-hooks/rules-of-hooks
   const [startDate, setStartDate] = useState({})
-  let daterange = []
+  const daterange = []
 
+  // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
-
+    window.scrollTo(0, 0)
     setEndDate(new Date())
     setStartDate(moment().subtract(7, 'day').toDate())
     getBizEventType()
     getBizEventList()
     getProperties()
-  
-    
+    props.form.setFieldsValue({ radioGroup: 'a' })
   }, [])
- 
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
   const [eventypes, setEventTypes] = useState([])
   function getBizEventType(row) {
-
     request({
       ...apis.indexEcharts.bizEvent.dict,
-    }).then((data) => {
+    }).then(data => {
       const eventType = ['agent', 'main']
       setEventTypes(data.records.filter(item => !eventType.includes(item.typeId)))
     })
   }
   const [eventList, setEventList] = useState([])
   function getBizEventList(row) {
-
     request({
       ...apis.indexEcharts.bizEvent.list,
-    }).then((data) => {
+    }).then(data => {
       setEventList(data.records)
-      
     })
   }
   const [properties, setProperties] = useState([])
   function getProperties(row) {
-
     request({
       ...apis.indexEcharts.bizEvent.properties,
-    }).then((data) => {
-
+    }).then(data => {
       setProperties(data.records)
-
     })
   }
 
   const { RangePicker } = DatePicker;
 
-  function onChangetime(dates, dateStrings) {
-
-    daterange[1] = dateStrings[1]
-    daterange[0] = dateStrings[0]
 
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        const { rangePicker } = values
+        console.log('Received values of form: ', values.rangePicker);
+        setEndDate(rangePicker[1])
+        setStartDate(rangePicker[0])
+      }
+    });
   }
 
-  const getDataOf = (days) => () => {
-
+  const getDataOf = days => () => {
     setEndDate(new Date())
     setStartDate(moment().subtract(days, 'day').toDate())
   }
 
-  function datalist() {
-
-    setEndDate(daterange[1])
-    setStartDate(daterange[0])
-
-  }
 
   function redata(e) {
     console.log('行为回调数据：', e)
     setBuildingId(value)
   }
 
+  // 重置
+  function resetQuery() {
+    props.form.resetFields()
+    props.form.setFieldsValue({ radioGroup: 'a' })
+  }
+
   const columns = [
     {
       title: '访问事件',
 
   const dataSource = []
 
-  return (<>
+  const { getFieldDecorator, getFieldsError, getFieldError, isFieldTouched } = props.form;
+  return (
+  <>
     <div>
       <div>
-        <Radio.Group buttonStyle="solid" defaultValue="a">
-          <Radio.Button value="a" onClick={getDataOf(7)}>最近7天</Radio.Button>
-          <Radio.Button value="b" onClick={getDataOf(30)}>最近1月</Radio.Button>
-        </Radio.Group>
-        <RangePicker
-          style={{ paddingLeft: '30px', width: '400px' }}
-          ranges={{
-            Today: [moment(), moment()],
-            'This Month': [moment().startOf('month'), moment().endOf('month')],
-          }}
-          // defaultValue={[moment(new Date(new Date().setDate((new Date().getDate() - 6))), 'YYYY-MM-DD HH:MM:SS'), moment(new Date(), 'YYYY-MM-DD HH:MM:SS')]}
-          showTime
-          onChange={onChangetime}
-        />
-        <Button type="primary" htmlType="submit" style={{ marginLeft: '30px', float: 'right' }} onClick={datalist}>
-          搜索
-      </Button>
-      </div>
-
-      <div style={{ display: 'flex', margin: '24px 0' }}>
-        <BuildSelect style={{ width: '14%', minWidth: '160px' }} slot='action' onChange={(e => handleBuildingChange(e))}></BuildSelect>
-       
-        <Select style={{ width: '14%', minWidth: '160px', marginLeft: '2%' }} placeholder="所有事件组" onChange={handleChangeType}>
-          {eventypes.map(type => (
-            <Option key={type.typeId}>{type.typeName}</Option>
-          ))}
-      </Select>
-        <Select style={{ width: '14%', minWidth: '200px', marginLeft: '2%' }} placeholder="请选择事件" onChange={handleChangeEvent}>
-          {eventList.map(event => (
-            <Option key={event.eventId}>{event.eventName}</Option>
-          ))}
-      </Select>
-        <Select style={{ width: '14%', minWidth: '160px', marginLeft: '2%' }} placeholder="请选择属性" onChange={handleChangeProperty}>
-          {properties.map(property => (
-            <Option key={property.propertyId}>{property.propertyName}</Option>
-          ))}
-      </Select>
-     
+        <Form layout="inline" onSubmit={handleSubmit}>
+          <Form.Item>
+            {getFieldDecorator('radioGroup')(
+              <Radio.Group buttonStyle="solid">
+                <Radio.Button value="a" onClick={getDataOf(7)}>最近7天</Radio.Button>
+                <Radio.Button value="b" onClick={getDataOf(30)}>最近1月</Radio.Button>
+              </Radio.Group>,
+            )}
+          </Form.Item>
+          <Form.Item>
+            {getFieldDecorator('rangePicker')(
+              <RangePicker
+                style={{ paddingLeft: '30px', width: '400px' }}
+                ranges={{
+                  Today: [moment(), moment()],
+                  'This Month': [moment().startOf('month'), moment().endOf('month')],
+                }}
+                // defaultValue={[moment(new Date(new Date().setDate((new Date().getDate() - 6))), 'YYYY-MM-DD HH:MM:SS'), moment(new Date(), 'YYYY-MM-DD HH:MM:SS')]}
+                showTime
+              />,
+            )}
+          </Form.Item>
+
+            <Button type="primary" htmlType="submit" style={{ marginLeft: '30px', float: 'right' }}>
+              搜索
+            </Button>
+            <Button style={{ marginLeft: '30px', float: 'right' }} onClick={resetQuery}>
+              重置
+            </Button>
+
+          <div style={{ display: 'flex', margin: '24px 0' }}>
+            <Form.Item>
+              {getFieldDecorator('buildingId')(
+                <BuildSelect style={{ width: '14%', minWidth: '160px' }} slot="action" onChange={(e => handleBuildingChange(e))}></BuildSelect>,
+              )}
+            </Form.Item>
+            <Form.Item>
+              {getFieldDecorator('handleType')(
+                <Select style={{ width: '14%', minWidth: '160px', marginLeft: '2%' }} placeholder="所有事件组" onChange={handleChangeType}>
+                    {eventypes.map(type => (
+                      <Option key={type.typeId}>{type.typeName}</Option>
+                    ))}
+                </Select>,
+              )}
+            </Form.Item>
+            <Form.Item>
+              {getFieldDecorator('handleEvent')(
+                 <Select style={{ width: '14%', minWidth: '200px', marginLeft: '2%' }} placeholder="请选择事件" onChange={handleChangeEvent}>
+                      {eventList.map(event => (
+                        <Option key={event.eventId}>{event.eventName}</Option>
+                      ))}
+                  </Select>,
+              )}
+            </Form.Item>
+            <Form.Item>
+              {getFieldDecorator('handleProperty')(
+                 <Select style={{ width: '14%', minWidth: '160px', marginLeft: '2%' }} placeholder="请选择属性" onChange={handleChangeProperty}>
+                    {properties.map(property => (
+                      <Option key={property.propertyId}>{property.propertyName}</Option>
+                    ))}
+                </Select>,
+              )}
+            </Form.Item>
+          </div>
+        </Form>
       </div>
 
-
       <div style={{ margin: '24px 0' }}>
-        <UserBehavior tableShow={true} BuildSelectHide={true} buildingId={buildingId} endDate={endDate} startDate={startDate}  eventType={eventType} activity={activity}  event={event} dataZoom={true} onReData={(e) => redata(e)}></UserBehavior>
+       <UserBehavior tableShow BuildSelectHide buildingId={buildingId} endDate={endDate} startDate={startDate} eventType={eventType} activity={activity} event={event} dataZoom onReData={e => redata(e)}></UserBehavior>
       </div>
 
       {/* <Table dataSource={dataSource} columns={columns} pagination={false} scroll={{ y: 500 }} /> */}
   </>
   )
 }
-export default header
+
+const WrappedHorizontalLoginForm = Form.create({ name: 'header' })(header);
+export default WrappedHorizontalLoginForm

src/pages/integralMall/achieve.jsx

             <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
           </div>
         </TabPane>
-        <TabPane tab="项目积分" key="project">
-        <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
-            <Form.Item>
-              {getFieldDecorator('buildingId')(
-                <BuildSelect />,
-              )}
-            </Form.Item>
-             
-            <Form.Item>
-              <Button type="primary" htmlType="submit" className={styles.searchBtn}>
-                搜索
-              </Button>
-            </Form.Item>
+        {/* <TabPane tab="项目积分" key="project">
+          <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+              <Form.Item>
+                {getFieldDecorator('buildingId')(
+                  <BuildSelect />,
+                )}
+              </Form.Item>
+              
+              <Form.Item>
+                <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+                  搜索
+                </Button>
+              </Form.Item>
           </Form>
           <Table rowKey="achie" style={{ marginTop: '40px' }} dataSource={data.records} columns={columns} pagination={false}/>
           <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
             <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
           </div>
-        </TabPane>
+        </TabPane> */}
       </Tabs>,
     </>
   )