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

config/routes.js

@@ -21,13 +21,22 @@ export default [
         routes: [
           {
             path: '/',
-            redirect: '/welcome',
+            redirect: '/index',
           },
           {
-            path: '/welcome',
+            path: '/index',
             name: '首页',
-            component: './Welcome',
+            component: './Index',
           },
+          // {
+          //   path: '/',
+          //   redirect: '/welcome',
+          // },
+          // {
+          //   path: '/welcome',
+          //   name: '首页',
+          //   component: './Welcome',
+          // },
           {
             path: '/indexEcharts',
             name: '图表管理',
@@ -353,13 +362,13 @@ export default [
               },
               {
                 path: '/activity/liveActivity/add',
-                name: '新增', 
+                name: '新增',
                 hideInMenu: true,
                 component: './activity/liveActivity/add',
               },
               {
                 path: '/activity/liveActivity/edit',
-                name: '编辑', 
+                name: '编辑',
                 hideInMenu: true,
                 component: './activity/liveActivity/edit',
               },
@@ -573,6 +582,36 @@ export default [
                 name: '置业顾问KPI',
                 component: './statistical/consultant/index',
               },
+              {
+                path: '/statistical/consultant/table',
+                name: '拓客统计',
+                hideInMenu: true,
+                component: './statistical/consultant/table',
+              },
+              {
+                path: '/statistical/consultant/sharetable',
+                name: '分享统计',
+                hideInMenu: true,
+                component: './statistical/consultant/sharetable',
+              },
+              {
+                path: '/statistical/consultant/visitPersons',
+                name: '分享访问人数',
+                hideInMenu: true,
+                component: './statistical/consultant/visitPersons',
+              },
+              {
+                path: '/statistical/consultant/visitNum',
+                name: '分享访问次数',
+                hideInMenu: true,
+                component: './statistical/consultant/visitNum',
+              },
+              {
+                path: '/statistical/consultant/homePagePersons',
+                name: '主页访问人数',
+                hideInMenu: true,
+                component: './statistical/consultant/homePagePersons',
+              },
             ],
           },
           {
@@ -587,19 +626,19 @@ export default [
               },
               {
                 path: '/house/house/add',
-                name: '新增', 
+                name: '新增',
                 hideInMenu: true,
                 component: './house/house/add/index',
               },
               {
                 path: '/house/house/batch',
-                name: '批量上传', 
+                name: '批量上传',
                 hideInMenu: true,
                 component: './house/house/add/HouseBatchAdd',
               },
               {
                 path: '/house/house/edit',
-                name: '编辑', 
+                name: '编辑',
                 hideInMenu: true,
                 component: './house/house/edit/index',
               },
@@ -610,19 +649,19 @@ export default [
               },
               {
                 path: '/house/preSelect/add',
-                name: '新增', 
+                name: '新增',
                 hideInMenu: true,
                 component: './house/preSelect/add/index',
               },
               {
                 path: '/house/preSelect/batch',
-                name: '批量上传', 
+                name: '批量上传',
                 hideInMenu: true,
                 component: './house/preSelect/add/HouseBatchAdd',
               },
               {
                 path: '/house/preSelect/edit',
-                name: '编辑', 
+                name: '编辑',
                 hideInMenu: true,
                 component: './house/preSelect/edit/index',
               },
@@ -633,19 +672,19 @@ export default [
               },
               {
                 path: '/house/raise/add',
-                name: '新增', 
+                name: '新增',
                 hideInMenu: true,
                 component: './house/raise/add/index',
               },
               {
                 path: '/house/raise/batch',
-                name: '批量上传', 
+                name: '批量上传',
                 hideInMenu: true,
                 component: './house/raise/add/HouseBatchAdd',
               },
               {
                 path: '/house/raise/edit',
-                name: '编辑', 
+                name: '编辑',
                 hideInMenu: true,
                 component: './house/raise/edit/index',
               },

src/global.less

@@ -50,6 +50,7 @@ ol {
 
 .ant-layout-header .ant-pro-global-header{
   background:#393C39;
+  border-bottom: 0.6px solid rgb(156, 153, 153);
 }
 .ant-layout .ant-pro-sider-menu-sider.light .ant-pro-sider-menu-logo{
   background:#EF273A;

src/pages/Index.jsx

@@ -0,0 +1,126 @@
+import React, { Component, useState, useEffect } from 'react';
+import { Card, Typography, Alert, Row, Col, Button } from 'antd';
+import router from 'umi/router';
+import request from '../utils/request';
+import bgImg from '../assets/picture.png';
+import itemsImg from '../assets/items.png';
+import consultantImg from '../assets/consultantKPI.png';
+import projectImg from '../assets/project.png';
+import reportImg from '../assets/report.png';
+import customerImg from '../assets/customer.png';
+import statisticsImg from '../assets/statistics.png';
+import borderImg from '../assets/border.png';
+
+const index = (props) => {
+
+    const [data, setData] = useState([])
+
+
+    useEffect(() => {
+
+    }, [])
+    const list = [
+        {
+            title: '项目列表',
+            img: itemsImg,
+            path: '/building/list',
+            value: '1',
+        },
+        {
+            title: '客户列表',
+            img: customerImg,
+            path: '',
+            value: '2',
+        },
+        {
+            title: '数据报表',
+            img: reportImg,
+            path: '',
+            value: '3',
+        },
+
+        {
+            title: '项目统计',
+            img: projectImg,
+            path: '',
+            value: '4',
+        },
+        {
+            title: '活动统计',
+            img: statisticsImg,
+            path: '',
+            value: '5',
+        },
+        {
+            title: '置业顾问KPI',
+            img: consultantImg,
+            path: '',
+            value: '6',
+        },
+
+    ]
+    const goNow = (path) => {
+        router.push({
+            pathname: path,
+        });
+    }
+
+
+
+    return (
+        <>
+            <div style={{
+                width: 'calc(100% + 48px)',
+                height: '0',
+                paddingBottom: 'calc(29.64% + 14.23px)',
+                position: 'relative',
+                top: '-24px',
+                left: '-24px',
+                backgroundImage: `url('` + bgImg + `')`,
+                backgroundRepeat: 'no-repeat',
+                backgroundSize: '100% 100%',
+            }} >
+            </div>
+            <div style={{
+                backgroundColor: '#fff',
+                margin: '-24px -24px 0.24rem -24px',
+                paddingBottom: '0.2rem',
+
+            }} >
+                <h2 style={{
+                    fontSize: '0.11rem',
+                    padding: '0.2rem 0 16px 24px'
+                }}>快捷入口</h2>
+                <Row style={{ textAlign: 'center' }}>
+                    {list.map(item => (
+                        <Col span={4} key={item.value} onClick={() => goNow(item.path)}>
+                            <div style={{
+                                width: '1.2rem',
+                                height: '0px',
+                                margin: '0 auto',
+                                paddingBottom: '0.66rem',
+                                position: 'relative',
+                                backgroundImage: `url('` + borderImg + `')`,
+                                backgroundRepeat: 'no-repeat',
+                                backgroundSize: '100% 100%',
+                                paddingTop: '0.12rem'
+                            }}>
+                                <p style={{ color: '#FF7F49', fontSize: '0.11rem', letterSpacing: '0.026rem', fontWeight: '600', }}>{item.title}</p>
+                                <img style={{ position: 'absolute', left: '0.08rem', bottom: '0.1rem', width: '0.3rem' }} src={item.img} alt="" />
+                            </div>
+                        </Col>
+                    ))}
+
+
+
+                </Row>
+
+            </div>
+
+
+        </>
+    )
+
+}
+export default index
+

src/pages/Welcome.jsx

@@ -64,7 +64,7 @@ const welcome = (props) => {
             boxShadow: '0px  0.106rem 14px -15px rgba(107,130,230,1)',
             borderRadius: '12px', width: '32%',
           }}>
-            <span style={{ fontSize: '24px', color: '#fff', borderBottom: '1px solid #fff', margin: '30px 0', cursor: 'pointer' }}>最近7天新增 </span>
+            <span style={{ fontSize: '24px', color: '#fff', borderBottom: '1px solid #fff', margin: '30px 0', cursor: 'pointer' }}>今日新增用户 </span>
             <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy', lineHeight: '100px' }}>{data.selectRecentlyCount || '0'}</span>
           </div>
         }

src/pages/indexEcharts/components/IntentionalCustomers.jsx

@@ -88,12 +88,38 @@ const UserBehavior = (props) => {
     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 (
     <>
       <div>
       <p style={{fontSize:'0.12rem',fontWeight:'600'}}>意向客户</p>
-
-        <BuildSelect slot='action' onChange={(e => handleBuildingChange(e))} value={buildingId}></BuildSelect>
+        <Row>
+          <Col span={22}>
+            <BuildSelect slot='action' onChange={(e => handleBuildingChange(e))} value={buildingId}></BuildSelect>
+          </Col>
+          <Col span={2}>
+            <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, onChange: e => onChange(e) }} scroll={{ y: 500 }} />
 

src/pages/indexEcharts/components/NewUsers.jsx

@@ -24,7 +24,7 @@ const NewUsers = (props) => {
 
   function NewsUserCount (params) {
     request({
-      ...apis.indexEcharts.newUser,
+      ...apis.indexEcharts.changeNewUser,
       params,
     }).then((data) => {
       setData(data)
@@ -43,7 +43,7 @@ const NewUsers = (props) => {
       end: 100
     },
   ] : undefined 
-  const dataset = (data.selectNewsUserCount) || []
+  const dataset = data || []
   const options = {
 
    
@@ -74,7 +74,7 @@ const NewUsers = (props) => {
         }
       ],
       dataset: {
-        dimensions: ['date', 'userCount', 'authorizationCount'],
+        dimensions: ['createTime', 'fromNum', 'registeredNum'],
         source: dataset
       }
  

src/pages/indexEcharts/newUsers.jsx

@@ -16,20 +16,28 @@ import apis from '../../services/apis';
 //   return { startDate, endDate }
 // }
 
+let columns = [
+  {
+    title: '日期',
+    dataIndex: 'createTime',
+    key: 'createTime',
+  },
+]
 
 const header = props => {
 
-  const [tableData, setTableData] = useState({ records: [] })
-
+  const [tableData, setTableData] = useState([])
   const [endDate, setEndDate] = useState({})
+  const [data, setDate] = useState({})
   const [startDate, setStartDate] = useState({})
   let daterange= []
 
   useEffect(() => {
 
     setEndDate(new Date())
-    setStartDate(moment().subtract(7, 'day').toDate())
-
+    setStartDate(new Date())
+    // setStartDate(moment().subtract(7, 'day').toDate())
+    userResource({startDate: new Date(), endDate: new Date()})
   }, [])
 
   const { RangePicker } = DatePicker;
@@ -52,7 +60,7 @@ const header = props => {
  
     setEndDate(new Date())
     setStartDate(moment().subtract(days, 'day').toDate())
-
+    userResource({startDate: moment().subtract(days, 'day').toDate(), endDate: new Date()})
   }
 
   function onChange (e) {
@@ -64,15 +72,53 @@ const header = props => {
 
     setEndDate(daterange[1])
     setStartDate(daterange[0])
+    userResource({startDate: daterange[0], endDate: daterange[1]})
 
   }
 
- 
-  function handleSelectChange (e) {
+  function userResource(params) {
+    request({
+      ...apis.indexEcharts.selectPersonFrom,
+      params,
+    }).then((data) => {
+      setDate(data);
+      onTabledatas(data,"all")
+    })
+  }
 
-    console.log(e)
+  const onTabledatas = (e,changeType) => {
+    e.tdWxDicts.map(x => {
+        columns = columns.filter(y => y.key != x.sceneType).concat({
+          title: x.sceneAlias,
+          dataIndex: x.sceneType,
+          key: x.sceneType,
+        })
+    })
+    const data = (e.list || []).reduce((acc, item) => {
+      const { sceneType, fromNum, registeredNum, createTime } = item
+      const num = changeType === 'registered' ? registeredNum : fromNum
+      acc[createTime] = { ...acc[createTime], ...item, [`${sceneType}`]: !num ? 0 : num }
+      return acc
+    }, {})
+
+    const dictData =  e.tdWxDicts.reduce((acc,item,index) => {
+      const { sceneType } = item
+      acc[sceneType] = 0
+      return acc
+    },{})
+
+    const tableData = Object.keys(data).map(k => data[k]).reduce((acc,item,index) => {
+      acc[index] = { ...dictData, ...item }
+      return acc
+    },[])
+
+    setTableData(tableData)
 
   }
+ 
+  function handleSelectChange (e) {
+    onTabledatas(data,e)
+  }
 
   const { Column, ColumnGroup } = Table;
 
@@ -84,7 +130,8 @@ const header = props => {
       borderRadius: '12px',
       minHeight: '60vh'
     }}>
-      <Radio.Group onChange={onChange} buttonStyle="solid" defaultValue="a"  style={{marginBottom:'20px'}}>
+      <Radio.Group onChange={onChange} buttonStyle="solid" defaultValue="c"  style={{marginBottom:'20px'}}>
+        <Radio.Button value="c" onClick={getDataOf(0)}>今日</Radio.Button>
         <Radio.Button value="a" onClick={getDataOf(7)}>最近7天</Radio.Button>
         <Radio.Button value="b" onClick={getDataOf(30)}>最近1月</Radio.Button>
       </Radio.Group>
@@ -105,6 +152,12 @@ const header = props => {
       <div>
         <NewUsers BuildSelectHide={true} endDate={endDate} startDate={startDate}  dataZoom={true} ></NewUsers>
         {/* */}
+        <Select style={{ width: '180px' }} placeholder="所有用户" onChange={(e) => handleSelectChange(e)}>
+          <Option value='all'>所有用户</Option>
+          <Option value='registered'>注册用户</Option>
+        </Select>
+  
+        <Table style={{marginTop:'20px'}} dataSource={tableData} columns={columns} pagination={false} scroll={{ y: 500 }}></Table>
       </div>
     </div>
   </>

src/pages/record/drainage/DrainageVisitRecordList.jsx

@@ -46,9 +46,9 @@ const header = props => {
       dataIndex: 'activityName',
       key: 'activityName',
       align: 'center',
-      render: (text, record) => <span>{record.activityName != null ? record.activityName : 
-        record.drainageName != null ? record.drainageName : record.buildingName != null ? record.buildingName:record.newsName != null ? record.newsName : record.helpActivityName !=null ? record.helpActivityName :
-        record.groupActivityName!=null ? record.groupActivityName:''}</span>,
+      render: (text, record) => <span>{record.activityName != null ? record.activityName :
+        record.drainageName != null ? record.drainageName : record.buildingName != null ? record.buildingName : record.newsName != null ? record.newsName : record.helpActivityName != null ? record.helpActivityName :
+          record.groupActivityName != null ? record.groupActivityName : ''}</span>,
     },
     {
       title: '用户名',
@@ -86,10 +86,10 @@ const header = props => {
       dataIndex: 'personType',
       key: 'personType',
       align: 'center',
-      render: (text, record) => <span>{record.personType === 'Realty Consultant' ? '置业顾问' : '普通客户' }</span>,
+      render: (text, record) => <span>{record.personType === 'Realty Consultant' ? '置业顾问' : '普通客户'}</span>,
     },
   ];
-  
+
 
   const changePageNum = (pageNumber, props) => {
     getList({ pageNumber: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
@@ -104,7 +104,7 @@ const header = props => {
 
         if (!values.buildingId) {
           message.error("请选择项目")
-          return ;
+          return;
         }
 
         getList({ pageNum: 1, pageSize: 10, ...values })
@@ -113,7 +113,7 @@ const header = props => {
   }
 
   //重置搜索
-  function handleReset () {
+  function handleReset() {
     props.form.resetFields();
     getList({ pageNum: 1, pageSize: 10 })
   }
@@ -132,13 +132,13 @@ const header = props => {
         <Form.Item>
           {getFieldDecorator('eventType')(
             <Select placeholder="分享类型" style={{ width: 150 }}>
-            <Option value="activity_share">报名活动</Option>
-            <Option value="help_share">助力活动</Option>
-            <Option value="group_share">拼团活动</Option>
-            <Option value="h5_share">H5活动</Option>
-            <Option value="building_share">项目</Option>
-            <Option value="news_share">资讯</Option>
-          </Select>
+              <Option value="activity_share">报名活动</Option>
+              <Option value="help_share">助力活动</Option>
+              <Option value="group_share">拼团活动</Option>
+              <Option value="h5_share">H5活动</Option>
+              <Option value="building_share">项目</Option>
+              <Option value="news_share">资讯</Option>
+            </Select>
           )}
         </Form.Item>
         <Form.Item>
@@ -159,10 +159,10 @@ const header = props => {
         </Form.Item>
         <Form.Item>
           {getFieldDecorator('personType')(
-             <Select placeholder="分享者类型" style={{ width: 150 }}>
-             <Option value="Realty Consultant">置业顾问</Option>
-             <Option value="customer">普通客户</Option>
-           </Select>
+            <Select placeholder="分享者类型" style={{ width: 150 }}>
+              <Option value="Realty Consultant">置业顾问</Option>
+              <Option value="customer">普通客户</Option>
+            </Select>
           )}
         </Form.Item>
         <Form.Item>
@@ -174,9 +174,9 @@ const header = props => {
           )}
         </Form.Item>
         <Form.Item>
-        <AuthButton name="admin.visit.record.search" noRight={null}>
-          <Button type="primary" htmlType="submit" className={styles.searchBtn}> 
-            搜索
+          <AuthButton name="admin.visit.record.search" noRight={null}>
+            <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+              搜索
           </Button>
           </AuthButton>
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
@@ -184,9 +184,9 @@ const header = props => {
             </Button>
         </Form.Item>
       </Form>
-      <Table style={{marginTop:'30px'}} dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" locale={{ emptyText: defaultTip }} />
+      <Table style={{ marginTop: '30px' }} dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" locale={{ emptyText: defaultTip }} />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e,props)} current={data.current} />
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e, props)} current={data.current} />
       </div>
     </>
   )

src/pages/statistical/consultant/homePagePersons.jsx

@@ -0,0 +1,119 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Button, Table, Pagination, Radio, Typography, Avatar } from 'antd';
+import router from 'umi/router';
+import moment from 'moment';
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import apis from '../../../services/apis';
+import request from '../../../utils/request'
+
+/**
+  @param {*} props
+  @returns
+ */
+const { Text } = Typography;
+
+function record(props) {
+    const [formData, updateFormData] = useState({
+        pageNum: 1,
+        pageSize: 10,
+        ...props.location.query,
+
+    })
+
+    // 获取初始化数据
+    const [data, setData] = useState({})
+
+
+    useEffect(() => {
+        getList(formData);
+    }, [])
+
+    // 查询列表
+    const getList = (params) => {
+        request({ ...apis.stats.homePagePersons, params: { ...params }, }).then((data) => {
+            setData(data)
+        })
+    }
+
+    // 更新页码
+    const changePageNum = (pageNumber) => {
+        props.form.validateFields((err, values) => {
+            if (!err) {
+                getList({ ...props.location.query, pageNum: pageNumber });
+            }
+        });
+    }
+    const toPersonDetail = (personId) => {
+        router.push({
+            pathname: '/customer/customerlist/publicCustomerDetail',
+            query: {
+                id: personId,
+            },
+        });
+    }
+    // 表格数据
+    const columns = [
+
+        {
+            title: '头像',
+            dataIndex: 'picture',
+            key: 'picture',
+            align: 'center',
+            render: (_, record) => <Avatar shape="square" src={record.picture || record.avatarurl} size={64} icon="user" />,
+        },
+        {
+            title: '姓名',
+            dataIndex: 'name',
+            key: 'name',
+            align: 'center',
+            render: (_, record) => <span style={{ color: 'blue', cursor: 'pointer' }} onClick={() => toPersonDetail(record.personId)} >{record.name}</span>,
+        },
+        {
+            title: '电话',
+            dataIndex: 'phone',
+            key: 'phone',
+            align: 'center',
+        },
+        {
+            title: '性别',
+            dataIndex: 'sex',
+            key: 'sex',
+            align: 'center',
+            render: (_, record) => <span>{record.sex == 1 ? '男' : '女'}</span>,
+        },
+        {
+            title: '访问次数',
+            dataIndex: 'visitTimes',
+            key: 'visitTimes',
+            align: 'center',
+            render: (_, record) => <span style={{ color: 'blue', cursor: 'pointer' }} onClick={() => toPersonDetail(record.personId)} >{record.visitTimes}</span>,
+        },
+        {
+            title: '最后访问时间',
+            dataIndex: 'visitTime',
+            key: 'visitTime',
+            align: 'center',
+            render: (_, record) => <><span>{record.visitTime && moment(record.visitTime).format('YYYY-MM-DD HH:mm:ss')}</span></>,
+        },
+
+    ];
+
+    return (
+
+        <>
+            <Button type="danger" style={{ marginLeft: '18px' }} onClick={() => router.go(-1)}>返回</Button>
+            <Table rowKey={record => (record.phone + record.buildingId || '')}
+                style={{ marginTop: '30px' }}
+                dataSource={data.records}
+                columns={columns}
+                pagination={false}
+            />
+            < div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+                <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
+            </div>
+        </>
+    )
+}
+const WrappedHeader = Form.create({ name: 'record' })(record);
+
+export default WrappedHeader

src/pages/statistical/consultant/index.jsx

@@ -14,20 +14,30 @@ const { RangePicker } = DatePicker;
 const { Text } = Typography;
 
 function record(props) {
-    const { getFieldDecorator } = props.form
+    const [radioVal, updateRadioVal] = useState(7)
+    const [formData, updateFormData] = useState({
+        pageNum: 1,
+        pageSize: 10,
+        startDate: moment().subtract(radioVal, 'day').format('YYYYMMDD'),
+        endDate: moment().format('YYYYMMDD'),
+        buildingId: '',
+        asc: '',
+        desc: '',
+    })
 
     // 获取初始化数据
     const [data, setData] = useState({})
+    const [totalRow, setTotalRow] = useState({})
 
     useEffect(() => {
-        getList({ pageNum: 1, pageSize: 10 });
+        getList(formData);
     }, [])
 
     // 查询列表
     const getList = (params) => {
-        request({ ...apis.activity.saleCountList, params: { ...params }, }).then((data) => {
-            setData(data)
-            console.log("data:", data)
+        request({ ...apis.stats.consultantKPI, params: { ...params }, }).then((data) => {
+            setData(data.paged)
+            setTotalRow(data.total)
         })
     }
 
@@ -36,65 +46,165 @@ function record(props) {
         props.form.resetFields();
     }
 
-    // 分享详情
-    function shareCount(personId) {
-        router.push({
-            pathname: '/record/share/shareCountList',
-            query: {
-                id: personId,
-            },
-        });
-    }
-
-    // 点击人数详情
-    function clickCount(personId) {
-        router.push({
-            pathname: '/record/share/clickCountList',
-            query: {
-                id: personId,
-            },
-        });
-    }
-
     // 提交事件
-    const handleSubmit = (e, props) => {
+    const handleSubmit = (e) => {
         e.preventDefault();
-        props.form.validateFields((err, values) => {
-            if (!err) {
-                let { shareTime, receiveTime, ...submitValue } = values
-                if (null != shareTime && shareTime.length > 0) {
-                    const [startCreateDate, endCreateDate] = shareTime
-                    submitValue.startCreateDate = moment(startCreateDate).format('YYYY-MM-DD');
-                    submitValue.endCreateDate = moment(endCreateDate).format('YYYY-MM-DD');
-                } else {
-                    submitValue.startCreateDate = null
-                    submitValue.endCreateDate = null
-                }
-                console.log(submitValue)
-                getList({ pageNum: 1, pageSize: 10, ...submitValue })
-            }
-        });
+        getList(formData);
     }
-
+    // 更新页码
     const changePageNum = (pageNumber) => {
         props.form.validateFields((err, values) => {
             if (!err) {
-                let { shareTime, receiveTime, ...submitValue } = values
-                if (null != shareTime && shareTime.length > 0) {
-                    const [startCreateDate, endCreateDate] = shareTime
-                    submitValue.startCreateDate = moment(startCreateDate).format('YYYY-MM-DD');
-                    submitValue.endCreateDate = moment(endCreateDate).format('YYYY-MM-DD');
-                } else {
-                    submitValue.startCreateDate = null
-                    submitValue.endCreateDate = null
-                }
-                getList({ pageNum: pageNumber, pageSize: 10, ...submitValue })
+                getList({ ...formData, pageNum: pageNumber });
             }
         });
     }
-    function getDataOf(days) {
-        // this.setState({ endDate: new Date(), startDate: moment().subtract(days, 'day').toDate() })
+    // 切换日期 与picker联动
+    function setFormData(e) {
+        updateRadioVal(e.target.value)
+        updateFormData({
+            ...formData,
+            startDate: moment().subtract(e.target.value, 'day').format('YYYYMMDD'),
+            endDate: moment().format('YYYYMMDD'),
+        })
+        getList({
+            ...formData, startDate: moment().subtract(e.target.value, 'day').format('YYYYMMDD'),
+            endDate: moment().format('YYYYMMDD'),
+        });
+
+    }
+    // 选择日期
+    const handleDateChange = (val) => {
+        updateFormData({
+            ...formData,
+            startDate: val[0].format('YYYYMMDD'),
+            endDate: val[1].format('YYYYMMDD'),
+        })
+    }
+    // 选择项目
+    const handleBuildingChange = e => {
+        updateFormData({
+            ...formData,
+            buildingId: e,
+        })
     }
+
+    const clickCon = (val, record, type) => {
+        if (val == 0) {
+            return <><span onClick={() => toDetail(record, type)}>{val}</span></>
+        }
+        return <><span style={{ color: 'blue', cursor: 'pointer' }} onClick={() => toDetail(record, type)} >{val}</span></>
+    }
+
+    // 分享详情
+    function toDetail(record, type) {
+        if (type === 'totalPersons') {
+            router.push({
+                pathname: '/statistical/consultant/table',
+                query: {
+                    buildingId: formData.buildingId,
+                    userId: record.userId,
+                },
+            });
+        } else if (type === 'newPersons') {
+            router.push({
+                pathname: '/statistical/consultant/table',
+                query: {
+                    startDate: formData.startDate,
+                    endDate: formData.endDate,
+                    buildingId: formData.buildingId,
+                    userId: record.userId,
+                },
+            });
+        } else if (type === 'shareNum') {
+            router.push({
+                pathname: '/statistical/consultant/sharetable',
+                query: {
+                    startDate: formData.startDate,
+                    endDate: formData.endDate,
+                    buildingId: formData.buildingId,
+                    userId: record.userId,
+                },
+            });
+        } else if (type === 'visitPersons') {
+            router.push({
+                pathname: '/statistical/consultant/visitPersons',
+                query: {
+                    startDate: formData.startDate,
+                    endDate: formData.endDate,
+                    buildingId: formData.buildingId,
+                    userId: record.userId,
+                },
+            });
+        } else if (type === 'visitNum') {
+            router.push({
+                pathname: '/statistical/consultant/visitNum',
+                query: {
+                    startDate: formData.startDate,
+                    endDate: formData.endDate,
+                    buildingId: formData.buildingId,
+                    userId: record.userId,
+                },
+            });
+        } else if (type === 'sharePersons') {
+            router.push({
+                pathname: '/statistical/consultant/table',
+                query: {
+                    startDate: formData.startDate,
+                    endDate: formData.endDate,
+                    buildingId: formData.buildingId,
+                    userId: record.userId,
+                    type: 'sharePersons',
+                },
+            });
+        } else if (type === 'homePagePersons') {
+            router.push({
+                pathname: '/statistical/consultant/homePagePersons',
+                query: {
+                    startDate: formData.startDate,
+                    endDate: formData.endDate,
+                    buildingId: formData.buildingId,
+                    userId: record.userId,
+                },
+            });
+        } else if (type === 'homePageNums') {
+            router.push({
+                pathname: '/statistical/consultant/table',
+                query: {
+                    startDate: formData.startDate,
+                    endDate: formData.endDate,
+                    buildingId: formData.buildingId,
+                    userId: record.userId,
+                    type: 'homePageNums',
+                },
+            });
+        } else if (type === 'chatPersons') {
+            router.push({
+                pathname: '/statistical/consultant/table',
+                query: {
+                    startDate: formData.startDate,
+                    endDate: formData.endDate,
+                    buildingId: formData.buildingId,
+                    userId: record.userId,
+                    type: 'chatPersons',
+                },
+            });
+        } else if (type === 'favorNum') {
+            router.push({
+                pathname: '/statistical/consultant/table',
+                query: {
+                    startDate: formData.startDate,
+                    endDate: formData.endDate,
+                    buildingId: formData.buildingId,
+                    userId: record.userId,
+                    type: 'favorNum',
+                },
+            });
+        }
+
+    }
+
+    // 表格数据
     const columns = [
 
         {
@@ -102,114 +212,158 @@ function record(props) {
             dataIndex: 'buildingName',
             key: 'buildingName',
             align: 'center',
+            // render: (txt, _, index) => index ? txt : <span>总计</span>,
         },
+
         {
-            title: '置业顾问名称1',
-            dataIndex: 'consultantName',
-            key: 'consultantName',
+            title: '置业顾问名称',
+            dataIndex: 'userName',
+            key: 'userName',
             align: 'center',
         },
         {
             title: '置业顾问电话',
-            dataIndex: 'consultantPhone',
-            key: 'consultantPhone',
+            dataIndex: 'phone',
+            key: 'phone',
             align: 'center',
         },
         {
             title: '客户总计',
-            dataIndex: 'customerAggregate',
-            key: 'customerAggregate',
+            dataIndex: 'totalPersons',
+            key: 'totalPersons',
             align: 'center',
-            sorter: (a, b) => a.customerAggregate - b.customerAggregate,
-            render: (_, record) => <><span style={{ color: 'blue', cursor: 'pointer' }} onClick={() => shareCount(record.personId)} >{record.customerAggregate}</span></>,
+            sorter: (a, b) => a.totalPersons - b.totalPersons,
+            render: (txt, record, index) => clickCon(txt, record, 'totalPersons'),
+            // render: (txt, record, index) => index ? clickCon(txt, record, 'totalPersons') : <strong>{txt}</strong>,
         },
         {
             title: '新增客户',
-            dataIndex: 'newCustomers',
-            key: 'newCustomers',
+            dataIndex: 'newPersons',
+            key: 'newPersons',
             align: 'center',
-            sorter: (a, b) => a.newCustomers - b.newCustomers,
-            render: (_, record) => <><span style={{ color: 'blue', cursor: 'pointer' }} onClick={() => shareCount(record.personId)} >{record.newCustomers}</span></>,
+            sorter: (a, b) => a.newPersons - b.newPersons,
+            render: (txt, record, index) => clickCon(txt, record, 'newPersons'),
         },
         {
             title: '分享次数',
-            dataIndex: 'shareCount',
-            key: 'shareCount',
+            dataIndex: 'shareNum',
+            key: 'shareNum',
             align: 'center',
-            sorter: (a, b) => a.shareCount - b.shareCount,
-            render: (_, record) => <><span style={{ color: 'blue', cursor: 'pointer' }} onClick={() => shareCount(record.personId)} >{record.shareCount}</span></>,
+            sorter: (a, b) => a.shareNum - b.shareNum,
+            render: (txt, record, index) => clickCon(txt, record, 'shareNum'),
         },
         {
             title: '分享访问人数',
-            dataIndex: 'shareVisitPersonNum',
-            key: 'shareVisitPersonNum',
+            dataIndex: 'visitPersons',
+            key: 'visitPersons',
             align: 'center',
-            sorter: (a, b) => a.shareVisitPersonNum - b.shareVisitPersonNum,
-            render: (_, record) => <><span style={{ color: 'blue', cursor: 'pointer' }} onClick={() => shareCount(record.personId)} >{record.shareVisitPersonNum}</span></>,
+            sorter: (a, b) => a.visitPersons - b.visitPersons,
+            render: (txt, record, index) => clickCon(txt, record, 'visitPersons'),
         },
         {
             title: '分享访问次数',
-            dataIndex: 'shareVisitNum',
-            key: 'shareVisitNum',
+            dataIndex: 'visitNum',
+            key: 'visitNum',
             align: 'center',
-            sorter: (a, b) => a.shareVisitNum - b.shareVisitNum,
-            render: (_, record) => <><span style={{ color: 'blue', cursor: 'pointer' }} onClick={() => shareCount(record.personId)} >{record.shareVisitNum}</span></>,
+            sorter: (a, b) => a.visitNum - b.visitNum,
+            render: (txt, record, index) => clickCon(txt, record, 'visitNum'),
         },
 
         {
             title: '分享拓客',
-            dataIndex: 'sharePossess',
-            key: 'sharePossess',
+            dataIndex: 'sharePersons',
+            key: 'sharePersons',
             align: 'center',
-            sorter: (a, b) => a.sharePossess - b.sharePossess,
-            render: (_, record) => <><span style={{ color: 'blue', cursor: 'pointer' }} onClick={() => clickCount(record.personId)} >{record.sharePossess}</span></>,
+            sorter: (a, b) => a.sharePersons - b.sharePersons,
+            render: (txt, record, index) => clickCon(txt, record, 'sharePersons'),
         },
         {
             title: '主页访问人数',
-            dataIndex: 'visitPerson',
-            key: 'visitPerson',
+            dataIndex: 'homePagePersons',
+            key: 'homePagePersons',
             align: 'center',
-            sorter: (a, b) => a.visitPerson - b.visitPerson,
-            render: (_, record) => <><span style={{ color: 'blue', cursor: 'pointer' }} onClick={() => clickCount(record.personId)} >{record.visitPerson}</span></>,
+            sorter: (a, b) => a.homePagePersons - b.homePagePersons,
+            render: (txt, record, index) => clickCon(txt, record, 'homePagePersons'),
         },
         {
             title: '主页访问次数',
-            dataIndex: 'clickNum',
-            key: 'clickNum',
+            dataIndex: 'homePageNums',
+            key: 'homePageNums',
+            align: 'center',
+            sorter: (a, b) => a.homePageNums - b.homePageNums,
+            render: (txt, record, index) => clickCon(txt, record, 'homePageNums'),
+        },
+        {
+            title: '咨询数',
+            dataIndex: 'chatPersons',
+            key: 'chatPersons',
+            align: 'center',
+            sorter: (a, b) => a.chatPersons - b.chatPersons,
+            render: (txt, record, index) => clickCon(txt, record, 'chatPersons'),
+        },
+        {
+            title: '点赞数',
+            dataIndex: 'favorNum',
+            key: 'favorNum',
             align: 'center',
-            sorter: (a, b) => a.clickNum - b.clickNum,
-            render: (_, record) => <><span style={{ color: 'blue', cursor: 'pointer' }} onClick={() => clickCount(record.personId)} >{record.clickNum}</span></>,
+            sorter: (a, b) => a.favorNum - b.favorNum,
+            render: (txt, record, index) => clickCon(txt, record, 'favorNum'),
         },
     ];
+    // 下载文档
+    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() {
+        request({ ...apis.stats.exportConsultantKPI, responseType: 'blob', params: { startDate: formData.startDate, endDate: formData.endDate, buildingId: formData.buildingId } })
+            .then(response => {
+                download(response)
+            }).catch(error => {
 
-
-
+            })
+    }
+    // 默认日期
+    const dateRange = [
+        moment(formData.startDate),
+        moment(formData.endDate),
+    ]
+    // const list = data.records
+    // const _list = list && list.length > 0 ? [totalRow, ...list] : [];
     return (
 
         <>
-            <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+            <Form layout="inline">
                 <div style={{ display: 'flex', alignItems: 'center' }}>
-                    <Radio.Group buttonStyle="solid" defaultValue="a" style={{ marginRight: '16px', }}>
-                        <Radio.Button value="a" onClick={getDataOf(7)}>最近7天</Radio.Button>
-                        <Radio.Button value="b" onClick={getDataOf(30)}>最近1月</Radio.Button>
+                    <Radio.Group buttonStyle="solid" value={radioVal} onChange={setFormData} style={{ marginRight: '16px', }}>
+                        <Radio.Button value={7}>最近7天</Radio.Button>
+                        <Radio.Button value={30}>最近1月</Radio.Button>
                     </Radio.Group>
                     <Form.Item>
-                        {getFieldDecorator('shareTime')(
-                            <RangePicker placeholder={['开始日期', '结束日期']} />
-                        )}
+                        <RangePicker value={dateRange} onChange={handleDateChange} placeholder={['开始日期', '结束日期']} />
                     </Form.Item>
                     <Form.Item>
-                        {getFieldDecorator('buildingId')(
-                            <BuildSelect />,
-                        )}
+                        <BuildSelect value={formData.buildingId} onChange={handleBuildingChange} />
                     </Form.Item>
                     <Form.Item style={{ position: 'absolute', right: '38px' }}>
-                        <Button type="primary" onClick={handleReset}>查询</Button>
+                        <Button type="primary" onClick={handleSubmit}>查询</Button>
                         <Button style={{ marginLeft: 8 }} onClick={handleReset}>重置</Button>
                     </Form.Item>
                 </div>
             </Form>
-            <Table rowKey="KPIRecords"
+            <Button type="primary" onClick={exportRecord} style={{ float: 'right', margin: '20px 23px 20px 0', zIndex: 1 }}>
+                导出
+          </Button>
+            <Table rowKey={record => (record.userId + record.buildingId || '')}
                 style={{ marginTop: '30px' }}
                 dataSource={data.records}
                 columns={columns}

src/pages/statistical/consultant/sharetable.jsx

@@ -0,0 +1,131 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Button, Table, Pagination, Select, Input, Icon } from 'antd';
+import router from 'umi/router';
+import moment from 'moment';
+import apis from '../../../services/apis';
+import request from '../../../utils/request'
+
+/**
+  @param {*} props
+  @returns
+ */
+const { Option } = Select;
+
+function record(props) {
+    const [radioVal, updateRadioVal] = useState(7)
+    const [formData, updateFormData] = useState({
+        pageNum: 1,
+        pageSize: 10,
+        ...props.location.query,
+    })
+
+    // 获取初始化数据
+    const [data, setData] = useState({})
+
+    useEffect(() => {
+        getList(formData);
+    }, [])
+
+    // 查询列表
+    const getList = (params) => {
+        request({ ...apis.stats.totalPersons, params: { ...params }, }).then((data) => {
+            setData(data)
+        })
+    }
+
+    //重置搜索
+    function handleReset() {
+        props.form.resetFields();
+    }
+
+    // 提交事件
+    const handleSubmit = (e) => {
+        e.preventDefault();
+        props.form.validateFields((err, values) => {
+            if (!err) {
+                console.log('提交数据: ', values)
+
+            }
+        });
+        // getList(formData);
+    }
+    // 更新页码
+    const changePageNum = (pageNumber) => {
+        props.form.validateFields((err, values) => {
+            if (!err) {
+                getList({ ...formData, pageNum: pageNumber });
+            }
+        });
+    }
+
+
+    // 表格数据
+    const columns = [
+
+        {
+            title: '分享标题',
+            dataIndex: 'intention',
+            key: 'intention',
+            align: 'center',
+        },
+        {
+            title: '分享时间',
+            dataIndex: 'userName',
+            key: 'userName',
+            align: 'center',
+            render: (_, record) => <><span>{record.reportDate && moment(record.reportDate).format('YYYY-MM-DD HH:mm:ss')}</span></>,
+        },
+
+    ];
+
+    const { getFieldDecorator } = props.form
+    return (
+
+        <>
+            <Button type="danger" style={{ margin: '0 0 18px 8px' }} onClick={() => router.go(-1)}>返回</Button>
+            <Form layout="inline">
+                <div style={{ display: 'flex', alignItems: 'center' }}>
+                    <Form.Item>
+                        {getFieldDecorator('eventType')(
+                            <Select placeholder="分享类型" style={{ width: 150 }}>
+                                <Option value="activity_share">报名活动</Option>
+                                <Option value="help_share">助力活动</Option>
+                                <Option value="group_share">拼团活动</Option>
+                                <Option value="h5_share">H5活动</Option>
+                                <Option value="live_share">直播活动</Option>
+                                <Option value="house_share">房源列表</Option>
+                                <Option value="building_share">项目</Option>
+                                <Option value="news_share">资讯</Option>
+                                <Option value="index_share">首页</Option>
+                            </Select>
+                        )}
+                    </Form.Item>
+                    <Form.Item>
+                        {getFieldDecorator('activityName')(
+                            <Input
+                                prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                                placeholder="分享标题"
+                            />,
+                        )}
+                    </Form.Item>
+                    <Form.Item style={{ position: 'absolute', right: '38px' }}>
+                        <Button type="primary" onClick={handleSubmit}>搜索</Button>
+                        <Button style={{ marginLeft: 8 }} onClick={handleReset}>重置</Button>
+                    </Form.Item>
+                </div>
+            </Form>
+            <Table rowKey={record => (record.userId + record.buildingId || '')}
+                style={{ marginTop: '30px' }}
+                dataSource={data.records}
+                columns={columns}
+                pagination={false}
+            />
+            < div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+                <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
+            </div>
+        </>
+    )
+}
+const WrappedHeader = Form.create({ name: 'record' })(record);
+
+export default WrappedHeader

src/pages/statistical/consultant/table.jsx

@@ -0,0 +1,156 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Button, Table, Pagination, Radio, Typography, Avatar } from 'antd';
+import router from 'umi/router';
+import moment from 'moment';
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import apis from '../../../services/apis';
+import request from '../../../utils/request'
+
+/**
+  @param {*} props
+  @returns
+ */
+const { Text } = Typography;
+
+function record(props) {
+    const [formData, updateFormData] = useState({
+        pageNum: 1,
+        pageSize: 10,
+        ...props.location.query,
+
+    })
+
+    // 获取初始化数据
+    const [data, setData] = useState({})
+
+
+    useEffect(() => {
+        getList(formData);
+    }, [])
+
+    // 查询列表
+    const typeTag = props.location.query.type || ''
+
+    const getList = (params) => {
+        if (typeTag == 'sharePersons') {
+            request({ ...apis.stats.sharePersons, params: { ...params }, }).then((data) => {
+                setData(data)
+            })
+        }
+        else if (typeTag == 'homePageNums') {
+            request({ ...apis.stats.homePageNums, params: { ...params }, }).then((data) => {
+                setData(data)
+            })
+        }
+        else if (typeTag == 'chatPersons') {
+            request({ ...apis.stats.chatPersons, params: { ...params }, }).then((data) => {
+                setData(data)
+            })
+        }
+        else {
+            request({ ...apis.stats.totalPersons, params: { ...params }, }).then((data) => {
+                setData(data)
+            })
+        }
+
+    }
+
+    // 更新页码
+    const changePageNum = (pageNumber) => {
+        props.form.validateFields((err, values) => {
+            if (!err) {
+                getList({ ...props.location.query, pageNum: pageNumber });
+            }
+        });
+    }
+    const toPersonDetail = (personId) => {
+        router.push({
+            pathname: '/customer/customerlist/publicCustomerDetail',
+            query: {
+                id: personId,
+            },
+        });
+    }
+
+    const basicColunms = [
+        {
+            title: '头像',
+            dataIndex: 'picture',
+            key: 'picture',
+            align: 'center',
+            render: (_, record) => <Avatar shape="square" src={record.picture || record.avatarurl} size={64} icon="user" />,
+        },
+        {
+            title: '姓名',
+            dataIndex: 'name',
+            key: 'name',
+            align: 'center',
+            render: (_, record) => <span style={{ color: 'blue', cursor: 'pointer' }} onClick={() => toPersonDetail(record.personId)} >{record.name}</span>,
+        },
+        {
+            title: '电话',
+            dataIndex: 'phone',
+            key: 'phone',
+            align: 'center',
+        },
+        {
+            title: '性别',
+            dataIndex: 'sex',
+            key: 'sex',
+            align: 'center',
+            render: (_, record) => <span>{record.sex == 1 ? '男' : '女'}</span>,
+        },
+    ]
+
+    // 表格数据
+    const lastColum = typeTag == 'homePageNums' ? [
+        {
+            title: '访问时间',
+            dataIndex: 'visitTime',
+            key: 'visitTime',
+            align: 'center',
+            render: (_, record) => <> <span>{record.visitTime && moment(record.visitTime).format('YYYY-MM-DD HH:mm:ss')}</span></>,
+        },
+    ] : typeTag == 'chatPersons' ?
+            [
+                {
+                    title: '最后咨询时间',
+                    dataIndex: 'visitTime',
+                    key: 'visitTime',
+                    align: 'center',
+                    render: (_, record) => <> <span>{record.visitTime && moment(record.visitTime).format('YYYY-MM-DD HH:mm:ss')}</span></>,
+                },
+
+            ] : typeTag == 'favorNum' ? [] :
+                [
+                    {
+                        title: '报备时间',
+                        dataIndex: 'reportDate',
+                        key: 'reportDate',
+                        align: 'center',
+                        render: (_, record) => <><span>{record.reportDate && moment(record.reportDate).format('YYYY-MM-DD HH:mm:ss')}</span>}</>,
+                    },
+                ]
+    const columns = basicColunms.concat(lastColum)
+
+
+
+    return (
+
+        <>
+            <Button type="danger" style={{ marginLeft: '18px' }} onClick={() => router.go(-1)}>返回</Button>
+            <Table rowKey={record => (record.phone + record.buildingId || '')}
+                style={{ marginTop: '30px' }}
+                dataSource={data.records}
+                columns={columns}
+                pagination={false}
+            />
+            < div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+                <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
+            </div>
+        </>
+    )
+}
+const WrappedHeader = Form.create({ name: 'record' })(record);
+
+export default WrappedHeader

src/pages/statistical/consultant/visitNum.jsx

@@ -0,0 +1,158 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Button, Table, Pagination, Select, Input, Icon } from 'antd';
+import router from 'umi/router';
+import moment from 'moment';
+import apis from '../../../services/apis';
+import request from '../../../utils/request'
+
+/**
+  @param {*} props
+  @returns
+ */
+const { Option } = Select;
+
+function record(props) {
+    const [radioVal, updateRadioVal] = useState(7)
+    const [formData, updateFormData] = useState({
+        pageNum: 1,
+        pageSize: 10,
+        ...props.location.query,
+    })
+
+    // 获取初始化数据
+    const [data, setData] = useState({})
+
+    useEffect(() => {
+        getList(formData);
+    }, [])
+
+    // 查询列表
+    const getList = (params) => {
+        request({ ...apis.stats.totalPersons, params: { ...params }, }).then((data) => {
+            setData(data)
+        })
+    }
+
+    //重置搜索
+    function handleReset() {
+        props.form.resetFields();
+    }
+
+    // 提交事件
+    const handleSubmit = (e) => {
+        e.preventDefault();
+        props.form.validateFields((err, values) => {
+            if (!err) {
+                console.log('提交数据: ', values)
+
+            }
+        });
+        // getList(formData);
+    }
+    // 更新页码
+    const changePageNum = (pageNumber) => {
+        props.form.validateFields((err, values) => {
+            if (!err) {
+                getList({ ...formData, pageNum: pageNumber });
+            }
+        });
+    }
+
+
+    // 表格数据
+    const columns = [
+
+        {
+            title: '分享标题',
+            dataIndex: 'intention',
+            key: 'intention',
+            align: 'center',
+        },
+        {
+            title: '姓名',
+            dataIndex: 'name',
+            key: 'name',
+            align: 'center',
+        },
+        {
+            title: '电话',
+            dataIndex: 'phone',
+            key: 'phone',
+            align: 'center',
+        },
+        {
+            title: '性别',
+            dataIndex: 'sex',
+            key: 'sex',
+            align: 'center',
+            render: (_, record) => <span>{record.sex == 1 ? '男' : '女'}</span>,
+        },
+        {
+            title: '访问时间',
+            dataIndex: 'userName',
+            key: 'userName',
+            align: 'center',
+            render: (_, record) => <><span>{record.reportDate && moment(record.reportDate).format('YYYY-MM-DD HH:mm:ss')}</span></>,
+        },
+
+    ];
+
+    const { getFieldDecorator } = props.form
+    return (
+
+        <>
+            <Button type="danger" style={{ margin: '0 0 18px 8px' }} onClick={() => router.go(-1)}>返回</Button>
+            <Form layout="inline">
+                <div style={{ display: 'flex', alignItems: 'center' }}>
+                    <Form.Item>
+                        {getFieldDecorator('eventType')(
+                            <Select placeholder="分享类型" style={{ width: 150 }}>
+                                <Option value="activity_share">报名活动</Option>
+                                <Option value="help_share">助力活动</Option>
+                                <Option value="group_share">拼团活动</Option>
+                                <Option value="h5_share">H5活动</Option>
+                                <Option value="live_share">直播活动</Option>
+                                <Option value="house_share">房源列表</Option>
+                                <Option value="building_share">项目</Option>
+                                <Option value="news_share">资讯</Option>
+                                <Option value="index_share">首页</Option>
+                            </Select>
+                        )}
+                    </Form.Item>
+                    <Form.Item>
+                        {getFieldDecorator('activityName')(
+                            <Input
+                                prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                                placeholder="分享标题"
+                            />,
+                        )}
+                    </Form.Item>
+                    <Form.Item>
+                        {getFieldDecorator('userName')(
+                            <Input
+                                prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                                placeholder="用户名"
+                            />,
+                        )}
+                    </Form.Item>
+                    <Form.Item style={{ position: 'absolute', right: '38px' }}>
+                        <Button type="primary" onClick={handleSubmit}>搜索</Button>
+                        <Button style={{ marginLeft: 8 }} onClick={handleReset}>重置</Button>
+                    </Form.Item>
+                </div>
+            </Form>
+            <Table rowKey={record => (record.userId + record.buildingId || '')}
+                style={{ marginTop: '30px' }}
+                dataSource={data.records}
+                columns={columns}
+                pagination={false}
+            />
+            < div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+                <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
+            </div>
+        </>
+    )
+}
+const WrappedHeader = Form.create({ name: 'record' })(record);
+
+export default WrappedHeader

src/pages/statistical/consultant/visitPersons.jsx

@@ -0,0 +1,111 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Button, DatePicker, Table, Pagination, Radio, Typography, Avatar } from 'antd';
+import router from 'umi/router';
+import moment from 'moment';
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import apis from '../../../services/apis';
+import request from '../../../utils/request'
+
+/**
+  @param {*} props
+  @returns
+ */
+const { RangePicker } = DatePicker;
+const { Text } = Typography;
+
+function record(props) {
+    const [formData, updateFormData] = useState({
+        pageNum: 1,
+        pageSize: 10,
+        ...props.location.query,
+
+    })
+
+    // 获取初始化数据
+    const [data, setData] = useState({})
+
+
+    useEffect(() => {
+        getList(formData);
+    }, [])
+
+    // 查询列表
+    const getList = (params) => {
+        request({ ...apis.stats.totalPersons, params: { ...params }, }).then((data) => {
+            setData(data)
+        })
+    }
+
+    // 更新页码
+    const changePageNum = (pageNumber) => {
+        props.form.validateFields((err, values) => {
+            if (!err) {
+                getList({ ...props.location.query, pageNum: pageNumber });
+            }
+        });
+    }
+    const toPersonDetail = (personId) => {
+        router.push({
+            pathname: '/customer/customerlist/publicCustomerDetail',
+            query: {
+                id: personId,
+            },
+        });
+    }
+    // 表格数据
+    const columns = [
+        {
+            title: '姓名',
+            dataIndex: 'name',
+            key: 'name',
+            align: 'center',
+        },
+        {
+            title: '电话',
+            dataIndex: 'phone',
+            key: 'phone',
+            align: 'center',
+        },
+        {
+            title: '性别',
+            dataIndex: 'sex',
+            key: 'sex',
+            align: 'center',
+            render: (_, record) => <span>{record.sex == 1 ? '男' : '女'}</span>,
+        },
+        {
+            title: '访问次数',
+            dataIndex: 'visitNum',
+            key: 'visitNum',
+            align: 'center',
+            render: (_, record) => <span style={{ color: 'blue', cursor: 'pointer' }} onClick={() => toPersonDetail(record.personId)} >{record.visitNum}</span>,
+        },
+        {
+            title: '最后访问时间',
+            dataIndex: 'reportDate',
+            key: 'reportDate',
+            align: 'center',
+            render: (_, record) => <><span>{record.reportDate && moment(record.reportDate).format('YYYY-MM-DD HH:mm:ss')}</span></>,
+        },
+
+    ];
+
+    return (
+
+        <>
+            <Button type="danger" style={{ marginLeft: '18px' }} onClick={() => router.go(-1)}>返回</Button>
+            <Table rowKey={record => (record.phone + record.buildingId || '')}
+                style={{ marginTop: '30px' }}
+                dataSource={data.records}
+                columns={columns}
+                pagination={false}
+            />
+            < div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+                <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
+            </div>
+        </>
+    )
+}
+const WrappedHeader = Form.create({ name: 'record' })(record);
+
+export default WrappedHeader

src/services/apis.js

@@ -399,6 +399,11 @@ export default {
       url: `${prefix}/selectNewsUserCount`,
       action: 'selectNewsUserCount',
     },
+    changeNewUser: {
+      method: 'GET',
+      url: `${prefix}/changeNewsUserCount`,
+      action: 'selectNewsUserCount',
+    },
     userConversion: {
       method: 'GET',
       url: `${prefix}/selectConversion`,
@@ -419,8 +424,11 @@ export default {
       url: `${prefix}/listNoticeByCondition`,
       action: 'listNoticeByCondition',
     },
-
-
+    exportIntentionUsers: {
+      method: 'GET',
+      url: `${prefix}/exportIntentionUser`,
+      action: 'exportIntentionUser',
+    },
   },
   activity: {
     list: {
@@ -1425,27 +1433,27 @@ export default {
     },
   },
   taH5SampleManager: {
-    taH5Demand:{
+    taH5Demand: {
       url: `${prefix}/taH5Demand`,
       method: 'GET',
       action: 'admin.taH5Demand.get',
     },
-    addTaH5Demand:{
+    addTaH5Demand: {
       url: `${prefix}/taH5Demand`,
       method: 'POST',
       action: 'admin.taH5Demand.get',
     },
-    taH5DemandById:{
+    taH5DemandById: {
       url: `${prefix}/taH5Demand/:id`,
       method: 'GET',
       action: 'admin.taH5Demand.get',
     },
-    updateH5DemandById:{
+    updateH5DemandById: {
       url: `${prefix}/taH5Demand/:id`,
       method: 'PUT',
       action: 'admin.taH5Demand.get',
     },
-    batchDelDemands:{
+    batchDelDemands: {
       url: `${prefix}/batchDelTaH5Demands`,
       method: 'PUT',
       action: 'admin.taH5Demand.get',
@@ -1562,7 +1570,7 @@ export default {
       url: `${prefix}/taContractTemplate/:id`,
       action: 'admin.getContractTemplate.get',
     },
-   
+
   },
   manage: {
     list: {
@@ -1581,7 +1589,7 @@ export default {
       action: 'admin.contract.id.put',
     },
   },
-  activityDataStatis:{
+  activityDataStatis: {
     total: {
       method: 'GET',
       url: `${prefix}/activityStatistical/total`,
@@ -1614,6 +1622,42 @@ export default {
       url: `${prefix}/stats/tableList`,
       action: 'admin.contract.list.get',
     },
+    consultantKPI: {
+      method: 'GET',
+      url: `${prefix}/stats/consultant/kpi`,
+      action: 'admin.contract.list.get',
+    },
+    exportConsultantKPI: {
+      method: 'POST',
+      url: `${prefix}/stats/consultant/kpi`,
+      action: 'admin.contract.list.post',
+    },
+    totalPersons: { // 客户总计
+      method: 'GET',
+      url: `${prefix}/stats/consultant/customer`,
+      action: 'admin.contract.list.get',
+    },
+    sharePersons: { // 分享拓客
+      method: 'GET',
+      url: `${prefix}/stats/consultant/share/customer`,
+      action: 'admin.contract.list.get',
+    },
+    homePagePersons: { // 主页访问人数
+      method: 'GET',
+      url: `${prefix}/stats/consultant/homepage/persons`,
+      action: 'admin.contract.list.get',
+    },
+    homePageNums: { // 主页访问次数
+      method: 'GET',
+      url: `${prefix}/stats/consultant/homepage/times`,
+      action: 'admin.contract.list.get',
+    },
+    chatPersons: { // 咨询数
+      method: 'GET',
+      url: `${prefix}/stats/consultant/chat/persons`,
+      action: 'admin.contract.list.get',
+    },
+
     buildingExport: {
       method: 'GET',
       url: `${prefix}/stats/buildingExport`,