Merge branch 'statistics' into master

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,14 +606,21 @@ 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: '/statistics/dataRepor',
+              },
+              {
+                path: '/statistics/dataReport/newAdd',
+                name: '新增用户',
+                hideInMenu: true,
+                component: './statistics/dataReport/newAdd',
+                menuCode: '/statistics/dataRepor',
               },
               {
                 path: '/statistics/activity',
@@ -622,6 +628,69 @@ export default [
                 component: './statistics/activity',
                 menuCode: '/statistics/activity',
               },
+              {
+                path: '/statistics/activity/sharePersonNum',
+                name: '分享人数',
+                hideInMenu: true,
+                component: './statistics/activity/sharePersonNum',
+                menuCode: '/statistics/activity',
+              },
+              {
+                path: '/statistics/activity/shareNum',
+                name: '分享次数',
+                hideInMenu: true,
+                component: './statistics/activity/shareNum',
+                menuCode: '/statistics/activity',
+              },
+              {
+                path: '/statistics/activity/visitPersonNum',
+                name: '访问人数',
+                hideInMenu: true,
+                component: './statistics/activity/visitPersonNum',
+                menuCode: '/statistics/activity',
+              },
+              {
+                path: '/statistics/activity/visitNum',
+                name: '访问次数',
+                hideInMenu: true,
+                component: './statistics/activity/visitNum',
+                menuCode: '/statistics/activity',
+              },
+              {
+                path: '/statistics/activity/addRegistNum',
+                name: '新增注册用户',
+                hideInMenu: true,
+                component: './statistics/activity/addRegistNum',
+                menuCode: '/statistics/activity',
+              },
+              {
+                path: '/statistics/activity/detail',
+                name: '查看',
+                hideInMenu: true,
+                component: './statistics/activity/detail',
+                menuCode: '/statistics/activity',
+              },
+              
+              {
+                path: '/statistics/building',
+                name: '项目统计',
+                component: './statistics/building',
+                menuCode: '/statistics/building',
+              },
+              {
+                path: '/statistics/building/detail',
+                name: '项目统计',
+                hideInMenu: true,
+                component: './statistics/building/detail',
+                menuCode: '/statistics/building',
+              },
+
+              {
+                path: '/statistics/consultant',
+                name: 'KPI',
+                component: './statistics/consultant',
+                menuCode: '/statistics/consultant',
+              },
             ],
           },
           {

src/components/SelectButton/BuildSelect.jsx

@@ -52,6 +52,7 @@ const BuildingSelect = props => {
       style={{ width: '300px' }}
       placeholder="请选择项目"
       onChange={props.onChange}
+      allowClear={props.allowClear||false}
       filterOption={(input, option) =>
         option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
       }>

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

@@ -0,0 +1,105 @@
+import React, { Component, useState, useEffect, useRef } from 'react';
+import { Card, Row, Col, Statistic, Icon, Tabs, Form, Select, Button, Input } 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 ActivityCount from '../compents/activityCount';
+import NewUsers from '../compents/NewUsers';
+import OverviewDeatil from '../compents/OverviewDeatil';
+import ContentTable from '../compents/ContentTable';
+// 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 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({
+        ...values,
+        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;
+  console.log(timeValue, 'timeValue');
+  return (
+    <div>
+      <Form layout="inline" onSubmit={handleSubmit}>
+        <Form.Item>
+          <TimeSelect onChange={onTimeChange} ref={timeRef}></TimeSelect>
+        </Form.Item>
+        <Form.Item>{getFieldDecorator('buildingId')(<BuildingSelect allowClear />)}</Form.Item>
+        <Form.Item>
+          {getFieldDecorator('targetType')(
+            <Select placeholder="活动类型" allowClear style={{ width: 150, marginLeft: '20px' }}>
+              <Option value="dymic">报名</Option>
+              <Option value="look">带看</Option>
+              <Option value="house">团房</Option>
+              <Option value="live">直播</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('activityName')(<Input placeholder="请输入活动名称" />)}
+        </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' }}>
+        <ContentTable params={serachData}></ContentTable>
+      </div>
+    </div>
+  );
+};
+
+const WrappedTypeForm = Form.create()(activityOverView);
+export default WrappedTypeForm;

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

@@ -0,0 +1,110 @@
+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 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 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({
+        ...values,
+        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>{getFieldDecorator('buildingId')(<BuildingSelect allowClear />)}</Form.Item>
+        <Form.Item>
+          {getFieldDecorator('targetType')(
+            <Select placeholder="活动类型" allowClear style={{ width: 150, marginLeft: '20px' }}>
+              <Option value="dymic">报名</Option>
+              <Option value="look">带看</Option>
+              <Option value="house">团房</Option>
+              <Option value="live">直播</Option>
+            </Select>,
+          )}
+        </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' }}>
+        <ActivityCount params={serachData}></ActivityCount>
+      </div>
+      <div style={{ marginTop: '20px' }}>
+        <NewUsers params={serachData} dataZoom={false}></NewUsers>
+      </div>
+      <div style={{ marginTop: '20px' }}>
+        <OverviewDeatil params={serachData} ></OverviewDeatil>
+      </div>
+    </div>
+  );
+};
+
+const WrappedTypeForm = Form.create()(activityOverView);
+export default WrappedTypeForm;

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';
+    }
+
+    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/ContentTable.jsx

@@ -0,0 +1,289 @@
+import React, { Component, useState, useEffect } from 'react';
+import { Card, Table, Button } from 'antd';
+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 Navigate from '@/components/Navigate';
+import AuthButton from '@/components/AuthButton';
+const ContentTable = props => {
+  const { params } = props;
+  const [data, setData] = useState({ records: [] });
+  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 };
+  };
+
+  useEffect(() => {
+    getTableList({
+      ...params,
+    });
+  }, [params]);
+
+  function getTableList(params) {
+    request({
+      ...apis.activityDataStatis.activityDetailTableData,
+      params: {
+        ...params,
+      },
+    })
+      .then(data => {
+        console.log(data);
+        setData(data);
+        // this.setState({ tableData: data.records, total: data.total });
+      })
+      .catch();
+  }
+
+  const toSharePersonNum = rowData => () => {
+    // const startDate = moment().subtract(dateType, 'day').toDate()
+    // const endDate = new Date()
+
+    if (rowData) {
+      router.push({
+        pathname: '/statistics/activity/sharePersonNum',
+        query: {
+          startDate: params.startDate,
+          endDate: params.endDate,
+          activityId: rowData.activityId,
+          activityType: rowData.activityType,
+          activityName: rowData.activityName,
+        },
+      });
+      return;
+    }
+  };
+
+  const toShareNum = rowData => () => {
+    // const startDate = moment().subtract(dateType, 'day').toDate()
+    // const endDate = new Date()
+    if (rowData) {
+      router.push({
+        pathname: '/statistics/activity/shareNum',
+        query: {
+          startDate: params.startDate,
+          endDate: params.endDate,
+          activityId: rowData.activityId,
+          activityType: rowData.activityType,
+          activityName: rowData.activityName,
+        },
+      });
+      return;
+    }
+  };
+
+  const toAddRegistNum = rowData => () => {
+    // const startDate = moment().subtract(dateType, 'day').toDate()
+    // const endDate = new Date()
+    // console.log(rowData, 'rowData')
+    if (rowData) {
+      router.push({
+        pathname: '/statistics/activity/addRegistNum',
+        query: {
+          startDate: params.startDate,
+          endDate: params.endDate,
+          activityId: rowData.activityId,
+          activityType: rowData.activityType,
+          activityName: rowData.activityName,
+        },
+      });
+      return;
+    }
+  };
+
+  const toAddVisitPersonNum = rowData => () => {
+    if (rowData) {
+      router.push({
+        pathname: '/statistics/activity/visitPersonNum',
+        query: {
+          startDate: params.startDate,
+          endDate: params.endDate,
+          activityId: rowData.activityId,
+          activityType: rowData.activityType,
+          activityName: rowData.activityName,
+        },
+      });
+      return;
+    }
+  };
+
+  const toAddVisitNum = rowData => () => {
+    if (rowData) {
+      router.push({
+        pathname: '/statistics/activity/visitNum',
+        query: {
+          startDate: params.startDate,
+          endDate: params.endDate,
+          activityId: rowData.activityId,
+          activityType: rowData.activityType,
+          activityName: rowData.activityName,
+        },
+      });
+      return;
+    }
+  };
+
+  const toDetail = rowData => {
+    if (rowData) {
+      router.push({
+        pathname: '/statistics/activity/detail',
+        query: {
+          startDate: params.startDate,
+          endDate: params.endDate,
+          targetId: rowData.activityId,
+          targetType: rowData.activityType,
+          targetName: rowData.activityName,
+          buildingId: '',
+        },
+      });
+  
+      return
+    }
+  }
+
+  let columns = [
+    {
+      title: '活动类型',
+      dataIndex: 'activityType',
+      key: 'activityType',
+      render: (text, records) => {
+        if (records.activityType === 'live') {
+          return '直播活动';
+        }
+        if (records.activityType === 'look') {
+          return '一键带看';
+        }
+        if (records.activityType === 'house') {
+          return '团房活动';
+        }
+        if (records.activityType === 'dymic') {
+          return '报名活动';
+        }
+      },
+    },
+    {
+      title: '活动名称',
+      dataIndex: 'activityName',
+      key: 'activityName',
+    },
+    {
+      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>
+        // <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>
+      ),
+    },
+    {
+      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: '详情',
+      align: 'center',
+      render: (text, record) => (
+        <a style={{ color: '#FF4A4A' }} onClick={() => toDetail(record)}>
+          查看
+        </a>
+      ),
+    },
+  ];
+
+  // const toAddVisitNum = record => {
+  //   router.push({
+  //     pathname: '/activity/SignupActivity/registrationRecord',
+  //     query: {
+  //       dynamicId: record.dynamicId,
+  //     },
+  //   });
+  // };
+
+  //排序
+  const handleTableChange = (pagination, filters, sorter) => {
+
+    getTableList({
+      ...params,
+      pageNum: pagination.current,
+      pageSize: pagination.pageSize,
+      sort: sorter.order,
+      colKey: sorter.columnKey
+    });
+  };
+
+  const exportActivityStats = () => {
+    request({ ...apis.activityDataStatis.activityDetailTableDataExport, params: params })
+      .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();
+  };
+  return (
+    <Card>
+      <div style={{ textAlign: 'right' }}>
+        <AuthButton name="admin.staisttics.activity.export" noRight={null}>
+          <Button
+            type="primary"
+            style={{ float: 'right', margin: '20px 0', zIndex: 1 }}
+            onClick={exportActivityStats}
+          >
+            导出
+          </Button>
+        </AuthButton>
+      </div>
+
+      <Table
+        columns={columns}
+        dataSource={data?.records}
+        key="dynamicId"
+        pagination={{ current: data?.current, pageSize: 10, total: data?.total }}
+        onChange={handleTableChange}
+      ></Table>
+    </Card>
+  );
+};
+
+export default ContentTable;

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

@@ -0,0 +1,128 @@
+import React, { Component, useState, useEffect } from 'react';
+import {Card} from 'antd'
+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';
+
+const NewUsers = props => {
+  const { params } = props;
+  const [data, setData] = useState({ records: [] });
+  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 };
+  };
+
+  useEffect(() => {
+    NewsUserCount({
+      ...params,
+      ...formatDate(params.startDate, params.endDate),
+    });
+  }, [params]);
+
+  function NewsUserCount(params) {
+    request({
+      ...apis.activityDataStatis.selectAllActivityUser,
+      params: { ...params },
+    }).then(data => {
+      setData(data);
+    });
+  }
+
+  const dataZoom = props.dataZoom
+    ? [
+        {
+          type: 'inside',
+          start: 0,
+          end: 100,
+        },
+        {
+          type: 'slider',
+          start: 0,
+          end: 100,
+        },
+      ]
+    : undefined;
+  const dataset = data.selectAllActivityUser || [];
+  const options = {
+    color: [
+      'rgba(241,43,62,1)',
+      'rgba(254,146,156,1)',
+      'rgba(100,124,225,1)',
+      'rgba(162,185,255,1)',
+      'rgba(255,132,79,1)',
+    ],
+    tooltip: {
+      trigger: 'axis',
+    },
+    icon: 'rect',
+    legend: {
+      data: ['访问人数', '访问次数', '新增注册用户', '分享人数', '分享次数'],
+    },
+    toolbox: {},
+    xAxis: {
+      type: 'category',
+    },
+    yAxis: {},
+    dataZoom,
+    series: [
+      {
+        name: '访问人数',
+        type: 'line',
+        smooth: true,
+      },
+      {
+        name: '访问次数',
+        type: 'line',
+        smooth: true,
+      },
+      {
+        name: '新增注册用户',
+        type: 'line',
+        smooth: true,
+      },
+      {
+        name: '分享人数',
+        type: 'line',
+        smooth: true,
+      },
+      {
+        name: '分享次数',
+        type: 'line',
+        smooth: true,
+      },
+    ],
+    dataset: {
+      dimensions: [
+        'date',
+        'visitPersonCount',
+        'visitCount',
+        'addregistCount',
+        'sharePersonCount',
+        'shareCount',
+      ],
+      source: dataset,
+    },
+  };
+
+  const piestyles = {
+    width: '100%',
+    height: '400px',
+  };
+
+  return (
+    <Card title="活动趋势图" headStyle={{ textAlign: 'left' }}>
+      <EChart options={options} />
+    </Card>
+    // <>
+    //   <div ><p><span style={{fontSize:'0.12rem',fontWeight:'600'}}>活动趋势图</span></p></div>
+    //   <div style={{marginTop:'30px'}}>
+
+    //   </div>
+    // </>
+  );
+};
+
+export default NewUsers;

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

@@ -0,0 +1,204 @@
+import React, { Component, useState, useEffect } from 'react';
+import { Card, Table, Button } from 'antd';
+import Navigate from '@/components/Navigate';
+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';
+
+const NewUsers = props => {
+  const { params } = props;
+  const [data, setData] = useState({ records: [] });
+
+  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 toShareNum = rowData => () => {
+    if (rowData) {
+      router.push({
+        pathname: '/statistics/activity/shareNum',
+        query: {
+          queryDate: rowData.date,
+          buildingId: params.buildingId || undefined,
+          activityType: params.activityType || undefined,
+        },
+      });
+      return;
+    }
+  };
+
+  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();
+  }, [params]);
+
+  const getTableList = payload => {
+    request({
+      ...apis.activityDataStatis.tableData,
+      params: { ...params, ...payload },
+    })
+      .then(res => {
+        setData(res);
+      })
+      .catch();
+  };
+
+  const exportActivityStats = () => {
+    request({ ...apis.activityDataStatis.tableDataExport, params: params })
+      .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 handleTableChange = (pagination, filters, sorter) => {
+    console.log(pagination, filters, sorter);
+    // Desc  和asc
+    const sortType =
+      sorter.order == 'ascend' ? 'asc' : sorter.order == 'descend' ? 'Desc' : undefined;
+    getTableList({
+      ...params,
+      pageNum: pagination.current,
+      pageSize: pagination.pageSize,
+      sortType: sortType,
+      sortField: sorter.columnKey,
+    });
+  };
+
+  return (
+    <Card title="详细数据" headStyle={{ textAlign: 'left' }}>
+      {/* <div style={{ textAlign: 'right' }}>
+        <Button type="primary" onClick={exportActivityStats}>
+          导出
+        </Button>
+      </div> */}
+
+      <Table
+        key="date"
+        dataSource={data?.records}
+        columns={columns}
+        pagination={{ total: data?.total, current: data?.current, pageSize: data?.size }}
+        onChange={handleTableChange}
+        scroll={{ y: 500 }}
+      ></Table>
+    </Card>
+  );
+};
+
+export default NewUsers;
+// pagination={{ total: this.state.total}} onChange={this.handleTableChange}

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

@@ -0,0 +1,102 @@
+import React, { Component, useState, useEffect } from 'react';
+import { Card, Row, Col, Statistic, Icon } 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';
+
+function getDayBegin(dt) {
+  return moment(dt, 'day').hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss')+'.000Z';
+}
+
+
+function getDayEnd(dt) {
+  return moment(dt, 'day').hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss')+'.999Z';
+}
+
+
+const Count = props => {
+  const {params} = props
+  const [data, setData] = useState([]);
+
+
+  const [checkData, setCheckData] = useState([]);
+
+  useEffect(() => {
+    getList()
+
+  }, [params]);
+
+ const getList =() => {
+
+console.log(params,'params')
+    request({
+      ...apis.activityDataStatis.total,
+      params: {
+        ...params,
+        // startDate: getDayBegin(params.startDate),
+        // endDate: getDayEnd(params.endDate),
+      }
+    }).then(res => {
+    setData(res)
+    }).catch(err => {
+
+    })
+  }
+
+//   function getBuildingReports() {
+//     request({ ...apis.system.taBuildingReports }).then(data => {
+//       console.log(
+//         (data.records || []).map(x => x.reportCode),
+//         '22222222222222222',
+//       );
+//       setCheckData((data.records || []).map(x => x.reportCode));
+//     });
+//   }
+
+  return (
+    <>
+      <Row gutter={16} style={{textAlign:'center'}}>
+        <Col span={6}>
+          <Card>
+            <Statistic
+              title="分享总次数"
+              value={data.shareNum || 0}
+              //   valueStyle={{ color: '#3f8600' }}
+            />
+          </Card>
+        </Col>
+        <Col span={6}>
+          <Card>
+            <Statistic
+              title="分享总人数"
+              value={data.sharePersonNum || 0}
+              //   valueStyle={{ color: '#cf1322' }}
+            />
+          </Card>
+        </Col>
+        <Col span={6}>
+          <Card>
+            <Statistic
+              title="访问总次数"
+              value={data.visitNum || 0}
+              //   valueStyle={{ color: '#3f8600' }}
+            />
+          </Card>
+        </Col>
+        <Col span={6}>
+          <Card >
+            <Statistic
+              title="访问总人数"
+              value={data.visitPersonNum || 0}
+              //   valueStyle={{ color: '#cf1322' }}
+            />
+          </Card>
+        </Col>
+      </Row>
+    </>
+  );
+};
+export default Count;

src/pages/statistics/activity/detail.jsx

@@ -0,0 +1,87 @@
+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 NewUsers from './compents/NewUsers';
+import OverviewDeatil from './compents/OverviewDeatil';
+
+const activityOverView = props => {
+  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',
+    ...props.location.query,
+  });
+  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({
+        ...values,
+        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' }}>
+        <NewUsers params={serachData} dataZoom={false}></NewUsers>
+      </div>
+      <div style={{ marginTop: '20px' }}>
+        <OverviewDeatil params={serachData}></OverviewDeatil>
+      </div>
+    </div>
+  );
+};
+
+const WrappedTypeForm = Form.create()(activityOverView);
+export default WrappedTypeForm;

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

@@ -0,0 +1,144 @@
+import React, { Component, useState, useEffect } from 'react';
+import { Card, Row, Col, Statistic, Icon, Table } 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 Count from './components/Count';
+// import SourceRole from './components/SourceRole';
+// import UserSex from './components/UserSex';
+// import UserConversion from './components/UserConversion';
+// import BuildingStatistic from './BuildingStatistic';
+
+const DataReport = props => {
+  const [data, setData] = useState({});
+  const [time, setTime] = useState();
+  const [buildingValue, setBuildingValue] = useState();
+
+  useEffect(() => {
+    if (time) {
+      getTableList({
+        buildingId:buildingValue,
+        startDate: moment(time[0]).format('YYYY-MM-DDT00:00:00.000') + 'Z',
+        endDate: moment(time[1]).format('YYYY-MM-DDT23:59:59.999') + 'Z',
+      });
+    }
+  }, [time,buildingValue]);
+
+  const columns = [
+    {
+      title: '活动名称',
+      dataIndex: 'title',
+      key: 'title',
+      // sorter: true,
+    },
+    {
+      title: '访问人数',
+      dataIndex: 'visitPersonNum',
+      key: 'visit_person_num',
+      width:'25%',
+      sorter: true,
+      render: (text)=>text||0
+    },
+    {
+      title: '访问次数',
+      dataIndex: 'visitNum',
+      key: 'visit_num',
+      width:'25%',
+      sorter: true,
+      render: (text)=>text||0
+    },
+    {
+      title: '报名人数',
+      dataIndex: 'signNum',
+      key: 'sign_num',
+      width:'25%',
+      sorter: true,
+      // render: (text)=>text||0
+        render: (text, record) => (
+          text? <Navigate onClick={()=>toAddVisitNum(record)}>{record.signNum}</Navigate>:0
+          // <a style={{ color: '#66B3FF' }} onClick={toAddVisitNum(record)}><span>{record.visitNum}</span></a>
+        ),
+    },
+  ];
+
+  const  toAddVisitNum = (record)=>{
+    router.push({
+      pathname: '/activity/SignupActivity/registrationRecord',
+      query: {
+        dynamicId:record.dynamicId
+      },
+    });
+  }
+
+  //排序
+  const handleTableChange = (pagination, filters, sorter) => {
+    console.log(pagination, filters, sorter);
+    // Desc  和asc
+    const sortType=  sorter.order=="ascend"?'asc':sorter.order=="descend"?'Desc':undefined
+    getTableList({
+      buildingId:buildingValue,
+      startDate: moment(time[0]).format('YYYY-MM-DDT00:00:00.000') + 'Z',
+      endDate: moment(time[1]).format('YYYY-MM-DDT23:59:59.999') + 'Z',
+      pageNum: pagination.current,
+      pageSize: pagination.pageSize,
+      sortType: sortType,
+      sortField: sorter.columnKey,
+    });
+    // const { formData } = this.state
+    // this.setState({
+    //   formData: {
+    //     ...formData,
+    //     startDate: formData.startDate,
+    //     endDate: formData.endDate,
+    //     buildingId: formData.buildingId,
+    //     targetType: formData.targetType,
+    //     pageNum: pagination.current,
+    //     pageSize: pagination.pageSize,
+    //     sort: sorter.order,
+    //     colKey: sorter.columnKey
+    //   }
+    // }, this.getTableList)
+  };
+
+  function getTableList(params) {
+    request({
+      ...apis.activityDataStatis.activityDetailTableData,
+      params: {
+        ...params,
+      },
+    })
+      .then(data => {
+        console.log(data);
+        setData(data);
+        // this.setState({ tableData: data.records, total: data.total });
+      })
+      .catch();
+  }
+
+  const onTimeChange = e => {
+    setTime(e);
+  };
+
+  return (
+    <Card
+      title={<BuildingSelect value={buildingValue} onChange={e => setBuildingValue(e)} all />}
+      headStyle={{ textAlign: 'left' }}
+      extra={<TimeSelect onChange={onTimeChange}></TimeSelect>}
+    >
+      <Table
+        columns={columns}
+        dataSource={data?.records}
+        key="dynamicId"
+        pagination={{current:data?.current, pageSize: 10, total: data?.total }}
+        onChange={handleTableChange}
+      ></Table>
+    </Card>
+  );
+};
+export default DataReport;

src/pages/statistics/activity/index.jsx

@@ -1,5 +1,5 @@
 import React, { Component, useState, useEffect } from 'react';
-import { Card, Row, Col, Statistic, Icon, Table } from 'antd';
+import { Card, Row, Col, Statistic, Icon, Modal, Tabs, Button } from 'antd';
 // import IndexEcharts from './components/indexEcharts';
 // import Swiper from './swiper/index';
 import moment from 'moment';
@@ -9,136 +9,79 @@ import apis from '@/services/apis';
 import TimeSelect from '../compents/TimeSelect';
 import BuildingSelect from '@/components/SelectButton/BuildSelect';
 import Navigate from '@/components/Navigate';
-// import Count from './components/Count';
-// import SourceRole from './components/SourceRole';
-// import UserSex from './components/UserSex';
-// import UserConversion from './components/UserConversion';
-// import BuildingStatistic from './BuildingStatistic';
+import ActivityOverview from './activityOverview';
+import ActivityContent from './activityContent';
 
-const DataReport = props => {
-  const [data, setData] = useState({});
-  const [time, setTime] = useState();
-  const [buildingValue, setBuildingValue] = useState();
 
-  useEffect(() => {
-    if (time) {
-      getTableList({
-        buildingId:buildingValue,
-        startDate: moment(time[0]).format('YYYY-MM-DDT00:00:00.000') + 'Z',
-        endDate: moment(time[1]).format('YYYY-MM-DDT23:59:59.999') + 'Z',
-      });
-    }
-  }, [time,buildingValue]);
+const { TabPane } = Tabs;
 
-  const columns = [
-    {
-      title: '活动名称',
-      dataIndex: 'title',
-      key: 'title',
-      // sorter: true,
-    },
-    {
-      title: '访问人数',
-      dataIndex: 'visitPersonNum',
-      key: 'visit_person_num',
-      width:'25%',
-      sorter: true,
-      render: (text)=>text||0
-    },
-    {
-      title: '访问次数',
-      dataIndex: 'visitNum',
-      key: 'visit_num',
-      width:'25%',
-      sorter: true,
-      render: (text)=>text||0
-    },
-    {
-      title: '报名人数',
-      dataIndex: 'signNum',
-      key: 'sign_num',
-      width:'25%',
-      sorter: true,
-      // render: (text)=>text||0
-        render: (text, record) => (
-          text? <Navigate onClick={()=>toAddVisitNum(record)}>{record.signNum}</Navigate>:0
-          // <a style={{ color: '#66B3FF' }} onClick={toAddVisitNum(record)}><span>{record.visitNum}</span></a>
-        ),
-    },
-  ];
+const activity = props => {
 
-  const  toAddVisitNum = (record)=>{
-    router.push({
-      pathname: '/activity/SignupActivity/registrationRecord',
-      query: {
-        dynamicId:record.dynamicId
-      },
-    });
-  }
+  const [helpVisible, setHelpVisible] = useState(false);
 
-  //排序
-  const handleTableChange = (pagination, filters, sorter) => {
-    console.log(pagination, filters, sorter);
-    // Desc  和asc
-    const sortType=  sorter.order=="ascend"?'asc':sorter.order=="descend"?'Desc':undefined
-    getTableList({
-      buildingId:buildingValue,
-      startDate: moment(time[0]).format('YYYY-MM-DDT00:00:00.000') + 'Z',
-      endDate: moment(time[1]).format('YYYY-MM-DDT23:59:59.999') + 'Z',
-      pageNum: pagination.current,
-      pageSize: pagination.pageSize,
-      sortType: sortType,
-      sortField: sorter.columnKey,
-    });
-    // const { formData } = this.state
-    // this.setState({
-    //   formData: {
-    //     ...formData,
-    //     startDate: formData.startDate,
-    //     endDate: formData.endDate,
-    //     buildingId: formData.buildingId,
-    //     targetType: formData.targetType,
-    //     pageNum: pagination.current,
-    //     pageSize: pagination.pageSize,
-    //     sort: sorter.order,
-    //     colKey: sorter.columnKey
-    //   }
-    // }, this.getTableList)
-  };
 
-  function getTableList(params) {
-    request({
-      ...apis.activityDataStatis.activityDetailTableData,
-      params: {
-        ...params,
-      },
-    })
-      .then(data => {
-        console.log(data);
-        setData(data);
-        // this.setState({ tableData: data.records, total: data.total });
-      })
-      .catch();
+  function callback(key) {
+    console.log(key);
   }
 
-  const onTimeChange = e => {
-    setTime(e);
-  };
-
   return (
-    <Card
-      title={<BuildingSelect value={buildingValue} onChange={e => setBuildingValue(e)} all />}
-      headStyle={{ textAlign: 'left' }}
-      extra={<TimeSelect onChange={onTimeChange}></TimeSelect>}
-    >
-      <Table
-        columns={columns}
-        dataSource={data?.records}
-        key="dynamicId"
-        pagination={{current:data?.current, pageSize: 10, total: data?.total }}
-        onChange={handleTableChange}
-      ></Table>
-    </Card>
+    <div>
+      <Tabs
+        onChange={callback}
+        type="card"
+        tabBarExtraContent={
+          <Button type="link" onClick={() => setHelpVisible(true)}>
+            指标说明
+          </Button>
+        }
+      >
+        <TabPane tab="统计总况" key="1">
+          <ActivityOverview></ActivityOverview>
+        </TabPane>
+        <TabPane tab="统计内容" key="2">
+          <ActivityContent></ActivityContent>
+        </TabPane>
+      </Tabs>
+
+      <Modal
+        title="指标说明"
+        visible={helpVisible}
+        onCancel={() => setHelpVisible(false)}
+        footer={null}
+      >
+        <Row>
+          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '4px' }}>分享人数：</p>
+          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>
+            分享小程序活动的总人数
+          </p>
+        </Row>
+        <Row>
+          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '4px' }}>分享次数：</p>
+          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>
+            触发小程序活动分享的总次数
+          </p>
+        </Row>
+        <Row>
+          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '4px' }}>新增注册用户：</p>
+          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>
+            通过分享的活动授权手机号的总人数
+          </p>
+        </Row>
+        <Row>
+          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '4px' }}>访问人数：</p>
+          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>
+            访问小程序活动的总人数
+          </p>
+        </Row>
+
+        <Row>
+          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '4px' }}>访问次数：</p>
+          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>
+            访问小程序活动的总次数
+          </p>
+        </Row>
+      </Modal>
+    </div>
   );
 };
-export default DataReport;
+export default activity;

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: '/statistics/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: '/statistics/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.statistics.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.statistics.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.statistics.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/StatsChart.jsx

@@ -0,0 +1,72 @@
+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 router from 'umi/router';
+
+class StatsChart extends React.Component {
+
+  constructor(props) {
+    super(props)
+    this.state = {}
+  }
+
+  render() {
+    const { data = [] } = this.props
+    const options = {
+      title: {
+        text: this.props.title,
+        subtext: this.props.subtext,
+      },
+      xAxis: {
+        type: 'category',
+        axisLabel: { rotate: 45 },
+        // data: data.buildingNameList || []
+      },
+      grid: {
+        bottom: '30%'
+      },
+      tooltip: {},
+      yAxis: {
+        type: 'value'
+      },
+      dataset: {
+        // 用 dimensions 指定了维度的顺序。直角坐标系中，
+        // 默认把第一个维度映射到 X 轴上，第二个维度映射到 Y 轴上。
+        // 如果不指定 dimensions，也可以通过指定 series.encode
+        // 完成映射，参见后文。
+        dimensions: ['buildingName', 'num' ],
+        source: data
+    },
+      series: {
+        type: 'bar',
+        name: this.props.title,
+        barWidth: 50,
+        // data: data.numList || [],
+        itemStyle: {
+          normal: {
+            barBorderRadius: [50, 50, 0, 0],
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+              offset: 0,
+              color: '#FFC6AA'
+            }, {
+              offset: 1,
+              color: '#FF7E48'
+            }]),
+            shadowColor: 'rgba(0, 0, 0, 0.4)',
+
+          }
+        }
+      }
+    }
+
+    return (
+      <>
+        <EChart options={options} style={{ width: '100%', height: '400px'}} />
+      </>
+    )
+  }
+}
+
+export default StatsChart

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

@@ -0,0 +1,110 @@
+import React, { Component, useState, useEffect } from 'react';
+import echarts from 'echarts/lib/echarts';
+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';
+
+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]);
+
+  function getData(params) {
+    request({
+        ...apis.stats.timeBarList,
+      params: {  ...params,buildingId },
+    }).then(data => {
+      setData(data);
+    });
+  }
+
+  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 (
+    <>
+      <Card
+        title={`趋势图：${buildingName}`}
+        headStyle={{ textAlign: 'left' }}
+
+      >
+
+        <EChart options={options}  />
+      </Card>
+    </>
+  );
+};
+
+export default UserSource;

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

@@ -0,0 +1,72 @@
+import React, { Component, useState, useEffect } from 'react';
+import { Card, Row, Col, Statistic, Icon, Button } from 'antd';
+// import IndexEcharts from './components/indexEcharts';
+import moment from 'moment';
+import request from '@/utils/request';
+import apis from '@/services/apis';
+import CitySelect from '@/components/SelectButton/CitySelect2';
+import TimeSelect from '../../compents/TimeSelect';
+import StatsChart from './component/StatsChart';
+
+const BuildingStatistic = props => {
+  const [cityId, setCityId] = useState('');
+  const [time, setTime] = useState();
+
+  const [data, setData] = useState({});
+  useEffect(() => {
+    if (time) {
+      getData({
+        cityId: cityId || undefined,
+        startDate: moment(time[0]).format('YYYY-MM-DDT00:00:00.000') + 'Z',
+        endDate: moment(time[1]).format('YYYY-MM-DDT23:59:59.999') + 'Z',
+      });
+    }
+  }, [cityId, time]);
+  const onTimeChange = e => {
+    console.log(e, 'onTimeChange');
+    setTime(e);
+    // getData({ startDate: e[0], endDate: e[1] });
+  };
+
+  const getData = params => {
+    request({
+      ...apis.stats.barList,
+      params: {
+        ...params,
+      },
+    }).then(data => {
+      setData(data);
+    });
+  };
+
+  return (
+    <Card
+      title={<CitySelect value={cityId} onChange={e => setCityId(e)} all />}
+      headStyle={{ textAlign: 'left' }}
+      extra={<TimeSelect onChange={onTimeChange}></TimeSelect>}
+    >
+      <div style={{ fontSize: '12px', color: '#ccc', marginBottom: '10px' }}>
+        最多显示6个项目，更多项目数据请在下方详细数据中搜索
+      </div>
+      <div>
+        <Row>
+          <Col span={12}>
+            <StatsChart title="项目公客排行" data={data.gkList} />
+          </Col>
+          <Col span={12}>
+            <StatsChart title="项目私客排行" data={data.skList} />
+          </Col>
+        </Row>
+        <Row>
+          <Col span={12}>
+            <StatsChart title="项目访问人数排行" subtext="项目详情访问情况" data={data.visitList} />
+          </Col>
+          <Col span={12}>
+            <StatsChart title="成交量排行" data={data.successList} />
+          </Col>
+        </Row>
+      </div>
+    </Card>
+  );
+};
+export default BuildingStatistic;

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

@@ -0,0 +1,161 @@
+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 CitySelect from '@/components/SelectButton/CitySelect2';
+import BuildSelect from '@/components/SelectButton/BuildSelect';
+import TimeSelect from '../../compents/TimeSelect';
+// import StatsChart from './component/StatsChart';
+import AuthButton from '@/components/AuthButton';
+
+
+const detailData = props => {
+  const [buildingId, setBuildingId] = useState('');
+  const [time, setTime] = useState();
+
+  const [data, setData] = useState({});
+  useEffect(() => {
+    if (time) {
+      getTableData({
+        buildingId: buildingId || undefined,
+        startDate: moment(time[0]).format('YYYY-MM-DDT00:00:00.000') + 'Z',
+        endDate: moment(time[1]).format('YYYY-MM-DDT23:59:59.999') + 'Z',
+      });
+    }
+  }, [buildingId, time]);
+  const onTimeChange = e => {
+    console.log(e, 'onTimeChange');
+    setTime(e);
+    // getData({ startDate: e[0], endDate: e[1] });
+  };
+  //获取表格数据
+  const getTableData = params => {
+    request({ ...apis.stats.tableList, params: { ...params } }).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({
+      buildingId: buildingId || undefined,
+      startDate: moment(time[0]).format('YYYY-MM-DDT00:00:00.000') + 'Z',
+      endDate: moment(time[1]).format('YYYY-MM-DDT23:59:59.999') + 'Z',
+      pageNum: pagination.current,
+      sortField: sorter.columnKey,
+      sortOrder: sorter.order,
+    });
+    // {current:pagination.current, sorter.columnKey, sorter.order})
+  };
+
+  //导出
+ const exportBuildingStats = () => {
+    request({
+      ...apis.stats.buildingExport,
+      params: {
+        buildingId: buildingId || undefined,
+        startDate: moment(time[0]).format('YYYY-MM-DDT00:00:00.000') + 'Z',
+        endDate: moment(time[1]).format('YYYY-MM-DDT23:59:59.999') + 'Z',
+      },
+    })
+      .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 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
+      title={<BuildSelect value={buildingId} onChange={e => setBuildingId(e)} all />}
+      headStyle={{ textAlign: 'left' }}
+      extra={<TimeSelect onChange={onTimeChange}></TimeSelect>}
+    >
+      {/* <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 }}
+        onChange={handleTableChange}
+        scroll={{ y: 500 }}
+      ></Table>
+    </Card>
+  );
+};
+export default detailData;

src/pages/statistics/building/index.jsx

@@ -0,0 +1,25 @@
+import React, { Component, useState, useEffect } from 'react';
+import { Card, Row, Col, Statistic, Icon } from 'antd';
+// import IndexEcharts from './components/indexEcharts';
+// import Swiper from './swiper/index';
+import router from 'umi/router';
+import request from '@/utils/request';
+import apis from '@/services/apis';
+import BuildingStatistic from './BuildingStatistic';
+import DetailData from './detailData';
+
+const building = props => {
+  const [data, setData] = useState([]);
+
+  return (
+    <>
+      <div style={{ marginBottom: '20px' }}>
+        <BuildingStatistic></BuildingStatistic>
+      </div>
+      <div style={{ marginBottom: '20px' }}>
+        <DetailData></DetailData>
+      </div>
+    </>
+  );
+};
+export default building;

src/pages/statistics/compents/TimeSelect.jsx

@@ -1,18 +1,29 @@
-import React, { Component, useState, useEffect } from 'react';
+import React, { Component, useState, useImperativeHandle,useEffect } from 'react';
 import { Card, Row, Col, Statistic, Icon, Button, DatePicker } from 'antd';
 import ButtonGroup from 'antd/lib/button/button-group';
 import moment from 'moment';
 
 const { RangePicker } = DatePicker;
-const TimeSelect = props => {
-  const { value, onChange=()=>{} } = props;
+
+const TimeSelect = React.forwardRef((props, ref) => {
+  const { value = 'week', onChange = () => {}, buttonType = 'link' } = props;
 
   const [rangePickerValue, setRangePickerValue] = useState();
   const [type, setType] = useState('week');
   //   const [rangePickerValue,setRangePickerValue] = useState()
-  useEffect(() => {
-    // setType('week');
-  }, []);
+
+  useImperativeHandle(ref, () => ({
+    reset: () => {
+      setType(value);
+    },
+    // getSearchData: searchData,
+  }));
+  // useEffect(() => {
+  //   // setType('week');
+  //   if (value == 'today' || value == 'week' || value == 'month') {
+  //     setType(value);
+  //   }
+  // }, [value]);
   useEffect(() => {
     console.log(type);
     if (type == 'today') {
@@ -47,22 +58,43 @@ const TimeSelect = props => {
   const selectDate = e => {};
 
   const handleRangePickerChange = e => {
+    setType('other');
     onChange(e);
   };
 
   return (
     <div style={{ display: 'flex' }}>
       <div>
-        <Button type='link' style={type==='today'?undefined:{color:'rgba(0,0,0,0.65)'}} onClick={() => setType('today')}>今日</Button>
-        <Button type='link' style={type==='week'?undefined:{color:'rgba(0,0,0,0.65)'}} onClick={() => setType('week')}>最近一周</Button>
-        <Button type='link' style={type==='month'?undefined:{color:'rgba(0,0,0,0.65)'}} onClick={() => setType('month')}>最近一月</Button>
+        <Button
+          type={buttonType}
+          style={type === 'today' ? undefined : { color: 'rgba(0,0,0,0.65)' }}
+          onClick={() => setType('today')}
+        >
+          今日
+        </Button>
+        <Button
+          type={buttonType}
+          style={type === 'week' ? undefined : { color: 'rgba(0,0,0,0.65)' }}
+          onClick={() => setType('week')}
+        >
+          最近一周
+        </Button>
+        <Button
+          type={buttonType}
+          style={type === 'month' ? undefined : { color: 'rgba(0,0,0,0.65)' }}
+          onClick={() => setType('month')}
+        >
+          最近一月
+        </Button>
+      </div>
+      <div>
+        <RangePicker
+          value={rangePickerValue}
+          onChange={handleRangePickerChange}
+          style={{ width: 256 }}
+        />
       </div>
-      <RangePicker
-        value={rangePickerValue}
-        onChange={handleRangePickerChange}
-        style={{ width: 256 }}
-      />
     </div>
   );
-};
+});
 export default TimeSelect;

src/pages/statistics/consultant/index.jsx

@@ -0,0 +1,317 @@
+import React, { Component, useState, useEffect } from 'react';
+import { Card, Row, Col, Button, Icon, Table } 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 Count from './components/Count';
+// import SourceRole from './components/SourceRole';
+// import UserSex from './components/UserSex';
+// import UserConversion from './components/UserConversion';
+// import BuildingStatistic from './BuildingStatistic';
+import AuthButton from '@/components/AuthButton';
+const clickCon = (val, record, type) => {
+  if (val == 0) {
+    return (
+      <>
+        <span>{val}</span>
+      </>
+    );
+  }
+  return (
+    <>
+      <span style={{ color: '#1D74D9', cursor: 'pointer' }} onClick={() => toDetail(record, type)}>
+        {val}
+      </span>
+    </>
+  );
+};
+
+const consultant = props => {
+  const [data, setData] = useState({});
+  const [totalRow, setTotalRow] = useState({});
+
+  const [time, setTime] = useState();
+  const [buildingValue, setBuildingValue] = useState();
+
+  useEffect(() => {
+    if (time) {
+      getList({
+        buildingId: buildingValue,
+        startDate: moment(time[0]).format('YYYY-MM-DDT00:00:00.000') + 'Z',
+        endDate: moment(time[1]).format('YYYY-MM-DDT23:59:59.999') + 'Z',
+      });
+    }
+  }, [time, buildingValue]);
+
+  // 查询列表
+  const getList = params => {
+    // updataLoading(true);
+
+    request({ ...apis.stats.consultantKPI, params: { ...params } })
+      .then(data => {
+        setData(data.paged);
+        setTotalRow(data.total);
+        // updataLoading(false);
+      })
+      .catch(err => {
+        // updataLoading(false);
+      });
+  };
+
+  const columns = [
+    {
+      title: '项目',
+      dataIndex: 'buildingName',
+      key: 'buildingName',
+      align: 'center',
+      render: (txt, _, index) => (index ? txt : <span>总计</span>),
+    },
+
+    {
+      title: '置业顾问名称',
+      dataIndex: 'userName',
+      key: 'userName',
+      align: 'center',
+    },
+    {
+      title: '置业顾问电话',
+      dataIndex: 'phone',
+      key: 'phone',
+      align: 'center',
+    },
+    {
+      title: '客户总计',
+      dataIndex: 'totalPersons',
+      key: 'totalPersons',
+      align: 'center',
+      sorter: true,
+
+      // render: (txt, record, index) =>
+      //   index ? clickCon(txt, record, 'totalPersons') : <strong>{txt}</strong>,
+    },
+    {
+      title: '新增客户',
+      dataIndex: 'newPersons',
+      key: 'newPersons',
+      align: 'center',
+      sorter: true,
+
+      // render: (txt, record, index) =>
+      //   index ? clickCon(txt, record, 'newPersons') : <strong>{txt}</strong>,
+    },
+    {
+      title: '分享次数',
+      dataIndex: 'shareNum',
+      key: 'shareNum',
+      align: 'center',
+      sorter: true,
+
+      // render: (txt, record, index) =>
+      //   index ? clickCon(txt, record, 'shareNum') : <strong>{txt}</strong>,
+    },
+    {
+      title: '分享访问人数',
+      dataIndex: 'visitPersons',
+      key: 'visitPersons',
+      align: 'center',
+      sorter: true,
+
+      // render: (txt, record, index) =>
+      //   index ? clickCon(txt, record, 'visitPersons') : <strong>{txt}</strong>,
+    },
+    // {
+    //   title: '分享访问次数',
+    //   dataIndex: 'visitNum',
+    //   key: 'visitNum',
+    //   align: 'center',
+    //   sorter: true,
+
+    //   render: (txt, record, index) =>
+    //     index ? clickCon(txt, record, 'visitNum') : <strong>{txt}</strong>,
+    // },
+
+    // {
+    //   title: '分享拓客',
+    //   dataIndex: 'sharePersons',
+    //   key: 'sharePersons',
+    //   align: 'center',
+    //   sorter: true,
+
+    //   render: (txt, record, index) =>
+    //     index ? clickCon(txt, record, 'sharePersons') : <strong>{txt}</strong>,
+    // },
+    // {
+    //   title: '主页访问人数',
+    //   dataIndex: 'homePagePersons',
+    //   key: 'homePagePersons',
+    //   align: 'center',
+    //   sorter: true,
+
+    //   render: (txt, record, index) =>
+    //     index ? clickCon(txt, record, 'homePagePersons') : <strong>{txt}</strong>,
+    // },
+    // {
+    //   title: '主页访问次数',
+    //   dataIndex: 'homePageNums',
+    //   key: 'homePageNums',
+    //   align: 'center',
+    //   sorter: true,
+
+    //   render: (txt, record, index) =>
+    //     index ? clickCon(txt, record, 'homePageNums') : <strong>{txt}</strong>,
+    // },
+    // {
+    //   title: '咨询数',
+    //   dataIndex: 'chatPersons',
+    //   key: 'chatPersons',
+    //   align: 'center',
+    //   sorter: true,
+
+    //   render: (txt, record, index) =>
+    //     index ? clickCon(txt, record, 'chatPersons') : <strong>{txt}</strong>,
+    // },
+    // {
+    //   title: '点赞数',
+    //   dataIndex: 'favorNum',
+    //   key: 'favorNum',
+    //   align: 'center',
+    //   sorter: true,
+
+    //   render: (txt, record, index) =>
+    //     index ? clickCon(txt, record, 'favorNum') : <strong>{txt}</strong>,
+    // },
+  ];
+
+  const toAddVisitNum = record => {
+    router.push({
+      pathname: '/activity/SignupActivity/registrationRecord',
+      query: {
+        dynamicId: record.dynamicId,
+      },
+    });
+  };
+
+  //排序
+  const handleChange = (pagination, filters, sorter) => {
+    console.log(pagination, filters, sorter);
+    // Desc  和asc
+    let sort = {};
+    if (sorter.order == 'ascend') {
+      sort.asc = sorter.columnKey;
+    } else if (sorter.order == 'descend') {
+      sort.desc = sorter.columnKey;
+    }
+
+    getList({
+      buildingId: buildingValue,
+      startDate: moment(time[0]).format('YYYY-MM-DDT00:00:00.000') + 'Z',
+      endDate: moment(time[1]).format('YYYY-MM-DDT23:59:59.999') + 'Z',
+      pageNum: pagination.current,
+      pageSize: pagination.pageSize,
+      ...sort,
+    });
+  };
+
+  function getTableList(params) {
+    request({
+      ...apis.activityDataStatis.activityDetailTableData,
+      params: {
+        ...params,
+      },
+    })
+      .then(data => {
+        console.log(data);
+        setData(data);
+        // this.setState({ tableData: data.records, total: data.total });
+      })
+      .catch();
+  }
+
+  const onTimeChange = e => {
+    setTime(e);
+  };
+
+  // 下载文档
+  function download(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', '置业顾问KPI.xlsx');
+    document.body.append(link);
+    link.click();
+  }
+  // 导出
+  function exportRecord() {
+    updataBtnloading(true);
+    request({
+      ...apis.stats.exportConsultantKPI,
+      responseType: 'blob',
+      params: {
+        buildingId: buildingValue,
+        startDate: moment(time[0]).format('YYYY-MM-DDT00:00:00.000') + 'Z',
+        endDate: moment(time[1]).format('YYYY-MM-DDT23:59:59.999') + 'Z',
+      },
+    })
+      .then(response => {
+        download(response);
+        updataBtnloading(false);
+      })
+      .catch(error => {
+        updataBtnloading(false);
+      });
+  }
+
+  const list = data.records;
+  const _list = list && list.length > 0 ? [totalRow, ...list] : [];
+  let row = 0;
+  return (
+    <Card
+      title={<BuildingSelect value={buildingValue} onChange={e => setBuildingValue(e)} all />}
+      headStyle={{ textAlign: 'left' }}
+      extra={<TimeSelect onChange={onTimeChange}></TimeSelect>}
+    >
+      {/* <div>
+        <AuthButton name="admin.statistical.consultant.export" noRight={null}>
+          <Button
+            type="primary"
+            onClick={exportRecord}
+            style={{ float: 'right', margin: '20px 23px 20px 0', zIndex: 1 }}
+          >
+            导出
+          </Button>
+        </AuthButton>
+      </div> */}
+      <Table
+        // rowKey={record => data?.current * data?.size + row++}
+        style={{ marginTop: '30px' }}
+        dataSource={_list}
+        // dataSource={data.records}
+        columns={columns}
+        pagination={{ current: data?.current, total: data?.total }}
+        onChange={handleChange}
+        // onChange={handleChange}
+        // loading={loading}
+      />
+      {/* <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination
+          showQuickJumper
+          defaultCurrent={1}
+          total={data.total}
+          onChange={changePageNum}
+          current={data.current}
+        />
+      </div> */}
+    </Card>
+  );
+};
+export default consultant;

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

@@ -9,12 +9,10 @@ import apis from '@/services/apis';
 const Count = props => {
   const [data, setData] = useState([]);
 
-
   const [checkData, setCheckData] = useState([]);
 
   useEffect(() => {
     getIndexEcharts();
-
   }, []);
 
   function getIndexEcharts(params) {
@@ -27,19 +25,19 @@ const Count = props => {
     });
   }
 
-//   function getBuildingReports() {
-//     request({ ...apis.system.taBuildingReports }).then(data => {
-//       console.log(
-//         (data.records || []).map(x => x.reportCode),
-//         '22222222222222222',
-//       );
-//       setCheckData((data.records || []).map(x => x.reportCode));
-//     });
-//   }
+  //   function getBuildingReports() {
+  //     request({ ...apis.system.taBuildingReports }).then(data => {
+  //       console.log(
+  //         (data.records || []).map(x => x.reportCode),
+  //         '22222222222222222',
+  //       );
+  //       setCheckData((data.records || []).map(x => x.reportCode));
+  //     });
+  //   }
 
   return (
     <>
-      <Row gutter={16} style={{textAlign:'center'}}>
+      <Row gutter={16} style={{ textAlign: 'center' }}>
         <Col span={4}>
           <Card>
             <Statistic
@@ -69,8 +67,10 @@ const Count = props => {
         </Col>
         <Col span={4}>
           <Card>
+            {/* onClick={()=>router.push('/statistics/dataReport/newAdd')} style={{cursor:'pointer'}} */}
             <Statistic
               title="今日新增用户"
+              // title={<u></u>}
               value={data.todayAddPersonNum || 0}
               //   valueStyle={{ color: '#cf1322' }}
             />

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

@@ -0,0 +1,148 @@
+import React, { Component, useMemo, useState, useEffect } from 'react';
+import {
+  Form,
+  Icon,
+  Input,
+  Button,
+  DatePicker,
+  Select,
+  Card,
+  Row,
+  Col,
+  Pagination,
+  Alert,
+  Table,
+  Avatar,
+  Radio,
+  Modal,
+  Descriptions,
+} from 'antd';
+import BuildingSelect from '@/components/SelectButton/BuildSelect';
+import { func } from 'prop-types';
+import request from '@/utils/request';
+import apis from '@/services/apis';
+// const { Option } = Select;
+
+const Layout = prop =>
+prop.simple ? (
+    prop.children
+  ) : (
+    <Card title="意向客户" headStyle={{ textAlign: 'left' }}>
+      {prop.children}
+    </Card>
+  );
+
+const UserBehavior = props => {
+  const { simple = false } = props;
+  const [data, setData] = useState({ records: [] });
+  const [buildingId, setBuildingId] = useState();
+
+  useEffect(() => {
+    IntentionUsers({ buildingId:buildingId,pageNum: 1, pageSize: 5 });
+    // getUserBehaviorProfile(formatDate(props.startDate, props.endDate))
+  }, [buildingId]);
+  function IntentionUsers(params) {
+    request({
+      ...apis.indexEcharts.intentionUsers,
+      params: { ...params },
+    }).then(data => {
+      console.log(data, 'datadata');
+      setData(data);
+    });
+  }
+
+  // 分页
+  function onChange(pageNum) {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    IntentionUsers({ pageNum: pageNum, pageSize: 5, buildingId });
+  }
+
+  const columns = [
+    {
+      title: '用户姓名',
+      dataIndex: 'personName',
+      key: 'personName',
+      width: '25%',
+    },
+    {
+      title: '手机号',
+      dataIndex: 'phone',
+      key: 'phone',
+      width: '25%',
+    },
+    {
+      title: '意向楼盘',
+      dataIndex: 'buildingName',
+      key: 'buildingName',
+      width: '25%',
+    },
+    {
+      title: '意向值',
+      dataIndex: 'intention',
+      key: 'intention',
+      width: '25%',
+    },
+  ];
+
+  function handleBuildingChange(e) {
+    console.log(e, '--eeeeww---');
+    // IntentionUsers({ pageNum: 1, pageSize: 5, buildingId: e });
+    setBuildingId(e);
+  }
+
+  //意向客户导出
+  function exportIntentionUsers() {
+    request({
+      ...apis.indexEcharts.exportIntentionUsers,
+      params: { 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();
+    });
+  }
+
+  return (
+    <Layout simple={simple}>
+      <div>
+        <Row>
+          <Col span={22}>
+            <BuildingSelect
+              value={buildingId}
+              // slot="action"
+              // value={buildingId}
+              onChange={e => handleBuildingChange(e)}
+            ></BuildingSelect>
+          </Col>
+          <Col span={2} style={{ textAlign: 'right' }}>
+            {/* <Button type="primary" onClick={exportIntentionUsers}>
+              导出
+            </Button> */}
+          </Col>
+        </Row>
+        <Table
+          rowKey="IntentionalCustomers"
+          dataSource={data.records}
+          columns={columns}
+          style={{ marginTop: '15px' }}
+          pagination={{
+            total: data.total,
+            defaultPageSize: 5,
+            current: data.current || 1,
+            onChange: e => onChange(e),
+          }}
+          scroll={{ y: 500 }}
+        />
+      </div>
+    </Layout>
+  );
+};
+
+export default UserBehavior;

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

@@ -0,0 +1,108 @@
+import React, { Component, useState, useEffect } from 'react';
+import echarts from 'echarts/lib/echarts';
+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, Button, Icon, Card } from 'antd';
+
+// import styles from '../styles.less'
+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 NewUsers = props => {
+  const {
+    startDate = moment()
+      .subtract(7, 'day')
+      .format('YYYY-MM-DD'),
+    endDate = moment().format('YYYY-MM-DD'),
+    simple = false,
+  } = props;
+  const [data, setData] = useState({ records: [] });
+
+  useEffect(() => {
+    NewsUserCount(formatDate(startDate, endDate));
+  }, [startDate, endDate]);
+
+  function NewsUserCount(params) {
+    request({
+      ...apis.indexEcharts.changeNewUser,
+      params,
+    }).then(data => {
+      setData(data);
+    });
+  }
+
+  const dataZoom = props.dataZoom
+    ? [
+        {
+          type: 'inside',
+          start: 0,
+          end: 100,
+        },
+        {
+          type: 'slider',
+          start: 0,
+          end: 100,
+        },
+      ]
+    : undefined;
+  const dataset = data || [];
+  const options = {
+    color: ['#FF814C', '#F02B3E'],
+    tooltip: {
+      trigger: 'axis',
+    },
+    icon: 'rect',
+    legend: {
+      data: ['新用户数', '授权注册'],
+    },
+    toolbox: {},
+    xAxis: {
+      type: 'category',
+    },
+    yAxis: {},
+    dataZoom,
+    series: [
+      {
+        name: '新用户数',
+        type: 'line',
+        smooth: true,
+      },
+      {
+        name: '授权注册',
+        type: 'line',
+        smooth: true,
+      },
+    ],
+    dataset: {
+      dimensions: ['createTime', 'fromNum', 'registeredNum'],
+      source: dataset,
+    },
+  };
+
+  const piestyles = {
+    width: '100%',
+    // height: '400px',
+  };
+
+  const Layout = prop =>
+    simple ? (
+      prop.children
+    ) : (
+      <Card title="新增用户" headStyle={{ textAlign: 'left' }}>
+        {prop.children}
+      </Card>
+    );
+
+  return (
+    <Layout>
+      <EChart options={options} style={piestyles} />
+    </Layout>
+  );
+};
+
+export default NewUsers;

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

@@ -0,0 +1,94 @@
+import React, { Component, useState, useEffect } from 'react';
+import echarts from 'echarts/lib/echarts';
+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';
+
+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 [data, setData] = useState({ records: [] });
+  //柱图
+
+  useEffect(() => {
+    UserActive({ dateType: 'day' });
+  }, []);
+
+  function UserActive(params) {
+    request({
+      ...apis.indexEcharts.userActive,
+      params: { pageSize: 9999, ...params },
+    }).then(data => {
+      setData(data);
+    });
+  }
+
+  const dataset = data.selectActiveUserCount || [];
+  const options = {
+    tooltip: {},
+    xAxis: { type: 'category' },
+    yAxis: {},
+    series: {
+      type: 'bar',
+      name: '活跃用户',
+      barWidth: 50,
+      data: dataset.map(x => [x.date, !x.activityCount ? 0 : x.activityCount]),
+      itemStyle: {
+        normal: {
+          barBorderRadius: [50, 50, 0, 0],
+          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+            {
+              offset: 0,
+              color: '#FD8A95',
+            },
+            {
+              offset: 1,
+              color: '#F13043',
+            },
+          ]),
+          shadowColor: 'rgba(0, 0, 0, 0.4)',
+        },
+      },
+    },
+  };
+
+  function onChange(value) {
+    UserActive({ dateType: value });
+  }
+
+  const piestyles = {
+    width: '100%',
+    height: '400px',
+  };
+
+  return (
+    <>
+      <Card
+        title="用户活跃"
+        headStyle={{ textAlign: 'left' }}
+        extra={
+          <Select
+            style={{ width: 100 }}
+            defaultValue='day'
+            onChange={onChange}
+            size={'small'}
+          >
+            <Option value="day">日活跃</Option>
+            <Option value="month">月活跃</Option>
+          </Select>
+        }
+      >
+
+        <EChart options={options} style={piestyles} />
+      </Card>
+    </>
+  );
+};
+
+export default UserSource;

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

@@ -0,0 +1,157 @@
+import React, { Component, useState, useEffect } from 'react';
+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 'echarts/lib/component/dataZoom';
+import { Table, Select, Row, Col, Menu, Dropdown, Button, Icon, message, Modal, Card } from 'antd';
+import BuildSelect from '@/components/SelectButton/BuildSelect';
+
+const { Option } = Select;
+
+const eventcolumns = [
+  {
+    title: '编号',
+    dataIndex: 'recordId',
+    key: 'recordId',
+    align: 'center',
+    width: '16%',
+  },
+  {
+    title: '访问时间',
+    dataIndex: 'visitTime',
+    key: 'visitTime',
+    align: 'center',
+    width: '18%',
+    render: (x, row) => (
+      <>
+        <span>{moment(row.visitTime).format('YYYY-MM-DD hh:mm:ss')}</span>
+      </>
+    ),
+  },
+  {
+    title: '离开时间',
+    dataIndex: 'leaveTime',
+    key: 'leaveTime',
+    align: 'center',
+    width: '18%',
+    render: (x, row) => (
+      <>
+        <span>{row.leaveTime && moment(row.leaveTime).format('YYYY-MM-DD hh:mm:ss')}</span>
+      </>
+    ),
+  },
+];
+
+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 UserBehaviorIndex = props => {
+  const {
+    startDate = moment()
+      .subtract(7,'day')
+      .format('YYYY-MM-DD'),
+    endDate = moment().format('YYYY-MM-DD'),
+  } = props;
+  const [data, setData] = useState({ records: [] });
+  const [visibleData, setVisibleData] = useState({ visible: false, row: {} });
+  const [buildingId, setBuildingId] = useState('');
+
+  // 柱图
+  useEffect(() => {
+    const date = formatDate(startDate, endDate);
+    getUserBehaviorSummary({
+      ...date,
+      activity: props.activity,
+      event: props.event,
+      eventType: props.eventType,
+      buildingId: props.buildingId,
+    });
+    // getUserBehaviorProfile(formatDate(props.startDate, props.endDate))
+  }, [startDate, endDate, props.activity, props.event, props.eventType, props.buildingId]);
+
+  const [recordList, setList] = useState([]);
+  function getUserBehaviorSummary(params) {
+    request({
+      ...apis.indexEcharts.userBehavior.tsUserBehavior,
+      params,
+    }).then(data => {
+      setData(data || {});
+      // setList((data.data.records || []).filter(e => e.activity !== '客户'))
+    });
+  }
+
+  const seriesMaker = (data.selectUserBehavior || [])
+    .filter(
+      e =>
+        e.activity !== '客户' &&
+        e.activity !== '首页' &&
+        e.activity !== 'H5' &&
+        e.activity !== '房源' &&
+        e.activity !== '其他'&&
+        e.activity !== '咨询'&&
+        e.activity !== '个人中心',
+    )
+    .reduce((series, item) => {
+      let { date, activityCount, activity } = item;
+      date = moment(date).format('YYYY-MM-DD');
+      if (!activityCount) activityCount = 0;
+
+      // 使用对象, 可以去重
+      series[`${activity}`] = (series[`${activity}`] || []).concat([[date, activityCount]]);
+
+      return series;
+    }, {});
+  console.log(seriesMaker, 'seriesMaker----');
+
+  const dataZoom = props.dataZoom
+    ? [
+        {
+          type: 'inside',
+          start: 0,
+          end: 100,
+        },
+        {
+          type: 'slider',
+          start: 0,
+          end: 100,
+        },
+      ]
+    : undefined;
+
+  const options = {
+    title: {},
+    icon: 'rect',
+    legend: {
+      show: true,
+      zlevel: 10,
+      itemGap: 100,
+    },
+    color: ['#F12B3E', '#FE929C', '#647CE1', '#A2B9FF', '#FF844F', '#FFBB9D'],
+    tooltip: {
+      trigger: 'axis',
+    },
+    xAxis: { type: 'category' },
+    yAxis: {},
+    dataZoom,
+    series: Object.keys(seriesMaker).map(x => ({
+      type: 'line',
+      smooth: true,
+      name: x,
+      data: seriesMaker[x],
+    })),
+  };
+
+  return (
+    <>
+      <Card title="用户行为" headStyle={{ textAlign: 'left' }}>
+        <EChart options={options} />
+      </Card>
+    </>
+  );
+};
+
+export default UserBehaviorIndex;

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

@@ -71,10 +71,10 @@ const UserSource = props => {
         show: false,
       },
       data: [
-        { name: '男', value: data.maleNum||0 },
+        { name: '男', value: data?.maleNum||0 },
         {
           name: '女',
-          value: data.femaleNum||0,
+          value: data?.femaleNum||0,
         },
       ],
     },

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

@@ -0,0 +1,126 @@
+import React, { Component, useState, useEffect } from 'react';
+import echarts from 'echarts/lib/echarts';
+import { Card } from 'antd';
+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';
+
+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 { startDate = moment().subtract(7, 'day').format('YYYY-MM-DD'), endDate = moment().format('YYYY-MM-DD') } = props;
+  const [xData, setxData] = useState([]);
+  const [fromData, setFromData] = useState([]);
+  const [registerData, setRegisterData] = useState([]);
+  //柱图
+  useEffect(() => {
+    userResource(formatDate(startDate, endDate));
+  }, []);
+
+  function userResource(params) {
+    request({
+      ...apis.indexEcharts.selectPersonFrom,
+      params,
+    }).then(data => {
+
+      setxData(data.tdWxDicts.map(x => x.sceneAlias));
+      setFromData(data.tdWxDicts.map(x => x.fromData));
+      setRegisterData(data.tdWxDicts.map(x => x.registerSum));
+      // props.onSuccess(data)
+    });
+  }
+
+  const subtitle = '最近7天';
+  const baroptions = {
+    title: {},
+    xAxis: {
+      type: 'category',
+      data: xData,
+      axisLabel: { rotate: 45 },
+    },
+    legend: {
+      left: '20%',
+      data: ['所有用户', '注册用户'],
+    },
+
+    tooltip: {},
+
+    yAxis: {},
+    series: [
+      {
+        type: 'bar',
+        name: '所有用户',
+        datasetIndex: 0,
+        barWidth: 20,
+        data: fromData,
+        itemStyle: {
+          normal: {
+            barBorderRadius: [20, 20, 0, 0],
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#FFC4A8',
+              },
+              {
+                offset: 1,
+                color: '#FF7E49',
+              },
+            ]),
+            shadowColor: 'rgba(0, 0, 0, 0.4)',
+          },
+        },
+      },
+      {
+        type: 'bar',
+        name: '注册用户',
+        barWidth: 20,
+        data: registerData,
+        itemStyle: {
+          normal: {
+            barBorderRadius: [20, 20, 0, 0],
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#FE939D',
+              },
+              {
+                offset: 1,
+                color: '#F0293C',
+              },
+            ]),
+            shadowColor: 'rgba(0, 0, 0, 0.4)',
+          },
+        },
+      },
+    ],
+    // dataset: {
+    //   id: 'bar',
+    //   dimensions: ['fromName', 'userCount', 'registered'],
+    //   source: source,
+    // },
+  };
+
+  const barstyle = {
+    width: '100%',
+    // height: '480px',
+    // minWidth: '400px'
+  };
+
+  return (
+    <>
+      <Card title="用户来源" headStyle={{ textAlign: 'left' }}>
+        {/* <p onClick={()=>router.push('/statistical/userSource')}><span style={{borderBottom:'1px solid #f02d40',cursor: 'pointer',color:'#333',fontSize:'0.12rem',fontWeight:'600'}}>用户来源</span> {!props.BuildSelectHide && <span style={{ fontSize: '0.09rem', color: '#888', marginLeft: '0.06rem' }}>最近七天</span>}</p> */}
+
+        <EChart options={baroptions} style={barstyle} />
+      </Card>
+    </>
+  );
+};
+
+export default UserSource;

src/pages/statistics/dataReport/index.jsx

@@ -7,10 +7,17 @@ import request from '@/utils/request';
 import apis from '@/services/apis';
 import Count from './components/Count';
 import SourceRole from './components/SourceRole';
+import UserSource from './components/UserSource';
+import UserBehavior from './components/UserBehavior';
+import UserActive from './components/UserActive';
+
 import UserSex from './components/UserSex';
 import UserConversion from './components/UserConversion';
+import NewUsers from './components/NewUsers';
+
 import BuildingStatistic from './BuildingStatistic';
 import CityNums from './CityNums';
+import IntentionalCustomers from './components/IntentionalCustomers';
 
 const DataReport = props => {
   const [data, setData] = useState([]);
@@ -20,25 +27,49 @@ const DataReport = props => {
       <div style={{ marginBottom: '20px' }}>
         <Count></Count>
       </div>
+      <div style={{ marginBottom: '20px' }}>
+        <Row gutter={16} style={{ textAlign: 'center' }}>
+          <Col span={16}>
+            <UserSource></UserSource>
+          </Col>
+          <Col span={8}>
+            <SourceRole></SourceRole>
+          </Col>
+        </Row>
+      </div>
       <div style={{ marginBottom: '20px' }}>
         <CityNums></CityNums>
       </div>
+      <div style={{ marginBottom: '20px' }}>
+        <UserBehavior></UserBehavior>
+      </div>
       <div style={{ marginBottom: '20px' }}>
         <Row gutter={16} style={{ textAlign: 'center' }}>
-          <Col span={8}>
-            <SourceRole></SourceRole>
+          <Col span={16}>
+            <UserActive></UserActive>
           </Col>
           <Col span={8}>
             <UserSex></UserSex>
           </Col>
+        </Row>
+      </div>
+      <div style={{ marginBottom: '20px' }}>
+        <Row gutter={16} style={{ textAlign: 'center' }}>
+          <Col span={16}>
+            <NewUsers></NewUsers>
+          </Col>
           <Col span={8}>
             <UserConversion></UserConversion>
           </Col>
         </Row>
       </div>
-      <div style={{ marginBottom: '20px' }}>
-        <BuildingStatistic></BuildingStatistic>
+       <div style={{ marginBottom: '20px' }}>
+        <IntentionalCustomers></IntentionalCustomers>
       </div>
+      
+      {/* <div style={{ marginBottom: '20px' }}>
+        <BuildingStatistic></BuildingStatistic>
+      </div> */}
     </>
   );
 };

src/pages/statistics/dataReport/newAdd.jsx

@@ -0,0 +1,37 @@
+import React, { Component, useState, useEffect } from 'react';
+import { Card, Row, Col, Statistic, Icon } from 'antd';
+// import IndexEcharts from './components/indexEcharts';
+// import Swiper from './swiper/index';
+import router from 'umi/router';
+import request from '@/utils/request';
+import apis from '@/services/apis';
+import Count from './components/Count';
+import SourceRole from './components/SourceRole';
+import UserSource from './components/UserSource';
+import UserBehavior from './components/UserBehavior';
+import UserActive from './components/UserActive';
+
+import UserSex from './components/UserSex';
+import UserConversion from './components/UserConversion';
+import NewUsers from './components/NewUsers';
+
+import BuildingStatistic from './BuildingStatistic';
+import CityNums from './CityNums';
+import TimeSelect from '../compents/TimeSelect';
+import IntentionalCustomers from './components/IntentionalCustomers';
+const newAdd = props => {
+  const [data, setData] = useState([]);
+
+  const onTimeChange=()=>{
+
+  }
+
+  return (
+    <Card>
+      <TimeSelect onChange={onTimeChange}  ></TimeSelect>
+      <NewUsers simple={true}></NewUsers>
+      <IntentionalCustomers  simple={true}></IntentionalCustomers>
+    </Card>
+  );
+};
+export default newAdd;

src/services/apis.js

@@ -1997,7 +1997,7 @@ export default {
     },
     activityDetailTableData: {
       method: 'GET',
-      url: `${prefix}/statistics/activityList`,
+      url: `${prefix}/activityStatistical/activityStatisDetail`,
       action: 'admin.contract.list.get',
     },
     activityDetailTableDataExport: {