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: '图表管理',
@@ -599,7 +608,7 @@ export default [
               },
               {
                 path: '/statistical/consultant/homePagePersons',
-                name: '主页访问次数',
+                name: '主页访问人数',
                 hideInMenu: true,
                 component: './statistical/consultant/homePagePersons',
               },

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/statistical/activity/compenents/NewUsers.jsx

@@ -19,8 +19,6 @@ const NewUsers = (props) => {
 
   useEffect(() => {
     NewsUserCount({
-      // startDate: `${moment(props.startDate).format('YYYY-MM-DD HH:mm:ss')}`, 
-      // endDate: `${moment(props.endDate).format('YYYY-MM-DD HH:mm:ss')}`, 
       startDate: props.startDate, 
       endDate: props.endDate, 
       buildingId: props.buildingId, 

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

@@ -25,45 +25,75 @@ let tableTitle = ['类型']
 let columns = [
   {
     title: '日期',
-    dataIndex: 'createTime',
-    key: 'createTime',
+    dataIndex: 'date',
+    key: 'date',
   },
   {
     title: '分享人数',
     dataIndex: 'sharePersonNum',
     key: 'sharePersonNum',
+    sorter: true,
   },
   {
     title: '分享次数',
     dataIndex: 'shareNum',
     key: 'shareNum',
+    sorter: true,
   },
   {
     title: '访问人数',
     dataIndex: 'visitPersonNum',
     key: 'visitPersonNum',
+    sorter: true,
   },
   {
     title: '访问次数',
     dataIndex: 'visitNum',
     key: 'visitNum',
+    sorter: true,
   },
   {
     title: '新增注册用户',
     dataIndex: 'addRegistNum',
     key: 'addRegistNum',
+    sorter: true,
   },
 ]
 
 
+function getDayBegin(dt) {
+  return moment(dt, 'day').hours(0).minutes(0).seconds(0).milliseconds(0).toDate();
+}
+
+
+function getDayEnd(dt) {
+  return moment(dt, 'day').hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
+}
+
+
 class OverView extends React.Component {
 
   constructor(props) {
     super(props)
+
+    const defaultDays = 7
+
     this.state = {
+      radioVal: defaultDays,
+      formData: {
+        startDate: moment().subtract(7, 'day').toDate(),
+        endDate: new Date,
+        buildingId: '',
+        targetType: '',
+        pageNum:'',
+        pageSize:'',
+        sort:null,
+        colKey:null
+      },
       personData: [],  
       dataSoures: [],
       tableData: [],
+      barData: {},
       userType: 'all',
       endDate: '',
       startDate: '',
@@ -74,11 +104,13 @@ class OverView extends React.Component {
 
   componentDidMount() {
     this.getList()
+    this.getTableList()
   }
 
-  getList (params) {
-    console.log("params",params);
-    request({ ...apis.activityDataStatis.total, params: { ...params } }).then(res => {
+  getList () {
+    console.log('getlist')
+    const { formData } = this.state
+    request({ ...apis.activityDataStatis.total, params: formData }).then(res => {
       this.setState({ personData: res })
     }).catch(err => {
       <Alert
@@ -92,6 +124,25 @@ class OverView extends React.Component {
     })
   }
 
+  getTableList () {
+    const { formData } = this.state
+    request({ ...apis.activityDataStatis.tableData, params: formData }).then(data => {
+      console.log(data)
+      this.setState({ tableData: data.records, total: data.total})
+    }).catch()
+  }
+
+  getBarData = (startDate, endDate) => {
+    console.log(startDate, 'startDate')
+    console.log(endDate, 'endDate')
+    request({
+      ...apis.activityDataStatis.selectAllActivityUser,
+      params: { startDate, endDate }
+    }).then((data) => {
+      this.setState({barData: data})
+    })
+  }
+
   formatDate = (start, end) => {
     const tempStartDate = `${moment(start).format('YYYY-MM-DDT00:00:00.000')}Z`
     const tempEndDate = `${moment(end).format('YYYY-MM-DDT23:59:59.999')}Z`
@@ -104,7 +155,6 @@ class OverView extends React.Component {
   }
 
   handleSubmit = (e, props) => {
-    console.log(this.props.form.getFieldValue("startDate"), 'eeeeeee')
     let startDate = null
     let endDate = null
     const buildingId = this.props.form.getFieldValue("buildingId");
@@ -115,12 +165,16 @@ class OverView extends React.Component {
     if (this.props.form.getFieldValue("endDate") != undefined){
       endDate = this.props.form.getFieldValue("endDate").toDate()
     }
-    e.preventDefault();
-    props.form.validateFields((err, values) => {
-        if (!err) {
-          this.getList({buildingId: buildingId, targetType: targetType, startDate: startDate, endDate: endDate})
-        }
-      });
+    const { formData } = this.state
+    this.setState({
+      formData: {
+        ...formData,
+        startDate: startDate,
+        endDate: endDate,
+        buildingId: buildingId,
+        targetType: targetType
+      }
+    }, this.getAllList)
     this.setState({ startDate: startDate, endDate: endDate, buildingId: this.props.form.getFieldValue("buildingId"), targetType: this.props.form.getFieldValue("targetType") })
   }
 
@@ -129,8 +183,23 @@ class OverView extends React.Component {
     this.props.form.resetFields()
   }
 
+  exportActivityStats = () => {
+    const { formData } = this.state
+    request({ ...apis.activityDataStatis.tableDataExport, 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()
+  }
+
   getDataOf = (days) => {
-    console.log(77777777)
     this.setState({ endDate: new Date(), startDate: moment().subtract(days, 'day').toDate() })
     this.getList({ endDate: new Date(), startDate: moment().subtract(days, 'day').toDate() })
   }
@@ -179,15 +248,49 @@ class OverView extends React.Component {
 
   }
 
-  handleSelectChange = (e) => {
-    this.setState({ userType: e }, () => {
-      this.onTabledatas(this.state.dataSoures)
-    })
+  //排序
+  handleTableChange = (pagination, filters, sorter) => {
+    console.log(pagination, filters, sorter)
+    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.getAllList)
+  };
+
+  getAllList(){
+    this.getList()
+    this.getTableList()
+  }
+
+  handleRadioChange = (e) => {
+    const { formData } = this.state
+    const val = e.target.value;
+    this.setState({
+      radioVal: val - 0,
+      formData: {
+        ...formData,
+        startDate: moment().subtract(val, 'day').toDate(),
+        endDate: new Date,
+      }
+    }, this.getAllList)
   }
 
 
   render() {
+    const { radioVal } = this.state
     const { getFieldDecorator } = this.props.form;
+    const startDate = this.state.formData.startDate
+    const endDate = this.state.formData.endDate
 
     return (
     <>
@@ -198,19 +301,23 @@ class OverView extends React.Component {
         borderRadius: '12px',
         minHeight: '60vh'
       }}>
-        <Radio.Group buttonStyle="solid" defaultValue="a">
-          <Radio.Button value="c" onClick={() => this.getDataOf(1)}>今日</Radio.Button>
-          <Radio.Button value="a" onClick={() => this.getDataOf(7)}>最近7天</Radio.Button>
-          <Radio.Button value="b" onClick={() => this.getDataOf(30)}>最近1月</Radio.Button>
+        <Radio.Group buttonStyle="solid" value={radioVal} onChange={this.handleRadioChange}>
+          <Radio.Button value={0}>今日</Radio.Button>
+          <Radio.Button value={7}>最近7天</Radio.Button>
+          <Radio.Button value={30}>最近1月</Radio.Button>
         </Radio.Group>
         <Form layout="inline" onSubmit={e => this.handleSubmit(e, this.props)}>
             <Form.Item style={{marginTop:'20px', marginBottom:'20px'}}>
-            {getFieldDecorator('startDate')(
+            {getFieldDecorator('startDate', {initialValue: moment(startDate)
+              
+            })(
                 <DatePicker placeholder="开始日期"/>,
             )}
             </Form.Item>
             <Form.Item style={{marginTop:'20px', marginBottom:'20px'}}>
-            {getFieldDecorator('endDate')(
+            {getFieldDecorator('endDate', {initialValue: moment(endDate)
+              
+            })(
                 <DatePicker placeholder="结束日期"/>,
             )}
             </Form.Item>
@@ -274,15 +381,15 @@ class OverView extends React.Component {
           
             <div style={{ display: 'flex' }}>
                 <div className={style.bar}>
-                    <NewUsers startDate={this.state.startDate} endDate={this.state.endDate} buildingId={this.state.buildingId} targetType={this.state.targetType} dataZoom={false}></NewUsers>
+                    <NewUsers startDate={this.state.formData.startDate} endDate={this.state.formData.endDate} buildingId={this.state.buildingId} targetType={this.state.targetType} dataZoom={false}></NewUsers>
                 </div>
             </div >
             <AuthButton name="admin.customer.import" noRight={null}>
-            <Button type="primary" style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
+            <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={false} scroll={{ y: 500 }}></Table>
+          <Table style={{marginTop:'20px'}} dataSource={this.state.tableData} columns={columns} pagination={{ total: this.state.total}} onChange={this.handleTableChange} scroll={{ y: 500 }}></Table>
         </div>
       </div>
     </>

src/pages/statistical/consultant/homePagePersons.jsx

@@ -30,7 +30,7 @@ function record(props) {
 
     // 查询列表
     const getList = (params) => {
-        request({ ...apis.stats.totalPersons, params: { ...params }, }).then((data) => {
+        request({ ...apis.stats.homePagePersons, params: { ...params }, }).then((data) => {
             setData(data)
         })
     }
@@ -83,17 +83,17 @@ function record(props) {
         },
         {
             title: '访问次数',
-            dataIndex: 'verifyStatus',
-            key: 'verifyStatus',
+            dataIndex: 'visitTimes',
+            key: 'visitTimes',
             align: 'center',
-            render: (_, record) => <span style={{ color: 'blue', cursor: 'pointer' }} onClick={() => toPersonDetail(record.personId)} >{record.verifyStatus}</span>,
+            render: (_, record) => <span style={{ color: 'blue', cursor: 'pointer' }} onClick={() => toPersonDetail(record.personId)} >{record.visitTimes}</span>,
         },
         {
             title: '最后访问时间',
-            dataIndex: 'reportDate',
-            key: 'reportDate',
+            dataIndex: 'visitTime',
+            key: 'visitTime',
             align: 'center',
-            render: (_, record) => <><span>{record.reportDate && moment(record.reportDate).format('YYYY-MM-DD HH:mm:ss')}</span></>,
+            render: (_, record) => <><span>{record.visitTime && moment(record.visitTime).format('YYYY-MM-DD HH:mm:ss')}</span></>,
         },
 
     ];

src/pages/statistical/consultant/index.jsx

@@ -146,6 +146,17 @@ function record(props) {
                     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',
@@ -156,6 +167,39 @@ function record(props) {
                     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',
+                },
+            });
         }
 
     }
@@ -231,7 +275,7 @@ function record(props) {
             key: 'sharePersons',
             align: 'center',
             sorter: (a, b) => a.sharePersons - b.sharePersons,
-            render: (txt, record, index) => clickCon(txt, record),
+            render: (txt, record, index) => clickCon(txt, record, 'sharePersons'),
         },
         {
             title: '主页访问人数',
@@ -247,7 +291,7 @@ function record(props) {
             key: 'homePageNums',
             align: 'center',
             sorter: (a, b) => a.homePageNums - b.homePageNums,
-            render: (txt, record, index) => clickCon(txt, record),
+            render: (txt, record, index) => clickCon(txt, record, 'homePageNums'),
         },
         {
             title: '咨询数',
@@ -255,7 +299,7 @@ function record(props) {
             key: 'chatPersons',
             align: 'center',
             sorter: (a, b) => a.chatPersons - b.chatPersons,
-            render: (txt, record, index) => clickCon(txt, record),
+            render: (txt, record, index) => clickCon(txt, record, 'chatPersons'),
         },
         {
             title: '点赞数',
@@ -263,7 +307,7 @@ function record(props) {
             key: 'favorNum',
             align: 'center',
             sorter: (a, b) => a.favorNum - b.favorNum,
-            render: (txt, record, index) => clickCon(txt, record),
+            render: (txt, record, index) => clickCon(txt, record, 'favorNum'),
         },
     ];
     // 下载文档

src/pages/statistical/consultant/sharetable.jsx

@@ -5,6 +5,50 @@ import moment from 'moment';
 import apis from '../../../services/apis';
 import request from '../../../utils/request'
 
+const typeList = [
+    {
+        label: '报名活动',
+        value: 'activity'
+    },
+    {
+        label: '助力活动',
+        value: 'help'
+    },
+    {
+        label: '拼团活动',
+        value: 'group'
+    },
+    {
+        label: 'H5活动',
+        value: 'h5'
+    },
+    {
+        label: '直播活动',
+        value: 'live'
+    },
+    {
+        label: '房源列表',
+        value: 'house'
+    },
+    {
+        label: '项目',
+        value: ' project'
+    },
+    {
+        label: '资讯',
+        value: 'news'
+    },
+    {
+        label: '首页',
+        value: 'mian'
+    },
+]
+
+
+function getType(type) {
+    return typeList.filter(t => t.value === type)[0].label
+}
+
 /**
   @param {*} props
   @returns
@@ -28,7 +72,7 @@ function record(props) {
 
     // 查询列表
     const getList = (params) => {
-        request({ ...apis.stats.totalPersons, params: { ...params }, }).then((data) => {
+        request({ ...apis.stats.shareNum, params: { ...params }, }).then((data) => {
             setData(data)
         })
     }
@@ -43,17 +87,16 @@ function record(props) {
         e.preventDefault();
         props.form.validateFields((err, values) => {
             if (!err) {
-                console.log('提交数据: ', values)
-
+                console.log('提交数据: ', values, { ...formData, ...values })
+                getList({ ...formData, ...values });
             }
         });
-        // getList(formData);
     }
     // 更新页码
     const changePageNum = (pageNumber) => {
         props.form.validateFields((err, values) => {
             if (!err) {
-                getList({ ...formData, pageNum: pageNumber });
+                getList({ ...formData, pageNum: pageNumber, ...values });
             }
         });
     }
@@ -67,6 +110,7 @@ function record(props) {
             dataIndex: 'intention',
             key: 'intention',
             align: 'center',
+            render: (_, record) => <><span>{() => getType(record.targetType)}{record.targetName}</span></>
         },
         {
             title: '分享时间',
@@ -86,22 +130,16 @@ function record(props) {
             <Form layout="inline">
                 <div style={{ display: 'flex', alignItems: 'center' }}>
                     <Form.Item>
-                        {getFieldDecorator('eventType')(
+                        {getFieldDecorator('targetType')(
                             <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>
+                                {typeList.map((item, index) => (
+                                    <Option key={index} value={item.value}>{item.label}</Option>
+                                ))}
                             </Select>
                         )}
                     </Form.Item>
                     <Form.Item>
-                        {getFieldDecorator('activityName')(
+                        {getFieldDecorator('targetName')(
                             <Input
                                 prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
                                 placeholder="分享标题"

src/pages/statistical/consultant/table.jsx

@@ -29,10 +29,30 @@ function record(props) {
     }, [])
 
     // 查询列表
+    const typeTag = props.location.query.type || ''
+
     const getList = (params) => {
-        request({ ...apis.stats.totalPersons, params: { ...params }, }).then((data) => {
-            setData(data)
-        })
+        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)
+            })
+        }
+
     }
 
     // 更新页码
@@ -51,9 +71,8 @@ function record(props) {
             },
         });
     }
-    // 表格数据
-    const columns = [
 
+    const basicColunms = [
         {
             title: '头像',
             dataIndex: 'picture',
@@ -81,15 +100,40 @@ function record(props) {
             align: 'center',
             render: (_, record) => <span>{record.sex == 1 ? '男' : '女'}</span>,
         },
+    ]
+
+    // 表格数据
+    const lastColum = typeTag == 'homePageNums' ? [
         {
-            title: '报备时间',
-            dataIndex: 'reportDate',
-            key: 'reportDate',
+            title: '访问时间',
+            dataIndex: 'visitTime',
+            key: 'visitTime',
             align: 'center',
-            render: (_, record) => <><span>{record.reportDate && moment(record.reportDate).format('YYYY-MM-DD HH:mm:ss')}</span></>,
+            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 (
 

src/services/apis.js

@@ -1594,7 +1594,7 @@ export default {
       action: 'admin.contract.id.put',
     },
   },
-  activityDataStatis:{
+  activityDataStatis: {
     total: {
       method: 'GET',
       url: `${prefix}/activityStatistical/total`,
@@ -1602,9 +1602,19 @@ export default {
     },
     selectAllActivityUser: {
       method: 'GET',
-      url: `${prefix}/selectAllActivityUser`,
+      url: `${prefix}/activityStatistical/selectAllActivityUser`,
       action: 'admin.contract.list.get',
     },
+    tableData: {
+      method: 'GET',
+      url: `${prefix}/activityStatistical/selectTableData`,
+      action: 'admin.contract.list.get',
+    },
+    tableDataExport: {
+      method: 'GET',
+      url: `${prefix}/activityStatistical/tableDataExport`,
+      action: 'admin.contract.list.get',
+    }
   },
   stats: {
     barList: {
@@ -1627,10 +1637,35 @@ export default {
       url: `${prefix}/stats/consultant/kpi`,
       action: 'admin.contract.list.post',
     },
-    totalPersons: { // 客户总计
+    totalPersons: { // 客户总计 //新增用户
       method: 'GET',
       url: `${prefix}/stats/consultant/customer`,
-      action: 'admin.contract.list.post',
+      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',
+    },
+    shareNum: { // 分享次数
+      method: 'GET',
+      url: `${prefix}/stats/consultant/share/targets`,
+      action: 'admin.contract.list.get',
     },
 
     buildingExport: {