fix

config/routes.js

@@ -378,7 +378,7 @@ export default [
               //   hideInMenu: true,
               //   component: './channel/InviteClients',
               // },
-               {
+              {
                 path: '/channel/independentList',
                 name: '经纪人',
                 component: './channel/independentList/index',
@@ -540,10 +540,9 @@ export default [
                 component: './carouselFigure/editAdvertising',
                 menuCode: '/carouselFigure/editAdvertising',
               },
-             
             ],
           },
-         
+
           {
             path: '/system',
             name: '系统管理',
@@ -607,52 +606,84 @@ export default [
             path: '/statistics',
             name: '数据统计',
             component: '../layouts/BlankLayout',
-            menuCode: '/statistics',
+            menuCode: '/building',
             // hideInMenu: true,
             routes: [
               {
                 path: '/statistics/dataReport',
                 name: '数据报表',
                 component: './statistics/dataReport',
-                menuCode: '/statistics/dataReport',
+                menuCode: '/building/list',
               },
               {
                 path: '/statistics/dataReport/newAdd',
                 name: '新增用户',
                 hideInMenu: true,
                 component: './statistics/dataReport/newAdd',
-                menuCode: '/statistics/dataReport',
+                menuCode: '/building/list',
               },
               {
                 path: '/statistics/activity',
                 name: '活动统计',
                 component: './statistics/activity',
-                menuCode: '/statistics/activity',
+                menuCode: '/building/list',
+              },
+              {
+                path: '/statistics/activity/sharePersonNum',
+                name: '分享人数',
+                hideInMenu: true,
+                component: './statistics/activity/sharePersonNum',
+                menuCode: '/building/list',
+              },
+              {
+                path: '/statistics/activity/shareNum',
+                name: '分享次数',
+                hideInMenu: true,
+                component: './statistics/activity/shareNum',
+                menuCode: '/building/list',
+              },
+              {
+                path: '/statistics/activity/visitPersonNum',
+                name: '访问人数',
+                hideInMenu: true,
+                component: './statistics/activity/visitPersonNum',
+                menuCode: '/building/list',
+              },
+              {
+                path: '/statistics/activity/visitNum',
+                name: '访问次数',
+                hideInMenu: true,
+                component: './statistics/activity/visitNum',
+                menuCode: '/building/list',
+              },
+              {
+                path: '/statistics/activity/addRegistNum',
+                name: '新增注册用户',
+                hideInMenu: true,
+                component: './statistics/activity/addRegistNum',
+                menuCode: '/building/list',
               },
-              // {
-              //   path: '/statistics/activity/sharePersonNum',
-              //   name: '活动统计',
-              //   component: './statistics/activity/sharePersonNum',
-              //   menuCode: '/statistics/activity',
-              // },
-
               
-
-
               {
                 path: '/statistics/building',
                 name: '项目统计',
                 component: './statistics/building',
-                menuCode: '/statistics/activity',
+                menuCode: '/building/list',
+              },
+              {
+                path: '/statistics/building/detail',
+                name: '项目统计',
+                hideInMenu: true,
+                component: './statistics/building/detail',
+                menuCode: '/building/list',
               },
 
               {
                 path: '/statistics/consultant',
                 name: 'KPI',
                 component: './statistics/consultant',
-                menuCode: '/statistics/activity',
+                menuCode: '/building/list',
               },
-              
             ],
           },
           {

src/pages/statistics/activity/activityOverview/index.jsx

@@ -77,10 +77,9 @@ const activityOverView = props => {
         <Form.Item>
           {getFieldDecorator('targetType')(
             <Select placeholder="活动类型" allowClear style={{ width: 150, marginLeft: '20px' }}>
-              <Option value="activity">报名活动</Option>
-              <Option value="help">助力活动</Option>
-              <Option value="group">拼团活动</Option>
-              <Option value="h5">H5活动</Option>
+              <Option value="dymic">报名</Option>
+              <Option value="look">带看</Option>
+              <Option value="house">团房</Option>
               <Option value="live">直播</Option>
             </Select>,
           )}

src/pages/statistics/activity/addRegistNum.jsx

@@ -0,0 +1,332 @@
+import React, { Component, useState, useEffect } from 'react';
+import {
+  Form,
+  Icon,
+  Input,
+  Button,
+  DatePicker,
+  Select,
+  Card,
+  Row,
+  Col,
+  Pagination,
+  Alert,
+  Table,
+  Avatar,
+  Radio,
+  Modal,
+  Descriptions,
+} from 'antd';
+import moment from 'moment';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import router from 'umi/router';
+import AuthButton from '@/components/AuthButton';
+import BuildingSelect from '@/components/SelectButton/BuildSelect';
+import WxDictSelect from '@/components/SelectButton/WxDictSelect';
+import Prompt from 'umi/prompt';
+
+const { RangePicker } = DatePicker;
+const { Option } = Select;
+
+const formItemLayout = {
+  labelCol: { span: 10 },
+  wrapperCol: { span: 14 },
+};
+
+let daterange = [];
+let tableTitle = ['类型'];
+
+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',
+  },
+];
+
+class SharePersonNum extends React.Component {
+  constructor(props) {
+    super(props);
+    let startDate;
+    let endDate;
+    if (props.location.query.queryDate) {
+      startDate =
+        moment(props.location.query.queryDate)
+          .hours(0)
+          .minutes(0)
+          .seconds(0)
+          .milliseconds(0)
+          .format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
+      endDate =
+        moment(props.location.query.queryDate)
+          .hours(23)
+          .minutes(59)
+          .seconds(59)
+          .milliseconds(999)
+          .format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
+    } else {
+      startDate =
+        moment(props.location.query.startDate)
+          .hours(0)
+          .minutes(0)
+          .seconds(0)
+          .milliseconds(0)
+          .format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
+      endDate =
+        moment(props.location.query.endDate)
+          .hours(23)
+          .minutes(59)
+          .seconds(59)
+          .milliseconds(999)
+          .format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
+    }
+    console.log(startDate);
+    this.state = {
+      formData: {
+        personFrom: '',
+        province: '',
+        pageNum: '',
+        pageSize: '',
+        startDate: startDate,
+        endDate: endDate,
+        activityId: props.location.query.activityId,
+        activityType: props.location.query.activityType,
+        buildingId: props.location.query.buildingId,
+      },
+      personData: [],
+      dataSoures: [],
+      tableData: [],
+      userType: 'all',
+      activityName: props.location.query.activityName,
+    };
+  }
+
+  componentDidMount() {
+    this.getTableList();
+  }
+
+  getTableList() {
+    const { formData } = this.state;
+    console.log(formData);
+    request({ ...apis.activityDataStatis.activityAddRegist, params: formData })
+      .then(data => {
+        console.log(data);
+        this.setState({ tableData: data.records, total: data.total });
+      })
+      .catch();
+  }
+
+  handleSubmit = (e, props) => {
+    let startDate = null;
+    let endDate = null;
+    const personFrom = this.props.form.getFieldValue('personFrom');
+    const province = this.props.form.getFieldValue('province');
+    const { formData } = this.state;
+    this.setState(
+      {
+        formData: {
+          ...formData,
+          personFrom: personFrom,
+          province: province,
+          pageNum: 1,
+          pageSize: 999,
+        },
+      },
+      this.getTableList,
+    );
+  };
+
+  //重置搜索
+  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)
+          .format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
+      endDate =
+        moment(this.props.location.query.queryDate)
+          .hours(23)
+          .minutes(59)
+          .seconds(59)
+          .milliseconds(999)
+          .format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
+    } else {
+      startDate =
+        moment(this.props.location.query.startDate)
+          .hours(0)
+          .minutes(0)
+          .seconds(0)
+          .milliseconds(0)
+          .format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
+      endDate =
+        moment(this.props.location.query.endDate)
+          .hours(23)
+          .minutes(59)
+          .seconds(59)
+          .milliseconds(999)
+          .format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
+    }
+    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 = () => {
+    router.go(-1);
+  };
+
+  exportActivityStats = () => {
+    const { formData } = this.state;
+    request({ ...apis.activityDataStatis.activityAddRegistNumExport, params: formData })
+      .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();
+  };
+
+  //排序
+  handleTableChange = (pagination, filters, sorter) => {
+    console.log(pagination, filters, sorter);
+    const { formData } = this.state;
+    this.setState(
+      {
+        formData: {
+          ...formData,
+          personFrom: formData.personFrom,
+          pageNum: pagination.current,
+          pageSize: pagination.pageSize,
+        },
+      },
+      this.getTableList,
+    );
+  };
+
+  render() {
+    const { radioVal } = this.state;
+    const { getFieldDecorator } = this.props.form;
+
+    return (
+      <Card>
+        <div align="right" style={{ marginBottom: '16px' }}>
+          <Button onClick={this.goback}>返回</Button>
+        </div>
+        {this.state.activityName && (
+          <div>
+            <span style={{ marginLeft: '20px' }}>分享内容：{this.state.activityName}</span>
+          </div>
+        )}
+        <Form layout="inline" onSubmit={e => this.handleSubmit(e, this.props)}>
+          <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+            {getFieldDecorator('province')(<Input placeholder="请输入归属地" />)}
+          </Form.Item>
+          <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+            {getFieldDecorator('personFrom')(<WxDictSelect />)}
+          </Form.Item>
+          <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+            <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }}>
+              搜索
+            </Button>
+            <Button onClick={e => this.handleReset()} style={{ marginLeft: '30px' }}>
+              重置
+            </Button>
+          </Form.Item>
+        </Form>
+        <div>
+          <AuthButton name="admin.statistical.activity.export" noRight={null}>
+            <Button
+              type="primary"
+              style={{ float: 'right', margin: '20px 0', zIndex: 1 }}
+              onClick={this.exportActivityStats}
+            >
+              导出
+            </Button>
+          </AuthButton>
+          <Table
+            style={{ marginTop: '20px' }}
+            dataSource={this.state.tableData}
+            columns={columns}
+            pagination={{ total: this.state.total }}
+            onChange={this.handleTableChange}
+            scroll={{ y: 500 }}
+          ></Table>
+        </div>
+      </Card>
+    );
+  }
+}
+const WrappedTypeForm = Form.create()(SharePersonNum);
+export default WrappedTypeForm;

src/pages/statistics/activity/compents/OverviewDeatil.jsx

@@ -7,84 +7,131 @@ import apis from '../../../../services/apis';
 import moment from 'moment';
 import router from 'umi/router';
 
-
 const NewUsers = props => {
   const { params } = props;
   const [data, setData] = useState({ records: [] });
 
-  
-const toSharePersonNum = rowData => () => {
-  console.log(rowData, 'rowData')
-  if(rowData) {
-    router.push({
-    pathname: '/statistical/activity/byDate/sharePersonNum',
-    query: {
-      queryDate: rowData.date,
-      buildingId: params.buildingId||undefined, 
-      activityType: params.activityType||undefined
-    },
-  });
-    return
-  }
-}
+  const toSharePersonNum = rowData => () => {
+    if (rowData) {
+      router.push({
+        pathname: '/statistics/activity/sharePersonNum',
+        query: {
+          queryDate: rowData.date,
+          buildingId: params.buildingId || undefined,
+          activityType: params.activityType || undefined,
+        },
+      });
+      return;
+    }
+  };
 
-const columns = [
-  {
-    title: '日期',
-    dataIndex: 'date',
-    key: 'date',
-  },
-  {
-    title: '分享人数',
-    dataIndex: 'sharePersonNum',
-    key: 'sharePersonNum',
-    sorter: true,
-    render: (text, record) => (
-      <Navigate onClick={toSharePersonNum(record)}>{record.sharePersonNum}</Navigate>
-    ),
-  },
-  {
-    title: '分享次数',
-    dataIndex: 'shareNum',
-    key: 'shareNum',
-    sorter: true,
-    // render: (text, record) => (
-    //   <Navigate onClick={toShareNum(record)}>{record.shareNum}</Navigate>
-    //   // <a style={{ color: '#66B3FF' }} onClick={toShareNum(record)}><span>{record.shareNum}</span></a>
-    // ),
-  },
+  const toShareNum = rowData => () => {
+    if (rowData) {
+      router.push({
+        pathname: '/statistics/activity/shareNum',
+        query: {
+          queryDate: rowData.date,
+          buildingId: params.buildingId || undefined,
+          activityType: params.activityType || undefined,
+        },
+      });
+      return;
+    }
+  };
 
-  {
-    title: '访问人数',
-    dataIndex: 'visitPersonNum',
-    key: 'visitPersonNum',
-    sorter: true,
-    // render: (text, record) => (
-    //   <Navigate onClick={toAddVisitPersonNum(record)}>{record.visitPersonNum}</Navigate>
-    //   // <a style={{ color: '#66B3FF' }} onClick={toAddVisitPersonNum(record)}><span>{record.visitPersonNum}</span></a>
-    // ),
-  },
-  {
-    title: '访问次数',
-    dataIndex: 'visitNum',
-    key: 'visitNum',
-    sorter: true,
-    // render: (text, record) => (
-    //   <Navigate onClick={toAddVisitNum(record)}>{record.visitNum}</Navigate>
-    //   // <a style={{ color: '#66B3FF' }} onClick={toAddVisitNum(record)}><span>{record.visitNum}</span></a>
-    // ),
-  },
-  {
-    title: '新增注册用户',
-    dataIndex: 'addRegistNum',
-    key: 'addRegistNum',
-    sorter: true,
-    // render: (text, record) => (
-    //   <Navigate onClick={toAddRegistNum(record)}>{record.addRegistNum}</Navigate>
-    //   // <a style={{ color: '#66B3FF' }} onClick={toAddRegistNum(record)}><span>{record.addRegistNum}</span></a>
-    // ),
-  },
-];
+  const toAddVisitPersonNum = rowData => () => {
+    if (rowData) {
+      router.push({
+        pathname: '/statistics/activity/visitPersonNum',
+        query: {
+          queryDate: rowData.date,
+          buildingId: params.buildingId || undefined,
+          activityType: params.activityType || undefined,
+        },
+      });
+      return;
+    }
+  };
+
+  const toAddVisitNum = rowData => () => {
+    if (rowData) {
+      router.push({
+        pathname: '/statistics/activity/visitNum',
+        query: {
+          queryDate: rowData.date,
+          buildingId: params.buildingId || undefined,
+          activityType: params.activityType || undefined,
+        },
+      });
+      return;
+    }
+  };
+
+  const toAddRegistNum = rowData => () => {
+    if (rowData) {
+      router.push({
+        pathname: '/statistics/activity/addRegistNum',
+        query: {
+          queryDate: rowData.date,
+          buildingId: params.buildingId || undefined,
+          activityType: params.activityType || undefined,
+        },
+      });
+      return;
+    }
+  };
+
+  const columns = [
+    {
+      title: '日期',
+      dataIndex: 'date',
+      key: 'date',
+    },
+    {
+      title: '分享人数',
+      dataIndex: 'sharePersonNum',
+      key: 'sharePersonNum',
+      sorter: true,
+      render: (text, record) => (
+        <Navigate onClick={toSharePersonNum(record)}>{record.sharePersonNum}</Navigate>
+      ),
+    },
+    {
+      title: '分享次数',
+      dataIndex: 'shareNum',
+      key: 'shareNum',
+      sorter: true,
+      render: (text, record) => <Navigate onClick={toShareNum(record)}>{record.shareNum}</Navigate>,
+    },
+
+    {
+      title: '访问人数',
+      dataIndex: 'visitPersonNum',
+      key: 'visitPersonNum',
+      sorter: true,
+      render: (text, record) => (
+        <Navigate onClick={toAddVisitPersonNum(record)}>{record.visitPersonNum}</Navigate>
+      ),
+    },
+    {
+      title: '访问次数',
+      dataIndex: 'visitNum',
+      key: 'visitNum',
+      sorter: true,
+      render: (text, record) => (
+        <Navigate onClick={toAddVisitNum(record)}>{record.visitNum}</Navigate>
+      ),
+    },
+    {
+      title: '新增注册用户',
+      dataIndex: 'addRegistNum',
+      key: 'addRegistNum',
+      sorter: true,
+      render: (text, record) => (
+        <Navigate onClick={toAddRegistNum(record)}>{record.addRegistNum}</Navigate>
+      ),
+    },
+  ];
 
   useEffect(() => {
     getTableList();

src/pages/statistics/activity/compents/activityCount.jsx

@@ -40,7 +40,7 @@ console.log(params,'params')
         // endDate: getDayEnd(params.endDate),
       }
     }).then(res => {
-    
+    setData(res)
     }).catch(err => {
 
     })
@@ -63,7 +63,7 @@ console.log(params,'params')
           <Card>
             <Statistic
               title="分享总次数"
-              value={data.allPersonNum || 0}
+              value={data.shareNum || 0}
               //   valueStyle={{ color: '#3f8600' }}
             />
           </Card>
@@ -72,7 +72,7 @@ console.log(params,'params')
           <Card>
             <Statistic
               title="分享总人数"
-              value={data.registerPersonNum || 0}
+              value={data.sharePersonNum || 0}
               //   valueStyle={{ color: '#cf1322' }}
             />
           </Card>
@@ -81,7 +81,7 @@ console.log(params,'params')
           <Card>
             <Statistic
               title="访问总次数"
-              value={data.todayVisitNum || 0}
+              value={data.visitNum || 0}
               //   valueStyle={{ color: '#3f8600' }}
             />
           </Card>
@@ -90,7 +90,7 @@ console.log(params,'params')
           <Card >
             <Statistic
               title="访问总人数"
-              value={data.todayAddPersonNum || 0}
+              value={data.visitPersonNum || 0}
               //   valueStyle={{ color: '#cf1322' }}
             />
           </Card>

src/pages/statistics/activity/shareNum.jsx

@@ -0,0 +1,359 @@
+import React, { Component, useState, useEffect } from 'react';
+import {
+  Form,
+  Icon,
+  Input,
+  Button,
+  DatePicker,
+  Select,
+  Card,
+  Row,
+  Col,
+  Pagination,
+  Alert,
+  Table,
+  Avatar,
+  Radio,
+  Modal,
+  Descriptions,
+} from 'antd';
+import moment from 'moment';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import router from 'umi/router';
+import AuthButton from '@/components/AuthButton';
+import BuildingSelect from '@/components/SelectButton/BuildSelect';
+import Prompt from 'umi/prompt';
+
+const { RangePicker } = DatePicker;
+const { Option } = Select;
+
+const formItemLayout = {
+  labelCol: { span: 10 },
+  wrapperCol: { span: 14 },
+};
+
+let daterange = [];
+let tableTitle = ['类型'];
+let queryDate = '';
+
+let 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 '置业顾问';
+      }
+      if (records.sharePersonType === 'channel agent') {
+        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',
+  // },
+];
+
+class SharePersonNum extends React.Component {
+  constructor(props) {
+    super(props);
+    console.log(props);
+    queryDate = props.location.query.queryDate;
+    let startDate;
+    let endDate;
+    if (props.location.query.queryDate) {
+      startDate =
+        moment(props.location.query.queryDate)
+          .hours(0)
+          .minutes(0)
+          .seconds(0)
+          .milliseconds(0)
+          .format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
+      endDate =
+        moment(props.location.query.queryDate)
+          .hours(23)
+          .minutes(59)
+          .seconds(59)
+          .milliseconds(999)
+          .format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
+    } else {
+      startDate =
+        moment(props.location.query.startDate)
+          .hours(0)
+          .minutes(0)
+          .seconds(0)
+          .milliseconds(0)
+          .format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
+      endDate =
+        moment(props.location.query.endDate)
+          .hours(23)
+          .minutes(59)
+          .seconds(59)
+          .milliseconds(999)
+          .format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
+    }
+    this.state = {
+      formData: {
+        sharePhone: '',
+        sharePersonType: '',
+        pageNum: '',
+        pageSize: '',
+        shareName: '',
+        sort: null,
+        colKey: null,
+        startDate: startDate,
+        endDate: endDate,
+        activityId: props.location.query.activityId,
+        activityType: props.location.query.activityType,
+        personId: props.location.query.personId,
+        buildingId: props.location.query.buildingId,
+      },
+      personData: [],
+      dataSoures: [],
+      tableData: [],
+      userType: 'all',
+      activityName: props.location.query.activityName,
+    };
+  }
+
+  componentDidMount() {
+    this.getTableList();
+  }
+
+  getTableList() {
+    const { formData } = this.state;
+    console.log(formData);
+    request({ ...apis.activityDataStatis.activityShareNum, params: formData })
+      .then(data => {
+        console.log(data);
+        this.setState({ tableData: data.records, total: data.total });
+      })
+      .catch();
+  }
+
+  handleSubmit = (e, props) => {
+    let startDate = null;
+    let endDate = null;
+    const sharePersonType = this.props.form.getFieldValue('sharePersonType');
+    const sharePersonPhone = this.props.form.getFieldValue('sharePersonPhone');
+    const sharePersonName = this.props.form.getFieldValue('sharePersonName');
+    const { formData } = this.state;
+    this.setState(
+      {
+        formData: {
+          ...formData,
+          sharePersonType: sharePersonType,
+          sharePersonPhone: sharePersonPhone,
+          sharePersonName: sharePersonName,
+          pageNum: 1,
+          pageSize: 999,
+        },
+      },
+      this.getTableList,
+    );
+  };
+
+  //重置搜索
+  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)
+          .format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
+      endDate =
+        moment(this.props.location.query.queryDate)
+          .hours(23)
+          .minutes(59)
+          .seconds(59)
+          .milliseconds(999)
+          .format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
+    } else {
+      startDate =
+        moment(this.props.location.query.startDate)
+          .hours(0)
+          .minutes(0)
+          .seconds(0)
+          .milliseconds(0)
+          .format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
+      endDate =
+        moment(this.props.location.query.endDate)
+          .hours(23)
+          .minutes(59)
+          .seconds(59)
+          .milliseconds(999)
+          .format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
+    }
+    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 = () => {
+    router.go(-1);
+  };
+
+  exportActivityStats = () => {
+    const { formData } = this.state;
+    request({ ...apis.activityDataStatis.activityShareNumExport, params: formData })
+      .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();
+  };
+
+  //排序
+  handleTableChange = (pagination, filters, sorter) => {
+    console.log(pagination, filters, sorter);
+    const { formData } = this.state;
+    this.setState(
+      {
+        formData: {
+          ...formData,
+          sharePersonType: formData.sharePersonType,
+          sharePhone: formData.sharePhone,
+          shareName: formData.shareName,
+          pageNum: pagination.current,
+          pageSize: pagination.pageSize,
+          sort: sorter.order,
+          colKey: sorter.columnKey,
+        },
+      },
+      this.getTableList,
+    );
+  };
+
+  render() {
+    const { getFieldDecorator } = this.props.form;
+
+    return (
+      <Card>
+        <div align="right" style={{ marginBottom: '16px' }}>
+          <Button onClick={this.goback}>返回</Button>
+        </div>
+        {this.state.activityName && (
+          <div>
+            <span style={{ marginLeft: '20px' }}>分享内容：{this.state.activityName}</span>
+          </div>
+        )}
+        <Form
+          layout="inline"
+          onSubmit={e => this.handleSubmit(e, this.props)}
+          style={{ display: 'flex', alignItems: 'center' }}
+        >
+          <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+            {getFieldDecorator('sharePersonType')(
+              <Select placeholder="分享者类型" style={{ width: 150, marginLeft: '20px' }}>
+                <Option value="drift">游客</Option>
+                <Option value="customer">普通客户</Option>
+                <Option value="Realty Consultant">置业顾问</Option>
+                <Option value="channel agent">专业经纪人</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={e => this.handleReset()} style={{ marginLeft: '30px' }}>
+              重置
+            </Button>
+          </Form.Item>
+          <AuthButton name="admin.statistical.activity.export" noRight={null}>
+            <Button
+              type="primary"
+              style={{ position: 'absolute', right: '27px', zIndex: 1 }}
+              onClick={this.exportActivityStats}
+            >
+              导出
+            </Button>
+          </AuthButton>
+        </Form>
+        <div>
+          <Table
+            style={{ marginTop: '20px' }}
+            dataSource={this.state.tableData}
+            columns={columns}
+            pagination={{ total: this.state.total }}
+            onChange={this.handleTableChange}
+            scroll={{ y: 500 }}
+          ></Table>
+        </div>
+      </Card>
+    );
+  }
+}
+const WrappedTypeForm = Form.create()(SharePersonNum);
+export default WrappedTypeForm;

src/pages/statistics/activity/sharePersonNum.jsx

@@ -0,0 +1,344 @@
+import React, { Component, useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Modal, Descriptions } from 'antd';
+import moment from 'moment';
+import request from '@/utils/request';
+import apis from '@/services/apis';
+import router from 'umi/router';
+import AuthButton from '@/components/AuthButton';
+import BuildingSelect from '@/components/SelectButton/BuildSelect';
+import Navigate from '@/components/Navigate';
+
+const { RangePicker } = DatePicker;
+const { Option } = Select
+
+const formItemLayout = {
+  labelCol: { span: 10 },
+  wrapperCol: { span: 14 },
+};
+
+let daterange = []
+let tableTitle = ['类型']
+
+let staticStartDate = ''
+let staticEndDate = ''
+let queryDate = ''
+let activityName = ''
+let activityId = ''
+let activityType = ''
+
+const toShareNum = rowData => () => {
+  if (rowData) {
+    router.push({
+      pathname: '/statistics/activity/shareNum',
+      query: {
+        queryDate: queryDate,
+        personId: rowData.personId,
+        startDate: staticStartDate,
+        endDate: staticEndDate,
+        activityName: activityName,
+        activityId: activityId,
+        activityType: activityType
+      },
+    });
+    return
+  }
+}
+
+const toVisitPersonNum = rowData => () => {
+  if (rowData) {
+    router.push({
+      pathname: '/statistical/activity/visitPersonNum',
+      query: {
+        queryDate: queryDate,
+        personId: rowData.personId,
+        startDate: staticStartDate,
+        endDate: staticEndDate,
+        activityName: activityName,
+        activityId: activityId,
+        activityType: activityType
+      },
+    });
+    return
+  }
+}
+
+const toVisitNum = rowData => () => {
+  if (rowData) {
+    router.push({
+      pathname: '/statistical/activity/visitNum',
+      query: {
+        queryDate: queryDate,
+        personId: rowData.personId,
+        startDate: staticStartDate,
+        endDate: staticEndDate,
+        activityName: activityName,
+        activityId: activityId,
+        activityType: activityType
+      },
+    });
+    return
+  }
+}
+
+let 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 '置业顾问' }
+      if (records.sharePersonType === 'channel agent') { return '经纪人' }
+    },
+  },
+  {
+    title: '分享者电话',
+    dataIndex: 'sharePersonPhone',
+    key: 'sharePersonPhone',
+  },
+  {
+    title: '分享次数',
+    dataIndex: 'shareNum',
+    key: 'shareNum',
+    sorter: true,
+    render: (text, record) => (
+      <Navigate onClick={toShareNum(record)}>{record.shareNum}</Navigate>
+      // <a style={{ color: '#66B3FF' }} onClick={toShareNum(record)}><span>{record.shareNum}</span></a>
+    ),
+  },
+  {
+    title: '访问人数',
+    dataIndex: 'visitPersonNum',
+    key: 'visitPersonNum',
+    sorter: true,
+    render: (text, record) => (
+      <Navigate onClick={toVisitPersonNum(record)}>{record.visitPersonNum}</Navigate>
+      // <a style={{ color: '#66B3FF' }} onClick={toVisitPersonNum(record)}><span>{record.visitPersonNum}</span></a>
+    ),
+  },
+  {
+    title: '访问次数',
+    dataIndex: 'visitNum',
+    key: 'visitNum',
+    sorter: true,
+    render: (text, record) => (
+      <Navigate onClick={toVisitNum(record)}>{record.visitNum}</Navigate>
+      // <a style={{ color: '#66B3FF' }} onClick={toVisitNum(record)}><span>{record.visitNum}</span></a>
+    ),
+  },
+]
+
+class SharePersonNum extends React.Component {
+
+  constructor(props) {
+    super(props)
+    let startDate;
+    let endDate;
+    queryDate = props.location.query.queryDate
+    activityName = props.location.query.activityName
+    staticStartDate = props.location.query.startDate;
+    staticEndDate = props.location.query.endDate;
+    activityId = props.location.query.activityId;
+    activityType = props.location.query.activityType;
+
+    if (props.location.query.queryDate) {
+      console.log(queryDate, "props.location.query.queryDateprops.location.query.queryDate")
+      startDate = moment(props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
+      endDate = moment(props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
+      console.log(startDate, endDate, "endDateendDateendDateendDateendDateendDate")
+    } else {
+      startDate = moment(props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
+      endDate = moment(props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
+    }
+
+    console.log(startDate)
+    this.state = {
+      formData: {
+        sharePhone: '',
+        sharePersonType: '',
+        pageNum: '',
+        pageSize: '',
+        shareName: '',
+        sort: null,
+        colKey: null,
+        startDate: startDate,
+        endDate: endDate,
+        activityId: props.location.query.activityId,
+        activityType: props.location.query.activityType,
+        buildingId: props.location.query.buildingId,
+      },
+      personData: [],
+      dataSoures: [],
+      tableData: [],
+      userType: 'all',
+      activityName: props.location.query.activityName
+    }
+  }
+
+  componentDidMount() {
+    this.getTableList()
+  }
+
+  getTableList() {
+    const { formData } = this.state
+    request({ ...apis.activityDataStatis.activitySharePersonNum, params: formData }).then(data => {
+      console.log(data)
+      this.setState({ tableData: data.records, total: data.total })
+    }).catch()
+  }
+
+  handleSubmit = (e, props) => {
+    let startDate = null
+    let endDate = null
+    const sharePersonType = this.props.form.getFieldValue("sharePersonType");
+    const sharePersonPhone = this.props.form.getFieldValue("sharePersonPhone");
+    const sharePersonName = this.props.form.getFieldValue("sharePersonName");
+    const { formData } = this.state
+    this.setState({
+      formData: {
+        ...formData,
+        sharePersonType: sharePersonType,
+        sharePersonPhone: sharePersonPhone,
+        sharePersonName: sharePersonName,
+        pageNum: 1,
+        pageSize: 999
+      }
+    }, this.getTableList)
+  }
+
+  //重置搜索
+  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).format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
+      endDate = moment(this.props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
+    } else {
+      startDate = moment(this.props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
+      endDate = moment(this.props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
+    }
+    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 = () => {
+    router.go(-1);
+  }
+
+  exportActivityStats = () => {
+    const { formData } = this.state
+    request({ ...apis.activityDataStatis.activitySharePersonNumExport, params: formData }).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()
+  }
+
+  //排序
+  handleTableChange = (pagination, filters, sorter) => {
+    console.log(pagination, filters, sorter)
+    const { formData } = this.state
+    this.setState({
+      formData: {
+        ...formData,
+        sharePersonType: formData.sharePersonType,
+        sharePhone: formData.sharePhone,
+        shareName: formData.shareName,
+        pageNum: pagination.current,
+        pageSize: pagination.pageSize,
+        sort: sorter.order,
+        colKey: sorter.columnKey
+      }
+    }, this.getTableList)
+  };
+
+  render() {
+    const { radioVal } = this.state
+    const { getFieldDecorator } = this.props.form;
+
+    return (
+      <Card>
+        <div align="right" style={{ marginBottom: '16px' }}><Button onClick={this.goback}>返回</Button></div>
+        {this.state.activityName&&<div>
+          <span style={{ marginLeft: '20px' }}>分享内容：{this.state.activityName}</span>
+        </div>}
+        <Form layout="inline" onSubmit={e => this.handleSubmit(e, this.props)}>
+          <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+            {getFieldDecorator('sharePersonType')(
+              <Select placeholder="分享者类型" style={{ width: 150, marginLeft: '20px' }}>
+                <Option value="drift">游客</Option>
+                <Option value="customer">普通客户</Option>
+                <Option value="Realty Consultant">置业顾问</Option>
+                <Option value="channel agent">经纪人</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={e => this.handleReset()} style={{ marginLeft: '30px' }}>重置</Button>
+          </Form.Item>
+          <AuthButton name="admin.statistical.activity.export" noRight={null}>
+            <Button type="primary" style={{ float: 'right', zIndex: 1, marginTop: '24px' }} onClick={this.exportActivityStats}>
+              导出
+            </Button>
+          </AuthButton>
+        </Form>
+        <div>
+
+          <Table style={{ marginTop: '20px' }} dataSource={this.state.tableData} columns={columns} pagination={{ total: this.state.total }} onChange={this.handleTableChange} scroll={{ y: 500 }}></Table>
+        </div>
+      </Card>
+    )
+
+  }
+}
+const WrappedTypeForm = Form.create()(SharePersonNum);
+export default WrappedTypeForm

src/pages/statistics/activity/visitNum.jsx

@@ -0,0 +1,363 @@
+import React, { Component, useState, useEffect } from 'react';
+import {
+  Form,
+  Icon,
+  Input,
+  Button,
+  DatePicker,
+  Select,
+  Card,
+  Row,
+  Col,
+  Pagination,
+  Alert,
+  Table,
+  Avatar,
+  Radio,
+  Modal,
+  Descriptions,
+} from 'antd';
+import moment from 'moment';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import router from 'umi/router';
+import AuthButton from '@/components/AuthButton';
+import BuildingSelect from '@/components/SelectButton/BuildSelect';
+import WxDictSelect from '@/components/SelectButton/WxDictSelect';
+import Prompt from 'umi/prompt';
+
+const { RangePicker } = DatePicker;
+const { Option } = Select;
+
+const formItemLayout = {
+  labelCol: { span: 10 },
+  wrapperCol: { span: 14 },
+};
+
+let daterange = [];
+let tableTitle = ['类型'];
+let queryDate = '';
+
+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>
+      </>
+    ),
+  },
+];
+
+class SharePersonNum extends React.Component {
+  constructor(props) {
+    super(props);
+    queryDate = props.location.query.queryDate;
+
+    let startDate;
+    let endDate;
+    if (props.location.query.queryDate) {
+      startDate =
+        moment(props.location.query.queryDate)
+          .hours(0)
+          .minutes(0)
+          .seconds(0)
+          .milliseconds(0)
+          .format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
+      endDate =
+        moment(props.location.query.queryDate)
+          .hours(23)
+          .minutes(59)
+          .seconds(59)
+          .milliseconds(999)
+          .format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
+    } else {
+      startDate =
+        moment(props.location.query.startDate)
+          .hours(0)
+          .minutes(0)
+          .seconds(0)
+          .milliseconds(0)
+          .format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
+      endDate =
+        moment(props.location.query.endDate)
+          .hours(23)
+          .minutes(59)
+          .seconds(59)
+          .milliseconds(999)
+          .format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
+    }
+    console.log(startDate);
+    this.state = {
+      formData: {
+        personFrom: '',
+        pageNum: '',
+        pageSize: '',
+        startDate: startDate,
+        endDate: endDate,
+        province: '',
+        realtyConsultant: '',
+        realtyConsultantPhone: '',
+        activityId: props.location.query.activityId,
+        activityType: props.location.query.activityType,
+        personId: props.location.query.personId,
+        buildingId: props.location.query.buildingId,
+      },
+      personData: [],
+      dataSoures: [],
+      tableData: [],
+      userType: 'all',
+      activityName: props.location.query.activityName,
+    };
+  }
+
+  componentDidMount() {
+    this.getTableList();
+  }
+
+  getTableList() {
+    const { formData } = this.state;
+    console.log(formData);
+    request({ ...apis.activityDataStatis.activityVisitNum, params: formData })
+      .then(data => {
+        console.log(data);
+        this.setState({ tableData: data.records, total: data.total });
+      })
+      .catch();
+  }
+
+  handleSubmit = (e, props) => {
+    let startDate = null;
+    let endDate = null;
+    const province = this.props.form.getFieldValue('province');
+    const personFrom = this.props.form.getFieldValue('personFrom');
+    const realtyConsultant = this.props.form.getFieldValue('realtyConsultant');
+    const realtyConsultantPhone = this.props.form.getFieldValue('realtyConsultantPhone');
+
+    const { formData } = this.state;
+    this.setState(
+      {
+        formData: {
+          ...formData,
+          personFrom: personFrom,
+          province: province,
+          realtyConsultant: realtyConsultant,
+          realtyConsultantPhone: realtyConsultantPhone,
+          pageNum: 1,
+          pageSize: 999,
+        },
+      },
+      this.getTableList,
+    );
+  };
+
+  //重置搜索
+  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)
+          .format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
+      endDate =
+        moment(this.props.location.query.queryDate)
+          .hours(23)
+          .minutes(59)
+          .seconds(59)
+          .milliseconds(999)
+          .format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
+    } else {
+      startDate =
+        moment(this.props.location.query.startDate)
+          .hours(0)
+          .minutes(0)
+          .seconds(0)
+          .milliseconds(0)
+          .format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
+      endDate =
+        moment(this.props.location.query.endDate)
+          .hours(23)
+          .minutes(59)
+          .seconds(59)
+          .milliseconds(999)
+          .format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
+    }
+    console.log(startDate);
+    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 = () => {
+    router.go(-1);
+  };
+
+  exportActivityStats = () => {
+    const { formData } = this.state;
+    request({ ...apis.activityDataStatis.activityVisitNumExport, params: formData })
+      .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();
+  };
+
+  //排序
+  handleTableChange = (pagination, filters, sorter) => {
+    console.log(pagination, filters, sorter);
+    const { formData } = this.state;
+    this.setState(
+      {
+        formData: {
+          ...formData,
+          personFrom: formData.personFrom,
+          pageNum: pagination.current,
+          pageSize: pagination.pageSize,
+        },
+      },
+      this.getTableList,
+    );
+  };
+
+  render() {
+    const { radioVal } = this.state;
+    const { getFieldDecorator } = this.props.form;
+
+    return (
+      <Card>
+        <div align="right" style={{ marginBottom: '16px' }}>
+          <Button onClick={this.goback}>返回</Button>
+        </div>
+        {this.state.activityName && (
+          <div>
+            <span style={{ marginLeft: '20px' }}>分享内容：{this.state.activityName}</span>
+          </div>
+        )}
+        <Form layout="inline" onSubmit={e => this.handleSubmit(e, this.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={e => this.handleReset()} style={{ marginLeft: '30px' }}>
+              重置
+            </Button>
+          </Form.Item>
+          <AuthButton name="admin.statistical.activity.export" noRight={null}>
+            <Button
+              type="primary"
+              style={{ float: 'right', margin: '20px 0', zIndex: 1 }}
+              onClick={this.exportActivityStats}
+            >
+              导出
+            </Button>
+          </AuthButton>
+        </Form>
+        <div>
+          <Table
+            style={{ marginTop: '20px' }}
+            dataSource={this.state.tableData}
+            columns={columns}
+            pagination={{ total: this.state.total }}
+            onChange={this.handleTableChange}
+            scroll={{ y: 500 }}
+          ></Table>
+        </div>
+      </Card>
+    );
+  }
+}
+const WrappedTypeForm = Form.create()(SharePersonNum);
+export default WrappedTypeForm;

src/pages/statistics/activity/visitPersonNum.jsx

@@ -0,0 +1,264 @@
+import React, { Component, useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Modal, Descriptions } from 'antd';
+import moment from 'moment';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import router from 'umi/router';
+import AuthButton from '@/components/AuthButton';
+import BuildingSelect from '@/components/SelectButton/BuildSelect';
+import WxDictSelect from '@/components/SelectButton/WxDictSelect';
+import Prompt from 'umi/prompt';
+
+const { RangePicker } = DatePicker;
+const { Option } = Select
+
+const formItemLayout = {
+  labelCol: { span: 10 },
+  wrapperCol: { span: 14 },
+};
+
+let daterange = []
+let tableTitle = ['类型']
+let queryDate = ''
+
+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: 'visitNum',
+    key: 'visitNum',
+  },
+]
+
+class SharePersonNum extends React.Component {
+
+  constructor(props) {
+    super(props)
+    queryDate = props.location.query.queryDate
+
+    let startDate;
+    let endDate;
+
+    if (props.location.query.queryDate) {
+      startDate = moment(props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
+      endDate = moment(props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
+    } else {
+      startDate = moment(props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
+      endDate = moment(props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
+    }
+    console.log(startDate)
+    this.state = {
+      formData: {
+        personFrom: '',
+        pageNum: '',
+        pageSize: '',
+        startDate: startDate,
+        endDate: endDate,
+        province: '',
+        realtyConsultant: '',
+        realtyConsultantPhone: '',
+        activityId: props.location.query.activityId,
+        activityType: props.location.query.activityType,
+        personId: props.location.query.personId,
+        buildingId: props.location.query.buildingId
+      },
+      personData: [],
+      dataSoures: [],
+      tableData: [],
+      userType: 'all',
+      activityName: props.location.query.activityName
+    }
+  }
+
+  componentDidMount() {
+    this.getTableList()
+  }
+
+  getTableList() {
+    const { formData } = this.state
+    console.log(formData)
+    request({ ...apis.activityDataStatis.activityVisitPersonNum, params: formData }).then(data => {
+      console.log(data)
+      this.setState({ tableData: data.records, total: data.total })
+    }).catch()
+  }
+
+  handleSubmit = (e, props) => {
+    let startDate = null
+    let endDate = null
+    const province = this.props.form.getFieldValue("province");
+    const personFrom = this.props.form.getFieldValue("personFrom");
+    const realtyConsultant = this.props.form.getFieldValue("realtyConsultant");
+    const realtyConsultantPhone = this.props.form.getFieldValue("realtyConsultantPhone");
+
+    const { formData } = this.state
+    this.setState({
+      formData: {
+        ...formData,
+        personFrom: personFrom,
+        province: province,
+        realtyConsultant: realtyConsultant,
+        realtyConsultantPhone: realtyConsultantPhone,
+        pageNum: 1,
+        pageSize: 999
+      }
+    }, this.getTableList)
+  }
+
+  //重置搜索
+  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).format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
+      endDate = moment(this.props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
+    } else {
+      startDate = moment(this.props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
+      endDate = moment(this.props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
+    }
+    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 = () => {
+    router.go(-1);
+  }
+
+  exportActivityStats = () => {
+    const { formData } = this.state
+    request({ ...apis.activityDataStatis.activityVisitPersonNumExport, params: formData }).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()
+  }
+
+  //排序
+  handleTableChange = (pagination, filters, sorter) => {
+    console.log(pagination, filters, sorter)
+    const { formData } = this.state
+    this.setState({
+      formData: {
+        ...formData,
+        personFrom: formData.personFrom,
+        pageNum: pagination.current,
+        pageSize: pagination.pageSize
+      }
+    }, this.getTableList)
+  };
+
+  render() {
+    const { radioVal } = this.state
+    const { getFieldDecorator } = this.props.form;
+
+    return (
+      <Card>
+        <div align="right" style={{ marginBottom: '16px' }}><Button onClick={this.goback}>返回</Button></div>
+        {this.state.activityName&&<div>
+          <span style={{ marginLeft: '20px' }}>分享内容：{this.state.activityName}</span>
+        </div>}
+        <Form layout="inline" onSubmit={e => this.handleSubmit(e, this.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={e => this.handleReset()} style={{ marginLeft: '30px' }}>重置</Button>
+          </Form.Item>
+          <AuthButton name="admin.statistical.activity.export" noRight={null}>
+            <Button type="primary" style={{ float: 'right', margin: '20px 0', zIndex: 1 }} onClick={this.exportActivityStats}>
+              导出
+            </Button>
+          </AuthButton>
+        </Form>
+        <div>
+
+          <Table style={{ marginTop: '20px' }} dataSource={this.state.tableData} columns={columns} pagination={{ total: this.state.total }} onChange={this.handleTableChange} scroll={{ y: 500 }}></Table>
+        </div>
+      </Card>
+    )
+
+  }
+}
+const WrappedTypeForm = Form.create()(SharePersonNum);
+export default WrappedTypeForm

src/pages/statistics/building/BuildingStatistic/component/StatsChartLine.jsx

@@ -1,81 +1,110 @@
 import React, { Component, useState, useEffect } from 'react';
-import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Modal, Descriptions } from 'antd';
-import moment from 'moment';
 import echarts from 'echarts/lib/echarts';
-import EChart from '../../../../components/EchartsTest/EChart';
+import EChart from '@/components/EchartsTest/EChart';
+import request from '@/utils/request';
+import apis from '@/services/apis';
+import moment from 'moment';
 import router from 'umi/router';
+import { Table, Select, Row, Col, Menu, Dropdown, Card, Icon, message } from 'antd';
 
-class StatsChart extends React.Component {
+const formatDate = (start, end) => {
+  const startDate = moment(start).format('YYYY-MM-DDT00:00:00.000') + 'Z';
+  const endDate = moment(end).format('YYYY-MM-DDT23:59:59.999') + 'Z';
+  return { startDate, endDate };
+};
+const UserSource = props => {
+    const {buildingId,buildingName,params} = props 
+  const [data, setData] = useState({  });
+  //柱图
+//   // 获取图表数据
+//  const getTimeBarDate = (startDate, endDate) => {
+//     request({ ...apis.stats.timeBarList, params: { startDate: moment(startDate).format('YYYY-MM-DDT00:00:00.000') + 'Z', endDate: moment(endDate).format('YYYY-MM-DDT23:59:59.999') + 'Z', buildingId: this.state.buildingId } }).then((data) => {
+//       this.setState({ ...this.state, barData: data })
+//     })
+//   }
+  useEffect(() => {
+    getData(params);
+  }, [params]);
 
-  constructor(props) {
-    super(props)
-    this.state = {}
+  function getData(params) {
+    request({
+        ...apis.stats.timeBarList,
+      params: {  ...params,buildingId },
+    }).then(data => {
+      setData(data);
+    });
   }
 
-  render() {
-    const { data = {}} = this.props
-    const options = {
-      title: {
-          text: this.props.title,
-      },
-      tooltip: {
-          trigger: 'axis'
-      },
-      legend: {
-          data: ['公客数', '私客数', '新增客户数', '访问人数']
-      },
-      grid: {
-          left: '3%',
-          right: '4%',
-          bottom: '3%',
-          containLabel: true
-      },
-      toolbox: {
-          feature: {
-              saveAsImage: {}
-          }
-      },
-      xAxis: {
-          type: 'category',
-          boundaryGap: false,
-          axisLabel: {rotate: 45},
-          data: data.timeList || []
-      },
-      yAxis: {
-          type: 'value'
-      },
-      series: [
-          {
-              name: '公客数',
-              type: 'line',
-              data: data.gkList || []
-              
-          },
-          {
-              name: '私客数',
-              type: 'line',
-              data: data.skList || []
-          },
-          {
-              name: '新增客户数',
-              type: 'line',
-              data: data.khList || []
-          },
-          {
-              name: '访问人数',
-              type: 'line',
-              data: data.uvList || []
-          }
-      ]
-  };
-  
+  const options = {
+    // title: {
+    //     text: this.props.title,
+    // },
+    tooltip: {
+        trigger: 'axis'
+    },
+    legend: {
+        data: ['公客数', '私客数', '新增客户数', '访问人数']
+    },
+    grid: {
+        left: '3%',
+        right: '4%',
+        bottom: '3%',
+        containLabel: true
+    },
+    toolbox: {
+        feature: {
+            saveAsImage: {}
+        }
+    },
+    xAxis: {
+        type: 'category',
+        boundaryGap: false,
+        axisLabel: {rotate: 45},
+        data: data.timeList || []
+    },
+    yAxis: {
+        type: 'value'
+    },
+    series: [
+        {
+            name: '公客数',
+            type: 'line',
+            data: data.gkList || []
+            
+        },
+        {
+            name: '私客数',
+            type: 'line',
+            data: data.skList || []
+        },
+        {
+            name: '新增客户数',
+            type: 'line',
+            data: data.khList || []
+        },
+        {
+            name: '访问人数',
+            type: 'line',
+            data: data.uvList || []
+        }
+    ]
+};
+
+
 
-    return (
+
+  return (
     <>
-      <EChart options={options} style={{ width: '100%', height: '400px', }} />
+      <Card
+        title={`趋势图：${buildingName}`}
+        headStyle={{ textAlign: 'left' }}
+
+      >
+
+        <EChart options={options}  />
+      </Card>
     </>
-    )
-  }
-}
+  );
+};
 
-export default StatsChart
+export default UserSource;

src/pages/statistics/building/detail.jsx

@@ -0,0 +1,100 @@
+import React, { Component, useState, useEffect, useRef } from 'react';
+import { Card, Row, Col, Statistic, Icon, Tabs, Form, Select, Button, Modal } from 'antd';
+// import IndexEcharts from './components/indexEcharts';
+// import Swiper from './swiper/index';
+import moment from 'moment';
+import router from 'umi/router';
+import request from '@/utils/request';
+import apis from '@/services/apis';
+import TimeSelect from '../compents/TimeSelect';
+import BuildingSelect from '@/components/SelectButton/BuildSelect';
+import Navigate from '@/components/Navigate';
+import StatsChartLine from './BuildingStatistic/component/StatsChartLine';
+// import ActivityCount from '../compents/activityCount';
+// import NewUsers from '../compents/NewUsers';
+// import OverviewDeatil from '../compents/OverviewDeatil';
+
+// import Count from './components/Count';
+// import SourceRole from './components/SourceRole';
+// import UserSex from './components/UserSex';
+// import UserConversion from './components/UserConversion';
+// import BuildingStatistic from './BuildingStatistic';
+const { TabPane } = Tabs;
+const { Option } = Select;
+
+const activityOverView = props => {
+  const { buildingId, buildingName } = props.location.query;
+
+  const timeRef = useRef();
+
+  const [data, setData] = useState({});
+  const [serachData, setSearchData] = useState({
+    startDate:
+      moment()
+        .subtract(7, 'day')
+        .format('YYYY-MM-DDT00:00:00.000') + 'Z',
+    endDate: moment().format('YYYY-MM-DDT23:59:59.999') + 'Z',
+  });
+  const [timeValue, setTimeValue] = useState();
+
+  const [time, setTime] = useState();
+
+  //重置搜索
+  const handleReset = e => {
+    props.form.resetFields();
+    timeRef.current.reset();
+    setSearchData({
+      startDate:
+        moment()
+          .subtract(7, 'day')
+          .format('YYYY-MM-DDT00:00:00.000') + 'Z',
+      endDate: moment().format('YYYY-MM-DDT23:59:59.999') + 'Z',
+    });
+  };
+
+  const onTimeChange = e => {
+    setTime(e);
+  };
+  const handleSubmit = e => {
+    props.form.validateFieldsAndScroll((err, values) => {
+      setTimeValue();
+      setSearchData({
+        startDate: moment(time[0]).format('YYYY-MM-DDT00:00:00.000') + 'Z',
+        endDate: moment(time[1]).format('YYYY-MM-DDT23:59:59.999') + 'Z',
+      });
+    });
+  };
+
+  const { getFieldDecorator } = props.form;
+
+  return (
+    <div>
+      <Form layout="inline" onSubmit={handleSubmit}>
+        <Form.Item>
+          <TimeSelect onChange={onTimeChange} ref={timeRef}></TimeSelect>
+        </Form.Item>
+        <Form.Item>
+          <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }}>
+            搜索
+          </Button>
+          <Button onClick={e => handleReset()} style={{ marginLeft: '30px' }}>
+            重置
+          </Button>
+        </Form.Item>
+      </Form>
+      <div style={{ marginTop: '20px' }}>
+        <StatsChartLine
+          params={serachData}
+          buildingId={buildingId}
+          buildingName={buildingName}
+        ></StatsChartLine>
+      </div>
+      <div style={{ marginTop: '20px' }}>
+        {/* <NewUsers params={serachData} dataZoom={false}></NewUsers> */}
+      </div>
+    </div>
+  );
+};
+
+const WrappedTypeForm = Form.create()(activityOverView);
+export default WrappedTypeForm;

src/pages/statistics/building/detail/index.jsx

@@ -0,0 +1,90 @@
+import React, { Component, useState, useEffect, useRef } from 'react';
+import { Card, Row, Col, Statistic, Icon, Tabs, Form, Select, Button, Modal } from 'antd';
+// import IndexEcharts from './components/indexEcharts';
+// import Swiper from './swiper/index';
+import moment from 'moment';
+import router from 'umi/router';
+import request from '@/utils/request';
+import apis from '@/services/apis';
+import TimeSelect from '../../compents/TimeSelect';
+import BuildingSelect from '@/components/SelectButton/BuildSelect';
+import Navigate from '@/components/Navigate';
+import StatsChartLine from '../BuildingStatistic/component/StatsChartLine';
+import TableDetail from './tableDetail';
+
+const detail = props => {
+  const { buildingId, buildingName } = props.location.query;
+
+  const timeRef = useRef();
+
+  const [data, setData] = useState({});
+  const [serachData, setSearchData] = useState({
+    startDate:
+      moment()
+        .subtract(7, 'day')
+        .format('YYYY-MM-DDT00:00:00.000') + 'Z',
+    endDate: moment().format('YYYY-MM-DDT23:59:59.999') + 'Z',
+  });
+  const [timeValue, setTimeValue] = useState();
+
+  const [time, setTime] = useState();
+
+  //重置搜索
+  const handleReset = e => {
+    props.form.resetFields();
+    timeRef.current.reset();
+    setSearchData({
+      startDate:
+        moment()
+          .subtract(7, 'day')
+          .format('YYYY-MM-DDT00:00:00.000') + 'Z',
+      endDate: moment().format('YYYY-MM-DDT23:59:59.999') + 'Z',
+    });
+  };
+
+  const onTimeChange = e => {
+    setTime(e);
+  };
+  const handleSubmit = e => {
+    props.form.validateFieldsAndScroll((err, values) => {
+      setTimeValue();
+      setSearchData({
+        startDate: moment(time[0]).format('YYYY-MM-DDT00:00:00.000') + 'Z',
+        endDate: moment(time[1]).format('YYYY-MM-DDT23:59:59.999') + 'Z',
+      });
+    });
+  };
+
+  const { getFieldDecorator } = props.form;
+
+  return (
+    <div>
+      <Form layout="inline" onSubmit={handleSubmit}>
+        <Form.Item>
+          <TimeSelect onChange={onTimeChange} ref={timeRef}></TimeSelect>
+        </Form.Item>
+        <Form.Item>
+          <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }}>
+            搜索
+          </Button>
+          <Button onClick={e => handleReset()} style={{ marginLeft: '30px' }}>
+            重置
+          </Button>
+        </Form.Item>
+      </Form>
+      <div style={{ marginTop: '20px' }}>
+        <StatsChartLine
+          params={serachData}
+          buildingId={buildingId}
+          buildingName={buildingName}
+        ></StatsChartLine>
+      </div>
+      <div style={{ marginTop: '20px' }}>
+        <TableDetail params={serachData} buildingId={buildingId}></TableDetail>
+      </div>
+    </div>
+  );
+};
+
+const WrappedTypeForm = Form.create()(detail);
+export default WrappedTypeForm;

src/pages/statistics/building/detail/tableDetail.jsx

@@ -0,0 +1,111 @@
+import React, { Component, useState, useEffect } from 'react';
+import { Card, Row, Col, Statistic, Table, Button } from 'antd';
+// import IndexEcharts from './components/indexEcharts';
+import router from 'umi/router';
+import moment from 'moment';
+import request from '@/utils/request';
+import apis from '@/services/apis';
+import AuthButton from '@/components/AuthButton';
+
+const detailData = props => {
+  const {params, buildingId }= props;
+
+  const [data, setData] = useState({});
+  useEffect(() => {
+    getTableData(params);
+  }, [params]);
+
+  //获取表格数据
+  const getTableData = params => {
+    request({ ...apis.stats.timeTableList, params: { ...params, buildingId: buildingId } }).then(
+      res => {
+        setData(res);
+        // this.setState({ ...this.state, tableData: data.records, total: data.total });
+      },
+    );
+  };
+
+  const handleTableChange = (pagination, filters, sorter) => {
+    console.log(pagination, filters, sorter);
+    // { startDate: moment(startDate).format('YYYY-MM-DDT00:00:00.000') + 'Z', endDate: moment(endDate).format('YYYY-MM-DDT23:59:59.999') + 'Z', buildingId, pageNum, pageSize, sortField, sortOrder }
+    getTableData({
+      pageNum: pagination.current,
+      sortField: sorter.columnKey,
+      sortOrder: sorter.order,
+      ...params,
+    });
+  };
+
+  const exportBuildingStats = () => {
+    request({ ...apis.stats.buildingTimeExport, params: { ...params, buildingId: buildingId } })
+      .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 columns = [
+    {
+      title: '日期',
+      dataIndex: 'createDate',
+      key: 'createDate',
+    },
+    {
+      title: '新增客户',
+      dataIndex: 'khNum',
+      key: 'kh_num',
+      sorter: true,
+    },
+    {
+      title: '公客',
+      dataIndex: 'gkNum',
+      key: 'gk_num',
+      sorter: true,
+    },
+    {
+      title: '私客',
+      dataIndex: 'skNum',
+      key: 'sk_num',
+      sorter: true,
+    },
+    {
+      title: '访问人数',
+      dataIndex: 'uvNum',
+      key: 'uv_num',
+      sorter: true,
+    },
+  ];
+
+  return (
+    <Card
+      title={'详细数据'}
+      headStyle={{ textAlign: 'left' }}
+
+    >
+      <div style={{ marginBottom: '20px', textAlign: 'right' }}>
+        <AuthButton name="admin.statistical.building.export" noRight={null}>
+          <Button type="primary" onClick={exportBuildingStats}>
+            导出
+          </Button>
+        </AuthButton>
+      </div>
+      <Table
+        dataSource={data?.records || []}
+        columns={columns}
+        pagination={{ total: data?.total }}
+        key={'createDate'}
+        onChange={handleTableChange}
+      ></Table>
+    </Card>
+  );
+};
+export default detailData;

src/pages/statistics/building/detailData/index.jsx

@@ -1,6 +1,7 @@
 import React, { Component, useState, useEffect } from 'react';
 import { Card, Row, Col, Statistic, Table, Button } from 'antd';
 // import IndexEcharts from './components/indexEcharts';
+import router from 'umi/router';
 import moment from 'moment';
 import request from '@/utils/request';
 import apis from '@/services/apis';
@@ -9,51 +10,7 @@ import BuildSelect from '@/components/SelectButton/BuildSelect';
 import TimeSelect from '../../compents/TimeSelect';
 // import StatsChart from './component/StatsChart';
 import AuthButton from '@/components/AuthButton';
-const columns = [
-  {
-    title: '项目名称',
-    dataIndex: 'buildingName',
-    key: 'buildingName',
-  },
-  {
-    title: '新增客户',
-    dataIndex: 'khNum',
-    key: 'kh_num',
-    sorter: true,
-  },
-  {
-    title: '公客',
-    dataIndex: 'gkNum',
-    key: 'gk_num',
-    sorter: true,
-  },
-  {
-    title: '私客',
-    dataIndex: 'skNum',
-    key: 'sk_num',
-    sorter: true,
-  },
-  {
-    title: '访问人数',
-    dataIndex: 'uvNum',
-    key: 'uv_num',
-    sorter: true,
-  },
-  {
-    title: '访问次数',
-    dataIndex: 'pvNum',
-    key: 'pv_num',
-    sorter: true,
-  },
-  {
-    title: '详情',
-    render: (_, record) => (
-      <Button type="link" onClick={() => this.toDetailPage(record)}>
-        查看详情
-      </Button>
-    ),
-  },
-];
+
 
 const detailData = props => {
   const [buildingId, setBuildingId] = useState('');
@@ -119,6 +76,64 @@ const detailData = props => {
       })
       .catch(() => {});
   };
+  //去详情页面
+ const toDetailPage = (record) => {
+    router.push({
+      pathname: '/statistics/building/detail',
+      query: {
+        buildingId: record.buildingId,
+        buildingName: record.buildingName
+      },
+    });
+  }
+
+  const columns = [
+    {
+      title: '项目名称',
+      dataIndex: 'buildingName',
+      key: 'buildingName',
+    },
+    {
+      title: '新增客户',
+      dataIndex: 'khNum',
+      key: 'kh_num',
+      sorter: true,
+    },
+    {
+      title: '公客',
+      dataIndex: 'gkNum',
+      key: 'gk_num',
+      sorter: true,
+    },
+    {
+      title: '私客',
+      dataIndex: 'skNum',
+      key: 'sk_num',
+      sorter: true,
+    },
+    {
+      title: '访问人数',
+      dataIndex: 'uvNum',
+      key: 'uv_num',
+      sorter: true,
+    },
+
+    {
+      title: '成交量',
+      dataIndex: 'cjNum',
+      key: 'cj_num',
+      sorter: true,
+    },
+
+    {
+      title: '详情',
+      render: (_, record) => (
+        <Button type="link" onClick={() => toDetailPage(record)}>
+          查看详情
+        </Button>
+      ),
+    },
+  ];
 
   return (
     <Card

src/pages/statistics/dataReport/components/UserActive.jsx

@@ -84,22 +84,6 @@ const UserSource = props => {
           </Select>
         }
       >
-        {/* <div >
-        <p><span style={{fontSize:'0.12rem',fontWeight:'600'}}>用户活跃数</span></p>
-
-          <Select
-            showSearch
-            style={{ width: 100 }}
-            placeholder="日活跃"
-            optionFilterProp="children"
-            onChange={onChange}
-          >
-            <Option value="day">日活跃</Option>
-            <Option value="month">月活跃</Option>
-
-          </Select>
-        
-       </div> */}
 
         <EChart options={options} style={piestyles} />
       </Card>

src/pages/statistics/dataReport/components/UserBehavior.jsx

@@ -52,7 +52,7 @@ const formatDate = (start, end) => {
 const UserBehaviorIndex = props => {
   const {
     startDate = moment()
-      .subtract(60, 'day')
+      .subtract(7,'day')
       .format('YYYY-MM-DD'),
     endDate = moment().format('YYYY-MM-DD'),
   } = props;