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

# Conflicts:
#	src/pages/statistical/activity/compenents/OverView.jsx

config/routes.js

@@ -261,6 +261,12 @@ export default [
                 hideInMenu: true,
                 component: './activity/SignList',
               },
+              {     
+                path: '/activity/activityRecord',
+                name: '数据记录',
+                hideInMenu: true,
+                component: './activity/activityRecord',
+            },
               {
                 path: '/activity/helpActivity/list',
                 name: '助力活动',
@@ -284,6 +290,12 @@ export default [
                 hideInMenu: true,
                 component: './activity/helpActivity/signList',
               },
+              {     
+                path: '/activity/helpActivity/helpActivityRecord',
+                name: '数据记录',
+                hideInMenu: true,
+                component: './activity/helpActivity/helpActivityRecord',
+            },
               {
                 path: '/activity/groupActivity/list',
                 name: '拼团活动',
@@ -307,6 +319,12 @@ export default [
                 hideInMenu: true,
                 component: './activity/groupActivity/detailActivity',
               },
+              {     
+                path: '/activity/groupActivity/groupActivityRecord',
+                name: '数据记录',
+                hideInMenu: true,
+                component: './activity/groupActivity/groupActivityRecord',
+            },
               {
                 path: '/activity/drainage/DrainageList',
                 name: 'H5活动',
@@ -330,6 +348,12 @@ export default [
                 hideInMenu: true,
                 component: './activity/helpActivity/detailActivity',
               },
+              {     
+                path: '/activity/drainage/drainageRecord',
+                name: '数据记录',
+                hideInMenu: true,
+                component: './activity/drainage/drainageRecord',
+            },
               {
                 path: '/activity/liveActivity/list/index',
                 name: '直播活动',
@@ -347,6 +371,12 @@ export default [
                 hideInMenu: true,
                 component: './activity/liveActivity/edit',
               },
+              {     
+                path: '/activity/liveActivity/liveActivityRecord',
+                name: '数据记录',
+                hideInMenu: true,
+                component: './activity/liveActivity/list/liveActivityRecord',
+            },
             ],
           },
           {

src/pages/activity/ActivityList.jsx

@@ -85,6 +85,17 @@ const header = props => {
       },
     });
   }
+
+  const toDataReacord = (id) => () => {
+    router.push({
+      pathname: '/activity/activityRecord',
+      query: {
+        
+        id,
+      },
+    });
+  }
+  
   /**
    *
    *
@@ -181,9 +192,13 @@ const header = props => {
           <AuthButton name="admin.buildingDynamic.tag" noRight={null}>
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={homeDynamic(row)}>{row.home === 1 ? '取消推首页' : '推首页'}<Icon type="vertical-align-top" className={styles.edit} /></span>
           </AuthButton>
+          {/* <AuthButton name="admin.buildingDynamic.update.put" noRight={null}> */}
+          {<span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={toDataReacord(row.dynamicId)}>数据记录<Icon type="form" className={styles.edit} /></span>}
+          {/* </AuthButton> */}
           <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
             {(row.activityStatus === 0 || row.activityStatus === 1) && <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEditGoods(row.dynamicId)}>编辑<Icon type="form" className={styles.edit} /></span>}
           </AuthButton>
+          
           {/* {(row.activityStatus === 0 || row.activityStatus === 2) &&<span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={newQrcode.bind(this, row)}>{'下载二维码'} {<Icon type="qrcode" className={styles.shoppingCart} />}</span>} */}
         </>
       ),

src/pages/activity/activityRecord.jsx

@@ -0,0 +1,16 @@
+import React from 'react';
+import DataRecord from './dataRecord/index'
+import Prompt from 'umi/prompt';
+
+const header = props =>{
+    const id = props.location.query.id
+    // type:'activity',
+    return <><DataRecord id = {id} activeType = "activity"/>
+    <Prompt message={location =>
+        location.pathname.startsWith("/activity/ActivityList")
+          ? true
+          : location.pathname.startsWith("/activity/detailActivity") ? true : localStorage.removeItem("activePageParams")} />
+          </>
+}
+
+export default header

src/pages/activity/dataRecord/index.jsx

@@ -0,0 +1,140 @@
+import React, { useState, useEffect } from 'react';
+import { Input, Menu, Dropdown, Button, Icon, Modal, message, Table, Divider, Tabs, Tag, Select, Pagination } from 'antd';
+import router from 'umi/router';
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+import Visitors from './table/visitors'
+import VisitNum from './table/visitNum'
+import Newuser from './table/newuser'
+import Shares from './table/shares'
+import ShareNum from './table/shareNum'
+import moment from 'moment';
+
+const { TabPane } = Tabs;
+
+
+
+const DataRecord = props => {
+
+    const [showHelp, setShowHelp] = useState(false)
+    const [tab, setTab] = useState('1')
+    const [data, setData] = useState({})
+
+    const id = props.id
+    const type = props.activeType
+
+
+    useEffect(() => {
+
+        getData({ id: id, type: type })
+
+    }, [])
+
+    const getData = (params) => {
+  
+        request({ ...apis.activityDataStatis.getStatisticData, params: { ...params, } }).then((data) => {
+            console.log(data)
+            setData(data)
+        })
+    }
+
+    function tabsCallback(e) {
+        setTab(e)
+    }
+
+    return <>
+        <div>
+            <div>
+                <Icon type="question-circle" theme="filled" style={{ fontSize: '25px', color: '#F00', marginLeft: '30px' }} onClick={() => setShowHelp(true)} />
+                <Modal
+                    title="指标说明（数据会存在一定时间延迟）"
+                    centered
+                    visible={showHelp}
+                    footer={null}
+                    onCancel={() => setShowHelp(false)}
+                >
+                    <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>分享人数：</p>
+                    <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>分享小程序活动的总人数</p>
+                    <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>分享次数：</p>
+                    <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>触发小程序活动分享的总次数</p>
+                    <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>新增注册用户：</p>
+                    <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>通过当前活动授权手机号的总人数</p>
+                    <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>访问人数：</p>
+                    <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>访问小程序活动的总人数</p>
+                    <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>访问次数：</p>
+                    <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>访问小程序活动的总次数</p>
+                </Modal>
+                <Button type="primary" style={{ float: 'right', marginLeft: '20px', zIndex: 1 }} onClick={() => router.go(-1)}>
+                    返回
+               </Button>
+            </div>
+            <div>
+
+                <div style={{ display: 'flex', marginBottom: '33px', marginTop: '20px' }}>
+                    <div style={{
+                        textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(241,43,62,1) 0%,rgba(254,144,155,1) 100%)', height: '100px',
+                        borderRadius: '12px', width: '32%', marginRight: '2%'
+                    }}>
+                        <span style={{ fontSize: '24px', color: '#fff' }}>访问总人数 </span>
+                        <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{data.visitPersons || '0'}人</span>
+                    </div>
+                    <div style={{
+                        textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: '#FFC6AA', height: '100px',
+                        borderRadius: '12px', width: '32%', marginRight: '2%'
+                    }}>
+                        <span style={{ fontSize: '24px', color: '#fff' }}>访问总次数 </span>
+                        <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{data.visitNum || '0'}人</span>
+                    </div>
+                    <div style={{
+                        textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(137deg,rgba(107,130,230,1) 0%,rgba(152,175,251,1) 100%)', height: '100px',
+                        borderRadius: '12px', width: '32%', marginRight: '2%'
+                    }}>
+                        <span style={{ fontSize: '24px', color: '#fff' }}>新增注册用户 </span>
+                        <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{data.newPersons || '0'}人</span>
+                    </div>
+                    <div style={{
+                        textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(137deg,rgba(150,83,215,1) 0%,rgba(208,160,255,1) 100%)', height: '100px',
+                        borderRadius: '12px', width: '32%', marginRight: '2%'
+                    }}>
+                        <span style={{ fontSize: '24px', color: '#fff' }}>分享总人数 </span>
+                        <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{data.sharePersons || '0'}人</span>
+                    </div>
+                    <div style={{
+                        textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(137deg,rgba(150,83,215,1) 0%,rgba(208,160,255,1) 100%)', height: '100px',
+                        borderRadius: '12px', width: '32%'
+                    }}>
+                        <span style={{ fontSize: '24px', color: '#fff' }}>分享总次数 </span>
+                        <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{data.shareNum || '0'}人</span>
+                    </div>
+                </div>
+            </div>
+
+        </div>
+        <div>
+            <Tabs type="card" value={tab} buttonStyle="solid" onChange={e => tabsCallback(e)}>
+                <TabPane tab="访问人数" key="1" ></TabPane>
+                <TabPane tab="访问次数" key="2" ></TabPane>
+                <TabPane tab="新增注册用户" key="3" ></TabPane>
+                <TabPane tab="分享人数" key="4" ></TabPane>
+                <TabPane tab="分享次数" key="5" ></TabPane>
+            </Tabs>
+            <div style={{ marginTop: '20px' }}>
+                {/* 访问人数 */}
+                {(tab === '1' && < Visitors id={id} type={type} />)}
+                {/* 访问次数 */}
+                {(tab === '2' && <VisitNum id={id} type={type}/>)}
+                {/* 新增注册用户 */}
+                {(tab === '3' && <Newuser id={id} type={type}/>)}
+                {/* 分享人数 */}
+                {(tab === '4' && <Shares id={id} type={type}/>)}
+                {/* 分享次数 */}
+                {(tab === '5' && <ShareNum id={id} type={type}/>)}
+
+                {/* { (tab === 'desc' && <Icon type="question-circle" theme="filled" style={{ fontSize: '25px', color: '#F00', marginLeft:'30px'}} />)} */}
+
+            </div>
+        </div>
+    </>
+}
+
+export default DataRecord

src/pages/activity/dataRecord/table/newuser.jsx

@@ -0,0 +1,150 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
+import router from 'umi/router';
+import apis from '../../../../services/apis';
+import request from '../../../../utils/request';
+import AuthButton from '../../../../components/AuthButton';
+import WxDictSelect from '@/components/SelectButton/WxDictSelect';
+import moment from 'moment';
+
+const date = {
+  startDate: moment().year(1000).hours(0).minutes(0).seconds(0).milliseconds(0).toDate(),
+  endDate: moment().year(3000).hours(0).minutes(0).seconds(0).milliseconds(0).toDate()
+}
+
+const header = props => {
+
+  const [data, setData] = useState({})
+  const activityId = props.id
+  const activityType = props.type
+
+  useEffect(() => {
+    console.log(activityId, activityType)
+    getList({pageNum: 1, pageSize: 10 })
+
+  }, [])
+
+  const getList = params => {
+    console.log(params)
+    request({ ...apis.activityDataStatis.activityAddRegist, params: {...params,activityId: activityId, activityType: activityType,...date  }}).then( data=> {
+      console.log(data)
+      setData(data)
+    }).catch(e=>{
+      console.log(e)
+    })
+  }
+  
+  const columns = [
+        {
+          title: '姓名',
+          dataIndex: 'nickName',
+          key: 'nickName',
+        },
+        {
+          title: '电话',
+          dataIndex: 'phone',
+          key: 'phone',
+        },
+        {
+          title: '性别',
+          dataIndex: 'gender',
+          key: 'gender',
+        },
+        {
+          title: '归属地',
+          dataIndex: 'province',
+          key: 'province',
+        },
+        {
+          title: '来源渠道',
+          dataIndex: 'personFrom',
+          key: 'personFrom',
+        },
+        {
+          title: '置业顾问',
+          dataIndex: 'realtyConsultant',
+          key: 'realtyConsultant',
+        },
+        {
+          title: '置业顾问电话',
+          dataIndex: 'realtyConsultantPhone',
+          key: 'realtyConsultantPhone',
+        },
+        {
+          title: '分享者',
+          dataIndex: 'sharePersonName',
+          key: 'sharePersonName',
+        },
+        {
+          title: '分享者电话',
+          dataIndex: 'sharePersonPhone',
+          key: 'sharePersonPhone',
+        },
+      ]
+
+    function handleReset() {
+        props.form.resetFields();
+        getList({ pageNum: 1, pageSize: 10 })
+    }
+
+    const changePageNum = pageNumber => {
+        getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+      }
+
+      const handleSubmit = e => {
+        e.preventDefault();
+        props.form.validateFields((err, values) => {
+          if (!err) {
+            console.log('提交数据: ', values)
+           
+            getList({ pageNum: 1, pageSize: 10, ...values })
+          }
+        });
+      }
+    
+      const exportActivityStats = () => {
+        
+        request({ ...apis.activityDataStatis.activityAddRegistNumExport, params: {activityId: activityId, activityType: activityType,...props.form.getFieldsValue(),...date} }).then(data => {
+          if (!data) {
+            return
+          }
+          const url = window.URL.createObjectURL(new Blob([data]))
+            const link = document.createElement('a')
+            link.style.display = 'none'
+            link.href = url
+            link.setAttribute('download', '访问统计.xlsx')
+            document.body.append(link)
+            link.click()
+        }).catch()
+      }
+
+    const { getFieldDecorator } = props.form
+    return <>
+        <div>
+            <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+                <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+                    {getFieldDecorator('personFrom')(
+                        <WxDictSelect />,
+                    )}
+                </Form.Item>
+                <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+                    {getFieldDecorator('province')(<Input placeholder="请输入归属地" />)}
+                </Form.Item>
+                <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+                    <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }}> 查询</Button>
+                    <Button onClick={handleReset} style={{ marginLeft: '30px' }}>重置</Button>
+                </Form.Item>
+            </Form>
+            <div>
+                <Button type="primary" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} onClick={exportActivityStats}>导出</Button>
+            </div>
+            <Table style={{ marginTop: '30px' }} dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
+            <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+                <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
+            </div>
+        </div>
+    </>
+}
+
+const WrappedTypeForm = Form.create()(header);
+export default WrappedTypeForm

src/pages/activity/dataRecord/table/shareNum.jsx

@@ -0,0 +1,148 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
+import router from 'umi/router';
+import apis from '../../../../services/apis';
+import request from '../../../../utils/request';
+import AuthButton from '../../../../components/AuthButton';
+import WxDictSelect from '@/components/SelectButton/WxDictSelect';
+import moment from 'moment';
+
+
+const date = {
+    startDate: moment().year(1000).hours(0).minutes(0).seconds(0).milliseconds(0).toDate(),
+    endDate: moment().year(3000).hours(0).minutes(0).seconds(0).milliseconds(0).toDate()
+  }
+  
+  const header = props => {
+  
+    const [data, setData] = useState({})
+
+    const activityId = props.id
+    const activityType = props.type
+  
+    useEffect(() => {
+      console.log(activityId, activityType)
+      getList({pageNum: 1, pageSize: 10 })
+  
+    }, [])
+  
+    const getList = params => {
+      console.log(params)
+      request({ ...apis.activityDataStatis.activityShareNum, params: {...params, activityId: activityId, activityType: activityType,...date  }}).then( data=> {
+        console.log(data)
+        setData(data)
+      }).catch(e=>{
+        console.log(e)
+      })
+    }
+   
+    const columns = [
+        {
+          title: '分享者姓名',
+          dataIndex: 'sharePersonName',
+          key: 'sharePersonName',
+        },
+        {
+          title: '分享者类型',
+          dataIndex: 'shareType',
+          key: 'shareType',
+          render: (text, records) => {
+            if (records.sharePersonType === 'drift') { return '游客' }
+            if (records.sharePersonType === 'customer') { return '普通客户' }
+            if (records.sharePersonType === 'Realty Consultant') { return '置业顾问' }
+          },
+        },
+        {
+          title: '分享时间',
+          dataIndex: 'shareTime',
+          key: 'shareTime',
+          render: (x, row) => <><span>{`${moment(row.shareTime).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+        },
+        {
+          title: '分享者电话',
+          dataIndex: 'sharePersonPhone',
+          key: 'sharePersonPhone',
+        },
+        {
+          title: '访问人数',
+          dataIndex: 'visitPersonNum',
+          key: 'visitPersonNum',
+        },
+      ]
+
+    function handleReset() {
+        props.form.resetFields();
+        getList({ pageNum: 1, pageSize: 10 })
+    }
+
+    const changePageNum = pageNumber => {
+        getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+    }
+
+    const handleSubmit = e => {
+      e.preventDefault();
+      props.form.validateFields((err, values) => {
+        if (!err) {
+         
+          getList({ pageNum: 1, pageSize: 10, ...values })
+        }
+      });
+    }
+
+
+  
+    const exportActivityStats = () => {
+      
+      request({ ...apis.activityDataStatis.activityShareNumExport, params: {activityId: activityId, activityType: activityType,...props.form.getFieldsValue(),...date} }).then(data => {
+        if (!data) {
+          return
+        }
+        const url = window.URL.createObjectURL(new Blob([data]))
+          const link = document.createElement('a')
+          link.style.display = 'none'
+          link.href = url
+          link.setAttribute('download', '访问统计.xlsx')
+          document.body.append(link)
+          link.click()
+      }).catch()
+    }
+  
+
+    const { getFieldDecorator } = props.form
+    return <>
+        <div>
+            <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+                <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+                    {getFieldDecorator('sharePersonType')(
+                        <Select placeholder="分享者类型" style={{ width: 150, marginLeft: '20px' }}>
+                            <Option value="">全部</Option>
+                            <Option value="drift">游客</Option>
+                            <Option value="customer">普通客户</Option>
+                            <Option value="Realty Consultant">置业顾问</Option>
+                        </Select>
+                    )}
+                </Form.Item>
+                <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+                    {getFieldDecorator('sharePersonPhone')(<Input placeholder="分享者电话" />)}
+                </Form.Item>
+                <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+                    {getFieldDecorator('sharePersonName')(<Input placeholder="分享者姓名" />)}
+                </Form.Item>
+                <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+                    <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }}> 查询</Button>
+                    <Button onClick={handleReset} style={{ marginLeft: '30px' }}>重置</Button>
+                </Form.Item>
+            </Form>
+            <div>
+                <Button type="primary" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} onClick={exportActivityStats}>导出</Button>
+            </div>
+            <Table style={{ marginTop: '30px' }} dataSource={data.records} columns={columns} pagination={false} onChange={handleTableChange} rowKey="activityList" />
+            <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+                <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
+            </div>
+        </div>
+    </>
+}
+
+const WrappedTypeForm = Form.create()(header);
+export default WrappedTypeForm

src/pages/activity/dataRecord/table/shares.jsx

@@ -0,0 +1,179 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
+import router from 'umi/router';
+import apis from '../../../../services/apis';
+import request from '../../../../utils/request';
+import AuthButton from '../../../../components/AuthButton';
+import WxDictSelect from '@/components/SelectButton/WxDictSelect';
+import moment from 'moment';
+
+const date = {
+  startDate: moment().year(1000).hours(0).minutes(0).seconds(0).milliseconds(0).toDate(),
+  endDate: moment().year(3000).hours(0).minutes(0).seconds(0).milliseconds(0).toDate()
+}
+
+const header = props => {
+
+  const [data, setData] = useState({})
+  const [sort, setSort] = useState({})
+
+  const activityId = props.id
+  const activityType = props.type
+
+  useEffect(() => {
+    console.log(activityId, activityType)
+    getList({pageNum: 1, pageSize: 10 })
+
+  }, [])
+
+  const getList = params => {
+    console.log(params)
+    request({ ...apis.activityDataStatis.activitySharePersonNum, params: { ...params, activityId: activityId, activityType: activityType, ...date } }).then(data => {
+      console.log(data)
+      setData(data)
+    }).catch(e => {
+      console.log(e)
+    })
+  }
+
+  const columns = [
+    {
+      title: '分享者姓名',
+      dataIndex: 'sharePersonName',
+      key: 'sharePersonName',
+    },
+    {
+      title: '分享者类型',
+      dataIndex: 'sharePersonType',
+      key: 'sharePersonType',
+      render: (text, records) => {
+        if (records.sharePersonType === 'drift') { return '游客' }
+        if (records.sharePersonType === 'customer') { return '普通客户' }
+        if (records.sharePersonType === 'Realty Consultant') { return '置业顾问' }
+      },
+    },
+    {
+      title: '分享者电话',
+      dataIndex: 'sharePersonPhone',
+      key: 'sharePersonPhone',
+    },
+    {
+      title: '分享次数',
+      dataIndex: 'shareNum',
+      key: 'shareNum',
+      sorter: true,
+      // render: (text, record) => (
+      //   <a style={{ color: '#66B3FF' }} onClick={toShareNum(record)}><span>{record.shareNum}</span></a>
+      // ),
+    },
+    {
+      title: '访问人数',
+      dataIndex: 'visitPersonNum',
+      key: 'visitPersonNum',
+      sorter: true,
+      // render: (text, record) => (
+      //   <a style={{ color: '#66B3FF' }} onClick={toVisitPersonNum(record)}><span>{record.visitPersonNum}</span></a>
+      // ),
+    },
+    {
+      title: '访问次数',
+      dataIndex: 'visitNum',
+      key: 'visitNum',
+      sorter: true,
+      // render: (text, record) => (
+      //   <a style={{ color: '#66B3FF' }} onClick={toVisitNum(record)}><span>{record.visitNum}</span></a>
+      // ),
+    },
+  ]
+
+  const handleTableChange = (pagination, filters, sorter) => {
+    console.log(pagination, filters, sorter)
+    setSort({
+      sort: sorter.order,
+      colKey: sorter.columnKey,
+    })
+    const query = {
+      pageNum: pagination.current,
+        pageSize: pagination.pageSize,
+        sort: sorter.order,
+        colKey: sorter.columnKey,
+        ...props.form.getFieldsValue()
+    }
+    getList(query)
+  };
+
+  function handleReset() {
+    props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 10 })
+  }
+
+  const changePageNum = pageNumber => {
+    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue(),...sort })
+  }
+
+  const handleSubmit = e => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+       
+        getList({ pageNum: 1, pageSize: 10, ...values })
+      }
+    });
+  }
+
+  const exportActivityStats = () => {
+    
+    request({ ...apis.activityDataStatis.activitySharePersonNumExport, params: {activityId: activityId, activityType: activityType,...props.form.getFieldsValue(),...date} }).then(data => {
+      if (!data) {
+        return
+      }
+      const url = window.URL.createObjectURL(new Blob([data]))
+        const link = document.createElement('a')
+        link.style.display = 'none'
+        link.href = url
+        link.setAttribute('download', '访问统计.xlsx')
+        document.body.append(link)
+        link.click()
+    }).catch()
+  }
+
+
+  const { getFieldDecorator } = props.form
+  return <>
+    <div>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+          {getFieldDecorator('sharePersonType')(
+            <Select placeholder="分享者类型" style={{ width: 150, marginLeft: '20px' }}>
+              <Option value="">全部</Option>
+              <Option value="drift">游客</Option>
+              <Option value="customer">普通客户</Option>
+              <Option value="Realty Consultant">置业顾问</Option>
+            </Select>
+          )}
+        </Form.Item>
+        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+          {getFieldDecorator('sharePersonPhone')(<Input placeholder="分享者电话" />)}
+        </Form.Item>
+        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+          {getFieldDecorator('sharePersonName')(<Input placeholder="分享者姓名" />)}
+        </Form.Item>
+        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+          <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }}> 查询</Button>
+          <Button onClick={handleReset} style={{ marginLeft: '30px' }}>重置</Button>
+        </Form.Item>
+      </Form>
+      <div>
+        <Button type="primary" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} onClick={exportActivityStats} >导出</Button>
+      </div>
+      <Table style={{ marginTop: '30px' }} dataSource={data.records} columns={columns} pagination={false} onChange={handleTableChange} rowKey="activityList" />
+      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum}  current={data.current} />
+      </div>
+    </div>
+  </>
+}
+
+const WrappedTypeForm = Form.create()(header);
+export default WrappedTypeForm

src/pages/activity/dataRecord/table/visitNum.jsx

@@ -0,0 +1,168 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
+import router from 'umi/router';
+import apis from '../../../../services/apis';
+import request from '../../../../utils/request';
+import AuthButton from '../../../../components/AuthButton';
+import WxDictSelect from '@/components/SelectButton/WxDictSelect';
+import moment from 'moment';
+
+const date = {
+  startDate: moment().year(1000).hours(0).minutes(0).seconds(0).milliseconds(0).toDate(),
+  endDate: moment().year(3000).hours(0).minutes(0).seconds(0).milliseconds(0).toDate()
+}
+
+const header = props => {
+
+  const [data, setData] = useState({})
+  const activityId = props.id
+  const activityType = props.type
+
+  useEffect(() => {
+    console.log(activityId, activityType)
+    getList({ pageNum: 1, pageSize: 10 })
+
+  }, [])
+
+  const getList = params => {
+    console.log(params)
+    request({ ...apis.activityDataStatis.activityVisitNum, params: { ...params, activityId: activityId, activityType: activityType, ...date } }).then(data => {
+      console.log(data)
+      setData(data)
+    }).catch(e => {
+      console.log(e)
+    })
+  }
+
+
+  let columns = [
+    {
+      title: '姓名',
+      dataIndex: 'nickName',
+      key: 'nickName',
+    },
+    {
+      title: '电话',
+      dataIndex: 'phone',
+      key: 'phone',
+    },
+    {
+      title: '性别',
+      dataIndex: 'gender',
+      key: 'gender',
+    },
+    {
+      title: '归属地',
+      dataIndex: 'province',
+      key: 'province',
+    },
+    {
+      title: '来源渠道',
+      dataIndex: 'personFrom',
+      key: 'personFrom',
+    },
+    {
+      title: '置业顾问',
+      dataIndex: 'realtyConsultant',
+      key: 'realtyConsultant',
+    },
+    {
+      title: '置业顾问电话',
+      dataIndex: 'realtyConsultantPhone',
+      key: 'realtyConsultantPhone',
+    },
+    {
+      title: '分享者',
+      dataIndex: 'sharePersonName',
+      key: 'sharePersonName',
+    },
+    {
+      title: '分享者电话',
+      dataIndex: 'sharePersonPhone',
+      key: 'sharePersonPhone',
+    },
+    {
+      title: '访问时间',
+      dataIndex: 'visitDate',
+      key: 'visitDate',
+      render: (x, row) => <><span>{`${moment(row.visitDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+    },
+  ]
+
+  function handleReset() {
+    props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 10 })
+  }
+
+  const changePageNum = pageNumber => {
+    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+  }
+
+  const handleSubmit = e => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNum: 1, pageSize: 10, ...values })
+      }
+    });
+  }
+
+  const exportActivityStats = () => {
+
+    request({ ...apis.activityDataStatis.activityVisitNumExport, params: { activityId: activityId, activityType: activityType, ...props.form.getFieldsValue(), ...date } }).then(data => {
+      if (!data) {
+        return
+      }
+      const url = window.URL.createObjectURL(new Blob([data]))
+      const link = document.createElement('a')
+      link.style.display = 'none'
+      link.href = url
+      link.setAttribute('download', '访问统计.xlsx')
+      document.body.append(link)
+      link.click()
+    }).catch()
+  }
+
+  const { getFieldDecorator } = props.form
+  return <>
+    <div>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+          {getFieldDecorator('personFrom')(
+            <WxDictSelect />,
+          )}
+        </Form.Item>
+        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+          {getFieldDecorator('province')(<Input placeholder="请输入归属地" />)}
+        </Form.Item>
+        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+          {getFieldDecorator('realtyConsultant')(<Input placeholder="置业顾问" />)}
+        </Form.Item>
+        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+          {getFieldDecorator('realtyConsultantPhone')(<Input placeholder="置业顾问电话" />)}
+        </Form.Item>
+        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+          <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }}>
+            查询
+            </Button>
+          <Button onClick={handleReset} style={{ marginLeft: '30px' }}>重置</Button>
+        </Form.Item>
+      </Form>
+      <div>
+
+
+        <Button type="primary" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} onClick={exportActivityStats} >
+          导出
+            </Button>
+
+      </div>
+      <Table style={{ marginTop: '30px' }} dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
+      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
+      </div>
+    </div>
+  </>
+}
+
+const WrappedTypeForm = Form.create()(header);
+export default WrappedTypeForm

src/pages/activity/dataRecord/table/visitors.jsx

@@ -0,0 +1,176 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
+import router from 'umi/router';
+import apis from '../../../../services/apis';
+import request from '../../../../utils/request';
+import AuthButton from '../../../../components/AuthButton';
+import WxDictSelect from '@/components/SelectButton/WxDictSelect';
+import moment from 'moment';
+
+const date = {
+  startDate: moment().year(1000).hours(0).minutes(0).seconds(0).milliseconds(0).toDate(),
+  endDate: moment().year(3000).hours(0).minutes(0).seconds(0).milliseconds(0).toDate()
+}
+// 2020-04-18T16:00:00.000Z
+
+const header = props => {
+
+  // const [id,type] = props
+
+  const [data, setData] = useState({})
+  const activityId = props.id
+  const activityType = props.type
+  
+
+  useEffect(() => {
+
+    getList({pageNum: 1, pageSize: 10 })
+
+  }, [])
+
+  const getList = params => {
+    console.log(params)
+    request({ ...apis.activityDataStatis.activityVisitPersonNum, params: {...params, activityId: activityId, activityType: activityType ,...date  }}).then( data=> {
+      console.log(data)
+      setData(data)
+    }).catch(e=>{
+      console.log(e)
+    })
+  }
+
+  // getTableList () {
+
+  //   console.log(formData)
+  //   request({ ...apis.activityDataStatis.activityVisitPersonNum, params: formData }).then(data => {
+  //     console.log(data)
+  //     this.setState({ tableData: data.records, total: data.total})
+  //   }).catch()
+  // }
+
+  const columns = [
+    {
+      title: '姓名',
+      dataIndex: 'nickName',
+      key: 'nickName',
+    },
+    {
+      title: '电话',
+      dataIndex: 'phone',
+      key: 'phone',
+    },
+    {
+      title: '性别',
+      dataIndex: 'gender',
+      key: 'gender',
+    },
+    {
+      title: '归属地',
+      dataIndex: 'province',
+      key: 'province',
+    },
+    {
+      title: '来源渠道',
+      dataIndex: 'personFrom',
+      key: 'personFrom',
+    },
+    {
+      title: '置业顾问',
+      dataIndex: 'realtyConsultant',
+      key: 'realtyConsultant',
+    },
+    {
+      title: '置业顾问电话',
+      dataIndex: 'realtyConsultantPhone',
+      key: 'realtyConsultantPhone',
+    },
+    {
+      title: '推广人',
+      dataIndex: 'sharePersonName',
+      key: 'sharePersonName',
+    },
+    {
+      title: '访问次数',
+      dataIndex: 'visitNum',
+      key: 'visitNum',
+    },
+  ]
+
+  function handleReset() {
+    props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 10 })
+  }
+
+  const changePageNum = pageNumber => {
+    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+  }
+
+  const handleSubmit = e => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+       
+        getList({ pageNum: 1, pageSize: 10, ...values })
+      }
+    });
+  }
+
+  const exportActivityStats = () => {
+    
+    request({ ...apis.activityDataStatis.activityVisitPersonNumExport, params: {activityId: activityId, activityType: activityType,...props.form.getFieldsValue(),...date} }).then(data => {
+      if (!data) {
+        return
+      }
+      const url = window.URL.createObjectURL(new Blob([data]))
+        const link = document.createElement('a')
+        link.style.display = 'none'
+        link.href = url
+        link.setAttribute('download', '访问统计.xlsx')
+        document.body.append(link)
+        link.click()
+    }).catch()
+  }
+
+  const { getFieldDecorator } = props.form
+  return <>
+    <div>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+          {getFieldDecorator('personFrom')(
+            <WxDictSelect />,
+          )}
+        </Form.Item>
+        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+          {getFieldDecorator('province')(<Input placeholder="请输入归属地" />)}
+        </Form.Item>
+        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+          {getFieldDecorator('realtyConsultant')(<Input placeholder="置业顾问" />)}
+        </Form.Item>
+        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+          {getFieldDecorator('realtyConsultantPhone')(<Input placeholder="置业顾问电话" />)}
+        </Form.Item>
+        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+          <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }}>
+            查询
+            </Button>
+          <Button onClick={handleReset} style={{ marginLeft: '30px' }}>重置</Button>
+        </Form.Item>
+      </Form>
+      <div>
+
+
+        <Button type="primary" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} onClick={exportActivityStats}>
+          导出
+            </Button>
+
+      </div>
+      <Table style={{ marginTop: '30px' }} dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
+      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
+      </div>
+    </div>
+  </>
+}
+
+const WrappedTypeForm = Form.create()(header);
+export default WrappedTypeForm

src/pages/activity/drainage/DrainageList.jsx

@@ -22,6 +22,14 @@ const toEditList = (row) => () => {
   });
 }
 
+const toDataReacord = (row) => () => {
+  router.push({
+    pathname: '/activity/drainage/drainageRecord',
+    query: {
+      id: row.drainageId,
+    },
+  });
+}
 const header = (props) => {
   // const [data, setData] = useState({ data: [] })
   const [datas, setDatas] = useState([])//表格数据
@@ -234,6 +242,9 @@ const header = (props) => {
               数据
             </span>
           </AuthButton>
+          <span style={{ right: '20px', top: '20px', fontSize: ' 0.106rem', zIndex: 1, color: '#FF7E48', cursor: 'pointer', marginLeft: 20  }} onClick={toDataReacord(datas)}>
+              数据记录
+            </span>
           <AuthButton name="admin.taDrainage.id.delete" noRight={null}>
             <span>{datas.isMiniapp === false ? "" : <span style={{ right: '20px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', cursor: 'pointer', marginLeft: 20 }} onClick={newQrcode.bind(this, datas)}>
               下载二维码

src/pages/activity/drainage/drainageRecord.jsx

@@ -0,0 +1,16 @@
+import React from 'react';
+import DataRecord from '../dataRecord/index'
+import Prompt from 'umi/prompt';
+
+const header = props =>{
+    const id = props.location.query.id
+    // type:'h5',
+    return <><DataRecord  id ={id} activeType="h5"/>
+    <Prompt message={location =>
+        location.pathname.startsWith("/activity/drainage")
+          ? true
+          : localStorage.removeItem("drainageActivePageParams")} />
+    </>
+}
+
+export default header

src/pages/activity/groupActivity/groupActivityRecord.jsx

@@ -0,0 +1,16 @@
+import React from 'react';
+import DataRecord from '../dataRecord/index'
+import Prompt from 'umi/prompt';
+
+const header = props =>{
+    const id = props.location.query.id
+    // type:'group',
+    return <><DataRecord id ={id} activeType="group" />
+    <Prompt message={location =>
+        location.pathname.startsWith("/activity/groupActivity")
+          ? true
+          : localStorage.removeItem("groupActivePageParams")} />
+          </>
+}
+
+export default header

src/pages/activity/groupActivity/list.jsx

@@ -69,6 +69,15 @@ const header = props => {
     });
   } 
 
+  const toDataReacord = id => {
+    router.push({
+      pathname: '/activity/groupActivity/groupActivityRecord',
+      query: {
+        id,
+      },
+    });
+  }
+
   /**
    *
    *
@@ -151,7 +160,7 @@ const header = props => {
             <AuthButton name="admin.taShareActivity.top" noRight={null}>
               <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{row.sort === true ? '取消推荐首页' : '推荐首页'}<Icon type="vertical-align-top" className={styles.edit} /></span>
             </AuthButton>}
-
+            {<span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={() => toDataReacord(row.groupActivityId)}>数据记录<Icon type="form" className={styles.edit} /></span>}
           {(row.activityStatus === 0 || row.activityStatus === 1) &&
             <AuthButton name="admin.taShareActivity.update.put" noRight={null}>
               <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEditActivity(row.groupActivityId)}>编辑<Icon type="form" className={styles.edit} /></span>

src/pages/activity/helpActivity/helpActivityRecord.jsx

@@ -0,0 +1,15 @@
+import React from 'react';
+import DataRecord from '../dataRecord/index'
+import Prompt from 'umi/prompt';
+
+const header = props =>{
+    const id = props.location.query.id
+    // type:'help;',
+    return <><DataRecord  id = {id} activeType = "help"/>
+    <Prompt message={location =>
+        location.pathname.startsWith("/activity/helpActivity")
+          ? true
+          : localStorage.removeItem("helpActivePageParams")} /></>
+}
+
+export default header

src/pages/activity/helpActivity/list.jsx

@@ -15,11 +15,11 @@ const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
 const header = props => {
-  const [ data, setData ] = useState({})
-//   const [page, changePage] = useState({})
+  const [data, setData] = useState({})
+  //   const [page, changePage] = useState({})
 
   useEffect(() => {
-    
+
     if (localStorage.getItem("helpActivePageParams")) {
       props.form.setFieldsValue(JSON.parse(localStorage.getItem("helpActivePageParams")));
       // const { getFieldDecorator } = JSON.parse(localStorage.getItem("pageParams"))
@@ -29,19 +29,19 @@ const header = props => {
       localStorage.setItem("helpActivePageParams", JSON.stringify({ pageNum: 1, pageSize: 10 }));
       getList({ pageNum: 1, pageSize: 10 });
     }
-  },[])
+  }, [])
 
   // 查询列表
   const getList = (params) => {
     request({ ...apis.helpActivity.list, params: { ...params } }).then((data) => {
-        console.log(data)
-        setData(data)
+      console.log(data)
+      setData(data)
     })
   }
 
-  
-// 跳转到助力新增
-const toEditGoods = (helpActivityId) => () => {
+
+  // 跳转到助力新增
+  const toEditGoods = (helpActivityId) => () => {
     router.push({
       pathname: '/activity/helpActivity/edithelpActivity',
       query: {
@@ -49,41 +49,41 @@ const toEditGoods = (helpActivityId) => () => {
       },
     });
   }
-  
-const getActivityDetail = (helpActivityId) => () => {
-  router.push({
-    pathname: '/activity/helpActivity/detailActivity',
-    query: {
-      helpActivityId,
-    },
-  });
-}
 
-const getJoinPeople = (helpActivityId) => () => {
-  router.push({
-    pathname: '/activity/helpActivity/helpRecord',
-    query: {
-      helpActivityId,
-    },
-  });
-}
-  
-  
+  const getActivityDetail = (helpActivityId) => () => {
+    router.push({
+      pathname: '/activity/helpActivity/detailActivity',
+      query: {
+        helpActivityId,
+      },
+    });
+  }
+
+  const getJoinPeople = (helpActivityId) => () => {
+    router.push({
+      pathname: '/activity/helpActivity/helpRecord',
+      query: {
+        helpActivityId,
+      },
+    });
+  }
+
+
   /**
    *
    *
    * @param {*} props
    * @returns
    */
-  
+
   const columns = [
     {
       title: '活动标题',
       dataIndex: 'title',
       key: 'title',
       align: 'center',
-      render:  (x, row) => <><div style={{overflow: 'hidden',textOverflow: 'ellipsis',whiteSpace: 'nowrap', width: '201px',title:'content'}}>
-                              <span style={{color: 'blue',cursor: 'pointer'}} onClick={getActivityDetail(row.helpActivityId)}>{row.title}</span></div></>,
+      render: (x, row) => <><div style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', width: '201px', title: 'content' }}>
+        <span style={{ color: 'blue', cursor: 'pointer' }} onClick={getActivityDetail(row.helpActivityId)}>{row.title}</span></div></>,
     },
     {
       title: '活动时间',
@@ -97,8 +97,8 @@ const getJoinPeople = (helpActivityId) => () => {
       dataIndex: 'enlistNum',
       key: 'enlistNum',
       align: 'center',
-      render:  (x, row) => <><div style={{overflow: 'hidden',textOverflow: 'ellipsis',whiteSpace: 'nowrap', width: '201px',title:'content'}}>
-                              <span style={{color: 'blue',cursor: 'pointer'}} onClick={getJoinPeople(row.helpActivityId)}>{row.enlistNum}</span></div></>,
+      render: (x, row) => <><div style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', width: '201px', title: 'content' }}>
+        <span style={{ color: 'blue', cursor: 'pointer' }} onClick={getJoinPeople(row.helpActivityId)}>{row.enlistNum}</span></div></>,
     },
     {
       title: '助力成功数',
@@ -132,86 +132,96 @@ const getJoinPeople = (helpActivityId) => () => {
         <>
           {
             <AuthButton name="admin.help.publish" noRight={null}>
-              <span style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} onClick={sendOrPublicDynamic.bind(this, row)}>{row.status === 1 ? '取消发布' : '发布'}<Icon type="close-circle" className={styles.edit} /></span>
+              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={sendOrPublicDynamic.bind(this, row)}>{row.status === 1 ? '取消发布' : '发布'}<Icon type="close-circle" className={styles.edit} /></span>
             </AuthButton>
           }
           {row.activityStatus === 0 &&
             <AuthButton name="admin.help.finish" noRight={null}>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 2)}>结束活动<Icon type="poweroff" style={{color:'#bebebe'}} className={styles.edit} /></span> </AuthButton>
+              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 2)}>结束活动<Icon type="poweroff" style={{ color: '#bebebe' }} className={styles.edit} /></span> </AuthButton>
           }
           {
-          <AuthButton name="admin.help.tag" noRight={null}>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消标签' : '添加标签' }<Icon type="vertical-align-top"  style={{color:'#bebebe'}} className={styles.edit} /></span>
-          </AuthButton>}{
-          <AuthButton name="admin.help.top" noRight={null}>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" style={{color:'#bebebe'}} className={styles.edit} /></span>
-          </AuthButton> }
-
+            <AuthButton name="admin.help.tag" noRight={null}>
+              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{row.weight === 1 ? '取消标签' : '添加标签'}<Icon type="vertical-align-top" style={{ color: '#bebebe' }} className={styles.edit} /></span>
+            </AuthButton>}{
+            <AuthButton name="admin.help.top" noRight={null}>
+              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{row.isMain === true ? '取消推首页' : '推首页'}<Icon type="vertical-align-top" style={{ color: '#bebebe' }} className={styles.edit} /></span>
+            </AuthButton>}
+          {<span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={() => toDataReacord(row.helpActivityId)}>数据记录<Icon type="form" className={styles.edit} /></span>}
           {(row.activityStatus === 1 || row.activityStatus === 0) &&
-          <AuthButton name="admin.helpActivity.update.put" noRight={null}>
-            <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEditGoods(row.helpActivityId)}>编辑<Icon type="form" style={{color:'#bebebe'}} className={styles.edit} /></span>
-          </AuthButton>
+            <AuthButton name="admin.helpActivity.update.put" noRight={null}>
+              <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEditGoods(row.helpActivityId)}>编辑<Icon type="form" style={{ color: '#bebebe' }} className={styles.edit} /></span>
+            </AuthButton>
           }
         </>
       ),
     },
   ];
+
+  const toDataReacord = id => {
+    router.push({
+      pathname: '/activity/helpActivity/helpActivityRecord',
+      query: {
+        id,
+      },
+    });
+  }
+
   const getSignList = helpActivityId => {
-      router.push({
-          pathname: '/activity/helpActivity/helpRecord',
-          query: {
-            helpActivityId,
-          },
-        });
+    router.push({
+      pathname: '/activity/helpActivity/helpRecord',
+      query: {
+        helpActivityId,
+      },
+    });
   }
-  
+
   const finishDynamic = (row) => {
-      Modal.confirm({
-          title: '结束以后将无法编辑, 是否继续?',
-          okText: '确定',
-          cancelText: '取消',
-          onOk() {
-              request({ ...apis.activity.finish, data: {dynamicId: row.dynamicId, top: ""} }).then((data) => {
-                  console.log(data)
-                  message.info('操作成功！')
-                  getList(JSON.parse(localStorage.getItem("helpActivePageParams")))
-              }).catch((err) => {
-                  console.log(err)
-                  message.info(err.msg || err.message)
-              })
-          },
-        });
+    Modal.confirm({
+      title: '结束以后将无法编辑, 是否继续?',
+      okText: '确定',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.activity.finish, data: { dynamicId: row.dynamicId, top: "" } }).then((data) => {
+          console.log(data)
+          message.info('操作成功！')
+          getList(JSON.parse(localStorage.getItem("helpActivePageParams")))
+        }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+        })
+      },
+    });
   }
-  
-//   置顶
+
+  //   置顶
   const topDynamic = (row, code) => () => {
-    const title = code === 2 ? '活动会被强制结束，小程序端无法再发起或参与此拼团，如果不想让客户看到活动，请再点击取消发布按钮':'是否进行该操作'
+    const title = code === 2 ? '活动会被强制结束，小程序端无法再发起或参与此拼团，如果不想让客户看到活动，请再点击取消发布按钮' : '是否进行该操作'
 
     Modal.confirm({
       title: title,
       okText: '确定',
       cancelText: '取消',
-      onOk () {
+      onOk() {
         request({ ...apis.helpActivity.top, data: { helpActivityId: row.helpActivityId, status: code } }).then((data) => {
           console.log(data)
           message.info('操作成功！')
           getList(JSON.parse(localStorage.getItem("helpActivePageParams")))
-          }).catch((err) => {
-              console.log(err)
-              message.info(err.msg || err.message)
-          })
+        }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+        })
       },
     });
   }
-  
+
   const sendOrPublicDynamic = (row) => {
-      if (row.status === 1) {
-          cancelDynamic(row)
-      } else {
-          sendDynamic(row)
-      }
+    if (row.status === 1) {
+      cancelDynamic(row)
+    } else {
+      sendDynamic(row)
+    }
   }
-  
+
   // 取消活动
   const cancelDynamic = (row) => {
     Modal.confirm({
@@ -219,17 +229,17 @@ const getJoinPeople = (helpActivityId) => () => {
       okText: '确认',
       cancelText: '取消',
       onOk() {
-        request({ ...apis.helpActivity.cancel, urlData: {id: row.helpActivityId}}).then((data) => {
+        request({ ...apis.helpActivity.cancel, urlData: { id: row.helpActivityId } }).then((data) => {
           message.info('操作成功！')
           getList(JSON.parse(localStorage.getItem("helpActivePageParams")))
-      }).catch((err) => {
+        }).catch((err) => {
           console.log(err)
           message.info(err.msg || err.message)
-      })
+        })
       }
     });
   }
-  
+
   //发布活动
   const sendDynamic = (row) => {
     Modal.confirm({
@@ -237,24 +247,24 @@ const getJoinPeople = (helpActivityId) => () => {
       okText: '确认',
       cancelText: '取消',
       onOk() {
-        request({ ...apis.helpActivity.send, urlData: {id: row.helpActivityId}}).then((data) => {
-        message.info('操作成功！')
-        getList(JSON.parse(localStorage.getItem("helpActivePageParams")))
-    }).catch(err => {
-        console.log(err)
-        message.info(err.msg || err.message)
-    })
+        request({ ...apis.helpActivity.send, urlData: { id: row.helpActivityId } }).then((data) => {
+          message.info('操作成功！')
+          getList(JSON.parse(localStorage.getItem("helpActivePageParams")))
+        }).catch(err => {
+          console.log(err)
+          message.info(err.msg || err.message)
+        })
       }
     });
   }
-  
+
   const changePageNum = pageNumber => {
-    localStorage.setItem("helpActivePageParams", JSON.stringify({pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() }));
-      getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+    localStorage.setItem("helpActivePageParams", JSON.stringify({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() }));
+    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
   }
 
   // 提交事件
-const handleSubmit = (e, props) => {
+  const handleSubmit = (e, props) => {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       const startDate = values.startTime === undefined ? null : moment(values.startTime).format('YYYY-MM-DD')
@@ -263,16 +273,16 @@ const handleSubmit = (e, props) => {
 
       if (!err) {
         console.log('提交数据: ', values)
-        localStorage.setItem("helpActivePageParams", JSON.stringify({  pageNum: 1, pageSize: 10, ...values, endDate, startDate  }));
-        
+        localStorage.setItem("helpActivePageParams", JSON.stringify({ pageNum: 1, pageSize: 10, ...values, endDate, startDate }));
+
         getList({ pageNum: 1, pageSize: 10, ...values, endDate, startDate })
       }
     });
   }
-   // 重置搜索
-   function handleReset() {
+  // 重置搜索
+  function handleReset() {
     props.form.resetFields();
-    localStorage.setItem("helpActivePageParams", JSON.stringify({  pageNum: 1, pageSize: 10 }));
+    localStorage.setItem("helpActivePageParams", JSON.stringify({ pageNum: 1, pageSize: 10 }));
     getList({ pageNum: 1, pageSize: 10 })
   }
 
@@ -302,12 +312,12 @@ const handleSubmit = (e, props) => {
         </Form.Item>
         <Form.Item>
           {getFieldDecorator('startTime')(
-            <DatePicker placeholder="活动开始时间"/>,
+            <DatePicker placeholder="活动开始时间" />,
           )}
         </Form.Item>
         <Form.Item>
           {getFieldDecorator('endTime')(
-            <DatePicker placeholder="活动结束时间"/>,
+            <DatePicker placeholder="活动结束时间" />,
           )}
         </Form.Item>
         <Form.Item>
@@ -320,28 +330,28 @@ const handleSubmit = (e, props) => {
           )}
         </Form.Item>
         <Form.Item>
-        <AuthButton name="admin.help.search" noRight={null}>
-          <Button type="primary" htmlType="submit" className={styles.searchBtn}>
-            搜索
+          <AuthButton name="admin.help.search" noRight={null}>
+            <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+              搜索
           </Button>
           </AuthButton>
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
-              重置
+            重置
             </Button>
         </Form.Item>
       </Form>
       <AuthButton name="admin.help.add.post" noRight={null}>
         <Button name="admin.helpActivity.add.post" noRight={null} type="danger" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
       </AuthButton>
-      <Table 
+      <Table
         // onRow={record => {
         //   return {
         //     onClick: getActivityDetail(record.helpActivityId),
         //   };
         // }}
-      dataSource={data.records} columns={columns} pagination={false} rowKey="activityList"/>
+        dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
       </div>
       <Prompt message={location =>
         location.pathname.startsWith("/activity/helpActivity")

src/pages/activity/liveActivity/list/index.jsx

@@ -63,6 +63,16 @@ const header = props => {
     });
   }
 
+  const toDataReacord = rowData => () => {
+  
+      router.push({
+      pathname: '/activity/liveActivity/liveActivityRecord',
+      query: {
+        id: rowData.liveActivityId,
+      },
+    });
+  }
+
   function openNotificationWithIcon(type, message) {
     notification[type]({
       message,
@@ -179,10 +189,14 @@ const header = props => {
       dataIndex: '',
       key: '',
       align: 'center',
-      render: (text, record) => (
+      render: (text, record) => (<>
+     
+        <a style={{ color: '#66B3FF' ,marginRight:20}} onClick={toDataReacord(record)} >数据记录</a>
+ 
         <AuthButton name="admin.live.detail.get" noRight={null}>
           <a style={{ color: '#66B3FF' }} onClick={toAddLive(record)} >查看详情</a>
         </AuthButton>
+        </>
       ),
     },
   ];

src/pages/activity/liveActivity/list/liveActivityRecord.jsx

@@ -0,0 +1,16 @@
+import React from 'react';
+import DataRecord from '../../dataRecord/index'
+import Prompt from 'umi/prompt';
+
+const header = props =>{
+    const id = props.location.query.id
+    // type:'live',
+    return <><DataRecord id ={id} activeType="live"/>
+    <Prompt message={location =>
+        location.pathname.startsWith("/activity/liveActivity")
+          ? true
+          : localStorage.removeItem("liveActivePageParams")} />
+          </>
+}
+
+export default header

src/pages/indexEcharts/index.jsx

@@ -27,7 +27,6 @@ const indexEcharts = props => {
 
   const endDate = new Date()
 
-  // 为了观察数据先设30天
   const startDate = moment().subtract(7, 'day').toDate()
 
   function onTabledatas (e) {

src/pages/statistical/activity/addRegistNum.jsx

@@ -134,6 +134,34 @@ class SharePersonNum extends React.Component {
   //重置搜索
   handleReset = e => {
     this.props.form.resetFields()
+    let startDate;
+    let endDate;
+    if (this.props.location.query.queryDate){
+      startDate = moment(this.props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).toDate();
+      endDate = moment(this.props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
+    }else{
+      startDate = moment(this.props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).toDate();
+      endDate = moment(this.props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
+    }
+    this.setState({
+      formData: {
+        personFrom: '',
+        province: '',
+        pageNum:'',
+        pageSize:'',
+        startDate: startDate,
+        endDate: endDate,
+        activityId: this.props.location.query.activityId,
+        activityType:this.props.location.query.activityType,
+        buildingId: this.props.location.query.buildingId,      
+      },
+      personData: [],  
+      dataSoures: [],
+      tableData: [],
+      userType: 'all',
+      activityName:  this.props.location.query.activityName
+    })
+    this.getTableList()
   }
 
   goback = () => {

src/pages/statistical/activity/compenents/OverView.jsx

@@ -267,6 +267,30 @@ class OverView extends React.Component {
   //重置搜索
   handleReset = e => {
     this.props.form.resetFields()
+    this.setState( {
+      radioVal: 6,
+      formData: {
+        startDate: moment().subtract(6, 'day').toDate(),
+        endDate: new Date,
+        buildingId: '',
+        targetType: '',
+        pageNum:'',
+        pageSize:'',
+        sort:null,
+        colKey:null
+      },
+      personData: [],  
+      dataSoures: [],
+      tableData: [],
+      barData: {},
+      userType: 'all',
+      endDate: '',
+      startDate: '',
+      buildingId: [],
+      targetType: [],
+      helpVisible: false,
+    })
+    this.getAllList()
   }
 
   exportActivityStats = () => {

src/pages/statistical/activity/shareNum.jsx

@@ -127,6 +127,38 @@ class SharePersonNum extends React.Component {
   //重置搜索
   handleReset = e => {
     this.props.form.resetFields()
+    let startDate;
+    let endDate;
+    if (this.props.location.query.queryDate){
+      startDate = moment(this.props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).toDate();
+      endDate = moment(this.props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
+    }else{
+      startDate = moment(this.props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).toDate();
+      endDate = moment(this.props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
+    }
+    this.setState({
+      formData: {
+        sharePhone: '',
+        sharePersonType: '',
+        pageNum:'',
+        pageSize:'',
+        shareName:'',
+        sort:null,
+        colKey:null,
+        startDate: startDate,
+        endDate: endDate,
+        activityId: this.props.location.query.activityId,
+        activityType:this.props.location.query.activityType,
+        personId: this.props.location.query.personId,
+        buildingId: this.props.location.query.buildingId   
+      },
+      personData: [],  
+      dataSoures: [],
+      tableData: [],
+      userType: 'all',
+      activityName:  this.props.location.query.activityName
+    })
+    this.getTableList()
   }
 
   goback = () => {

src/pages/statistical/activity/sharePersonNum.jsx

@@ -209,6 +209,44 @@ class SharePersonNum extends React.Component {
   //重置搜索
   handleReset = e => {
     this.props.form.resetFields()
+    let startDate;
+    let endDate;
+    queryDate = this.props.location.query.queryDate
+    activityName = this.props.location.query.activityName
+    staticStartDate = this.props.location.query.startDate;
+    staticEndDate = this.props.location.query.endDate;
+    activityId = this.props.location.query.activityId;
+    activityType = this.props.location.query.activityType;
+    
+    if (this.props.location.query.queryDate){
+      startDate = moment(this.props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).toDate();
+      endDate = moment(this.props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
+    }else{
+      startDate = moment(this.props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).toDate();
+      endDate = moment(this.props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
+    }
+    this.setState({
+      formData: {
+        sharePhone: '',
+        sharePersonType: '',
+        pageNum:'',
+        pageSize:'',
+        shareName:'',
+        sort:null,
+        colKey:null,
+        startDate: startDate,
+        endDate: endDate,
+        activityId: this.props.location.query.activityId,
+        activityType: this.props.location.query.activityType,
+        buildingId: this.props.location.query.buildingId,         
+      },
+      personData: [],  
+      dataSoures: [],
+      tableData: [],
+      userType: 'all',
+      activityName:  this.props.location.query.activityName
+    }) 
+    this.getTableList()
   }
 
   goback = () => {

src/pages/statistical/activity/visitNum.jsx

@@ -151,6 +151,37 @@ class SharePersonNum extends React.Component {
   //重置搜索
   handleReset = e => {
     this.props.form.resetFields()
+    let startDate;
+    let endDate;
+    if (this.props.location.query.queryDate){
+      startDate = moment(this.props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).toDate();
+      endDate = moment(this.props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
+    }else{
+      startDate = moment(this.props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).toDate();
+      endDate = moment(this.props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
+    }
+    this.setState({
+      formData: {
+        personFrom: '',
+        pageNum:'',
+        pageSize:'',
+        startDate: startDate,
+        endDate: endDate,
+        province:'',
+        realtyConsultant:'',
+        realtyConsultantPhone:'',
+        activityId: this.props.location.query.activityId,
+        activityType:this.props.location.query.activityType,
+        personId: this.props.location.query.personId,
+        buildingId: this.props.location.query.buildingId
+      },
+      personData: [],  
+      dataSoures: [],
+      tableData: [],
+      userType: 'all',
+      activityName:  this.props.location.query.activityName
+    })
+    this.getTableList()
   }
 
   goback = () => {

src/pages/statistical/activity/visitPersonNum.jsx

@@ -146,6 +146,38 @@ class SharePersonNum extends React.Component {
   //重置搜索
   handleReset = e => {
     this.props.form.resetFields()
+    let startDate;
+    let endDate;
+    
+    if (this.props.location.query.queryDate){
+      startDate = moment(this.props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).toDate();
+      endDate = moment(this.props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
+    }else{
+      startDate = moment(this.props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).toDate();
+      endDate = moment(this.props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
+    }
+    this.setState({
+      formData: {
+        personFrom: '',
+        pageNum:'',
+        pageSize:'',
+        startDate: startDate,
+        endDate: endDate,
+        province:'',
+        realtyConsultant:'',
+        realtyConsultantPhone:'',
+        activityId: this.props.location.query.activityId,
+        activityType: this.props.location.query.activityType ,
+        personId:  this.props.location.query.personId,
+        buildingId: this.props.location.query.buildingId
+      },
+      personData: [],  
+      dataSoures: [],
+      tableData: [],
+      userType: 'all',
+      activityName: this.props.location.query.activityName
+    })
+    this.getTableList()
   }
 
   goback = () => {

src/pages/statistical/building/detail.jsx

@@ -29,6 +29,7 @@ class buildingDetailStats extends React.Component {
       startDate: {},
       buildingId: props.location.query.buildingId,
       buildingName: props.location.query.buildingName,
+      radioValue: 'a'
     }
   }
 
@@ -66,10 +67,10 @@ class buildingDetailStats extends React.Component {
   }
 
   //切换三个标签页
-  getDataOf = (days) => {
+  getDataOf = (days,val) => {
     this.getTimeBarDate(moment().subtract(days, 'day').toDate(),new Date())
     this.getTimeTableData(moment().subtract(days, 'day').toDate(),new Date())
-    this.setState({ ...this.state, endDate: new Date(), startDate: moment().subtract(days, 'day').toDate() })
+    this.setState({ ...this.state, endDate: new Date(), startDate: moment().subtract(days, 'day').toDate(), radioValue: val })
   }
 
   //点击查询
@@ -113,6 +114,9 @@ class buildingDetailStats extends React.Component {
   handleReset = () => {
     daterange = []
     this.props.form.resetFields();
+    this.setState({ ...this.state, endDate: new Date(), startDate: moment().subtract(6, 'day').toDate(), radioValue: "a" })
+    this.getTimeBarDate(moment().subtract(6, 'day').toDate(),new Date())
+    this.getTimeTableData(moment().subtract(6, 'day').toDate(),new Date())
   }
 
   render() {
@@ -152,15 +156,14 @@ class buildingDetailStats extends React.Component {
     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(6)}>最近7天</Radio.Button>
-          <Radio.Button value="b" onClick={() => this.getDataOf(30)}>最近1月</Radio.Button>
+      <Radio.Group buttonStyle="solid" value={this.state.radioValue}>
+          <Radio.Button value="c" onClick={() => this.getDataOf(0,"c")}>今日</Radio.Button>
+          <Radio.Button value="a" onClick={() => this.getDataOf(6,"a")}>最近7天</Radio.Button>
+          <Radio.Button value="b" onClick={() => this.getDataOf(30,"b")}>最近1月</Radio.Button>
         </Radio.Group>
         <Form.Item>
         {getFieldDecorator('time', {
             initialValue: [],
-            rules: [{ required: true, message: '请上传封面图1' }],
         })(
           <RangePicker
             style={{ paddingLeft: '30px' }}
@@ -176,6 +179,9 @@ class buildingDetailStats extends React.Component {
           搜索
         </Button>
         <Button onClick={this.handleReset} style={{ marginBottom: '18px', marginLeft: '30px' }}>重置</Button>
+        <Button type="primary" style={{ marginLeft: '30px' }} onClick={() => router.go(-1)}>
+                返回
+            </Button>
         </Form>
         <StatsChartLine title={this.state.buildingName} data={this.state.barData} />
         <Row>

src/pages/statistical/building/index.jsx

@@ -27,14 +27,15 @@ class buildingStats extends React.Component {
       userType: 'all',
       endDate: {},
       startDate: {},
-      buildingId: ''
+      buildingId: '',
+      radioValue: 'a'
     }
   }
 
   componentDidMount() {
     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() })
+    this.setState({ ...this.state, endDate: new Date(), startDate: moment().subtract(6, 'day').toDate() })
 
   }
 
@@ -65,10 +66,10 @@ class buildingStats extends React.Component {
   }
 
   //切换三个标签页
-  getDataOf = (days) => {
+  getDataOf = (days,val) => {
     this.getBarData(moment().subtract(days, 'day').toDate(), new Date())
     this.getTableData(moment().subtract(days, 'day').toDate(), new Date(), this.state.buildingId)
-    this.setState({ ...this.state, endDate: new Date(), startDate: moment().subtract(days, 'day').toDate() })
+    this.setState({ ...this.state, endDate: new Date(), startDate: moment().subtract(days, 'day').toDate(), radioValue: val })
   }
 
   //点击查询
@@ -129,6 +130,9 @@ class buildingStats extends React.Component {
   handleReset = () => {
     daterange = []
     this.props.form.resetFields();
+    this.setState({ ...this.state, endDate: new Date(), startDate: moment().subtract(6, 'day').toDate(), radioValue: "a" })
+    this.getBarData(moment().subtract(6, 'day').toDate(), new Date())
+    this.getTableData(moment().subtract(6, 'day').toDate(), new Date(), this.state.buildingId)
   }
 
   render() {
@@ -181,15 +185,14 @@ class buildingStats extends React.Component {
 
     <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(6)}>最近7天</Radio.Button>
-          <Radio.Button value="b" onClick={() => this.getDataOf(30)}>最近1月</Radio.Button>
+      <Radio.Group buttonStyle="solid" value={this.state.radioValue}>
+          <Radio.Button value="c" onClick={() => this.getDataOf(0,"c")}>今日</Radio.Button>
+          <Radio.Button value="a" onClick={() => this.getDataOf(6,"a")}>最近7天</Radio.Button>
+          <Radio.Button value="b" onClick={() => this.getDataOf(30,"b")}>最近1月</Radio.Button>
         </Radio.Group>
         <Form.Item>
         {getFieldDecorator('time', {
             initialValue: [],
-            rules: [{ required: true, message: '请上传封面图1' }],
         })(
           <RangePicker
               style={{ paddingLeft: '30px' }}

src/services/apis.js

@@ -1680,6 +1680,11 @@ export default {
       url: `${prefix}/activityStatistical/selectActivityVisitPersonNumExport`,
       action: 'admin.contract.list.get',
     },
+    getStatisticData: {
+      method: 'GET',
+      url: `${prefix}/activityManage/getStatisticData`,
+      action: 'admin.activityManage.getStatisticData.get',
+    },
   },
   stats: {
     barList: {