新需求

config/routes.js

@@ -570,10 +570,16 @@ export default [
               },
               {
                 path: '/statistical/activity/visitNum',
-                name: '分享统计',
+                name: '访问统计',
                 hideInMenu: true,
                 component: './statistical/activity/visitNum',
               },
+              {
+                path: '/statistical/activity/visitPersonNum',
+                name: '访问统计',
+                hideInMenu: true,
+                component: './statistical/activity/visitPersonNum',
+              },
               {
                 path: '/statistical/building',
                 name: '项目统计',

src/pages/statistical/activity/addRegistNum.jsx

@@ -42,11 +42,6 @@ let columns = [
     dataIndex: 'province',
     key: 'province',
   },
-  {
-    title: '归属地',
-    dataIndex: 'province',
-    key: 'province',
-  },
   {
     title: '来源渠道',
     dataIndex: 'personFrom',
@@ -78,8 +73,15 @@ class SharePersonNum extends React.Component {
 
   constructor(props) {
     super(props)
-    const startDate = moment(props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).toDate();
-    const endDate = moment(props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
+    let startDate;
+    let endDate;
+    if (props.location.query.queryDate){
+      startDate = moment(props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).toDate();
+      endDate = moment(props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
+    }else{
+      startDate = moment(props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).toDate();
+      endDate = moment(props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
+    }
     console.log(startDate)
     this.state = {
       formData: {
@@ -87,7 +89,9 @@ class SharePersonNum extends React.Component {
         pageNum:'',
         pageSize:'',
         startDate: startDate,
-        endDate: endDate
+        endDate: endDate,
+        activityId: props.location.query.activityId,
+        activityType:props.location.query.activityType  
       },
       personData: [],  
       dataSoures: [],

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

@@ -21,6 +21,95 @@ const formItemLayout = {
   
 let daterange = []
 let tableTitle = ['类型']
+let dateType = ''
+
+const toSharePersonNum = rowData => () => {
+  const startDate = moment().subtract(dateType, 'day').toDate()
+  const endDate = new Date()
+
+  if(rowData) {
+    router.push({
+    pathname: '/statistical/activity/sharePersonNum',
+    query: {
+      startDate: startDate,
+      endDate: endDate,
+      activityId: rowData.activityId,
+      activityType: rowData.activityType,
+    },
+  });
+    return
+  }
+}
+
+const toShareNum = rowData => () => {
+  const startDate = moment().subtract(dateType, 'day').toDate()
+  const endDate = new Date()
+  if(rowData) {
+    router.push({
+    pathname: '/statistical/activity/shareNum',
+    query: {
+      startDate: startDate,
+      endDate: endDate,
+      activityId: rowData.activityId,
+      activityType: rowData.activityType,
+    },
+  });
+    return
+  }
+} 
+
+const toAddRegistNum = rowData => () => {
+  const startDate = moment().subtract(dateType, 'day').toDate()
+  const endDate = new Date()
+  console.log(rowData, 'rowData')
+  if(rowData) {
+    router.push({
+    pathname: '/statistical/activity/addRegistNum',
+    query: {
+      startDate: startDate,
+      endDate: endDate,
+      activityId: rowData.activityId,
+      activityType: rowData.activityType,
+    },
+  });
+    return
+  }
+} 
+
+const toAddVisitNum = rowData => () => {
+  const startDate = moment().subtract(dateType, 'day').toDate()
+  const endDate = new Date()
+  console.log(rowData, 'rowData')
+  if(rowData) {
+    router.push({
+    pathname: '/statistical/activity/visitNum',
+    query: {
+      startDate: startDate,
+      endDate: endDate,
+      activityId: rowData.activityId,
+      activityType: rowData.activityType,
+    },
+  });
+    return
+  }
+} 
+
+const toAddVisitPersonNum = rowData => () => {
+  const startDate = moment().subtract(dateType, 'day').toDate()
+  const endDate = new Date()
+  if(rowData) {
+    router.push({
+    pathname: '/statistical/activity/visitPersonNum',
+    query: {
+      startDate: startDate,
+      endDate: endDate,
+      activityId: rowData.activityId,
+      activityType: rowData.activityType,
+    },
+  });
+    return
+  }
+}
 
 let columns = [
   {
@@ -45,30 +134,45 @@ let columns = [
     dataIndex: 'sharePersonNum',
     key: 'sharePersonNum',
     sorter: true,
+    render: (text, record) => (
+      <a style={{ color: '#66B3FF' }} onClick={toSharePersonNum(record)}><span>{record.sharePersonNum}</span></a>
+    ),
   },
   {
     title: '分享次数',
     dataIndex: 'shareNum',
     key: 'shareNum',
     sorter: true,
+    render: (text, record) => (
+      <a style={{ color: '#66B3FF' }} onClick={toShareNum(record)}><span>{record.shareNum}</span></a>
+    ),
   },
   {
     title: '访问人数',
     dataIndex: 'visitPersonNum',
     key: 'visitPersonNum',
     sorter: true,
+    render: (text, record) => (
+      <a style={{ color: '#66B3FF' }} onClick={toAddVisitPersonNum(record)}><span>{record.visitPersonNum}</span></a>
+    ),
   },
   {
     title: '访问次数',
     dataIndex: 'visitNum',
     key: 'visitNum',
     sorter: true,
+    render: (text, record) => (
+      <a style={{ color: '#66B3FF' }} onClick={toAddVisitNum(record)}><span>{record.visitNum}</span></a>
+    ),
   },
   {
     title: '新增注册用户',
     dataIndex: 'addRegistNum',
     key: 'addRegistNum',
     sorter: true,
+    render: (text, record) => (
+      <a style={{ color: '#66B3FF' }} onClick={toAddRegistNum(record)}><span>{record.addRegistNum}</span></a>
+    ),
   },
   {
     title: '详情',
@@ -96,10 +200,12 @@ class OverView extends React.Component {
     super(props)
 
     const defaultDays = 7
-
+    dateType = defaultDays
+    console.log(dateType)
     this.state = {
       radioVal: defaultDays,
       formData: {
+        
         startDate: moment().subtract(7, 'day').toDate(),
         endDate: new Date,
         buildingId: '',
@@ -221,6 +327,7 @@ class OverView extends React.Component {
   handleRadioChange = (e) => {
     const { formData } = this.state
     const val = e.target.value;
+    dateType = val;
     this.setState({
       radioVal: val - 0,
       formData: {

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

@@ -74,6 +74,20 @@ const toAddVisitNum = rowData => () => {
   }
 } 
 
+const toAddVisitPersonNum = rowData => () => {
+  console.log(rowData, 'rowData')
+  if(rowData) {
+    router.push({
+    pathname: '/statistical/activity/visitPersonNum',
+    query: {
+      queryDate: rowData.date,
+    },
+  });
+    return
+  }
+}
+
+
 let columns = [
   {
     title: '日期',
@@ -104,7 +118,7 @@ let columns = [
     key: 'visitPersonNum',
     sorter: true,
     render: (text, record) => (
-      <a style={{ color: '#66B3FF' }}><span>{record.visitPersonNum}</span></a>
+      <a style={{ color: '#66B3FF' }} onClick={toAddVisitPersonNum(record)}><span>{record.visitPersonNum}</span></a>
       ),
   },
   {

src/pages/statistical/activity/shareNum.jsx

@@ -59,9 +59,16 @@ class SharePersonNum extends React.Component {
 
   constructor(props) {
     super(props)
-    const startDate = moment(props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).toDate();
-    const endDate = moment(props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
-    console.log(startDate)
+    console.log(props)
+    let startDate;
+    let endDate;
+    if (props.location.query.queryDate){
+      startDate = moment(props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).toDate();
+      endDate = moment(props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
+    }else{
+      startDate = moment(props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).toDate();
+      endDate = moment(props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
+    }
     this.state = {
       formData: {
         sharePhone: '',
@@ -72,7 +79,9 @@ class SharePersonNum extends React.Component {
         sort:null,
         colKey:null,
         startDate: startDate,
-        endDate: endDate
+        endDate: endDate,
+        activityId: props.location.query.activityId,
+        activityType:props.location.query.activityType   
       },
       personData: [],  
       dataSoures: [],

src/pages/statistical/activity/sharePersonNum.jsx

@@ -65,8 +65,17 @@ class SharePersonNum extends React.Component {
 
   constructor(props) {
     super(props)
-    const startDate = moment(props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).toDate();
-    const endDate = moment(props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
+    let startDate;
+    let endDate;
+    console.log(props)
+    if (props.location.query.queryDate){
+      startDate = moment(props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).toDate();
+      endDate = moment(props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
+    }else{
+      startDate = moment(props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).toDate();
+      endDate = moment(props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
+    }
+    
     console.log(startDate)
     this.state = {
       formData: {
@@ -78,7 +87,9 @@ class SharePersonNum extends React.Component {
         sort:null,
         colKey:null,
         startDate: startDate,
-        endDate: endDate
+        endDate: endDate,
+        activityId: props.location.query.activityId,
+        activityType:props.location.query.activityType        
       },
       personData: [],  
       dataSoures: [],

src/pages/statistical/activity/visitNum.jsx

@@ -42,11 +42,6 @@ let columns = [
     dataIndex: 'province',
     key: 'province',
   },
-  {
-    title: '归属地',
-    dataIndex: 'province',
-    key: 'province',
-  },
   {
     title: '来源渠道',
     dataIndex: 'personFrom',
@@ -84,8 +79,15 @@ class SharePersonNum extends React.Component {
 
   constructor(props) {
     super(props)
-    const startDate = moment(props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).toDate();
-    const endDate = moment(props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
+    let startDate;
+    let endDate;
+    if (props.location.query.queryDate){
+      startDate = moment(props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).toDate();
+      endDate = moment(props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
+    }else{
+      startDate = moment(props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).toDate();
+      endDate = moment(props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
+    }
     console.log(startDate)
     this.state = {
       formData: {
@@ -96,7 +98,9 @@ class SharePersonNum extends React.Component {
         endDate: endDate,
         province:'',
         realtyConsultant:'',
-        realtyConsultantPhone:''
+        realtyConsultantPhone:'',
+        activityId: props.location.query.activityId,
+        activityType:props.location.query.activityType  
       },
       personData: [],  
       dataSoures: [],
@@ -124,6 +128,7 @@ class SharePersonNum extends React.Component {
     let startDate = null
     let endDate = null
     const province = this.props.form.getFieldValue("province");
+    const personFrom = this.props.form.getFieldValue("personFrom");
     const realtyConsultant = this.props.form.getFieldValue("realtyConsultant");
     const realtyConsultantPhone = this.props.form.getFieldValue("realtyConsultantPhone");
 
@@ -132,8 +137,9 @@ class SharePersonNum extends React.Component {
       formData: {
         ...formData,
         personFrom: personFrom,
+        province: province,
         realtyConsultant: realtyConsultant,
-        realtyConsultant: realtyConsultant
+        realtyConsultantPhone: realtyConsultantPhone
       }
     }, this.getTableList)
   }
@@ -145,7 +151,7 @@ class SharePersonNum extends React.Component {
 
   exportActivityStats = () => {
     const { formData } = this.state
-    request({ ...apis.activityDataStatis.activityAddRegistNumExport, params: formData }).then(data => {
+    request({ ...apis.activityDataStatis.activityVisitNumExport, params: formData }).then(data => {
       if (!data) {
         return
       }
@@ -153,7 +159,7 @@ class SharePersonNum extends React.Component {
         const link = document.createElement('a')
         link.style.display = 'none'
         link.href = url
-        link.setAttribute('download', '分享统计.xlsx')
+        link.setAttribute('download', '访问统计.xlsx')
         document.body.append(link)
         link.click()
     }).catch()

src/pages/statistical/activity/visitPersonNum.jsx

@@ -0,0 +1,223 @@
+import React, { Component, useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Modal, Descriptions } from 'antd';
+import moment from 'moment';
+import style from './compenents/style.less';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import router from 'umi/router';
+import AuthButton from '@/components/AuthButton';
+import BuildingSelect from '@/components/SelectButton/BuildSelect';
+import WxDictSelect from '@/components/SelectButton/WxDictSelect';
+
+
+const { RangePicker } = DatePicker;
+const { Option } = Select
+
+const formItemLayout = {
+    labelCol: { span: 10},
+    wrapperCol: { span: 14 },
+  };
+  
+let daterange = []
+let tableTitle = ['类型']
+
+let columns = [
+  {
+    title: '姓名',
+    dataIndex: 'nickName',
+    key: 'nickName',
+  },
+  {
+    title: '电话',
+    dataIndex: 'phone',
+    key: 'phone',
+  },
+  {
+    title: '性别',
+    dataIndex: 'gender',
+    key: 'gender',
+  },
+  {
+    title: '归属地',
+    dataIndex: 'province',
+    key: 'province',
+  },
+  {
+    title: '来源渠道',
+    dataIndex: 'personFrom',
+    key: 'personFrom',
+  },
+  {
+    title: '置业顾问',
+    dataIndex: 'realtyConsultant',
+    key: 'realtyConsultant',
+  },
+  {
+    title: '置业顾问电话',
+    dataIndex: 'realtyConsultantPhone',
+    key: 'realtyConsultantPhone',
+  },
+  {
+    title: '分享者',
+    dataIndex: 'sharePersonName',
+    key: 'sharePersonName',
+  },
+  {
+    title: '分享者电话',
+    dataIndex: 'sharePersonPhone',
+    key: 'sharePersonPhone',
+  },
+  {
+    title: '访问次数',
+    dataIndex: 'visitNum',
+    key: 'visitNum',
+  },
+]
+
+class SharePersonNum extends React.Component {
+
+  constructor(props) {
+    super(props)
+    let startDate;
+    let endDate;
+    if (props.location.query.queryDate){
+      startDate = moment(props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).toDate();
+      endDate = moment(props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
+    }else{
+      startDate = moment(props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).toDate();
+      endDate = moment(props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
+    }
+    console.log(startDate)
+    this.state = {
+      formData: {
+        personFrom: '',
+        pageNum:'',
+        pageSize:'',
+        startDate: startDate,
+        endDate: endDate,
+        province:'',
+        realtyConsultant:'',
+        realtyConsultantPhone:'',
+        activityId: props.location.query.activityId,
+        activityType:props.location.query.activityType  
+      },
+      personData: [],  
+      dataSoures: [],
+      tableData: [],
+      userType: 'all',
+      buildingId: [],
+      targetType: []
+    }
+  }
+
+  componentDidMount() {
+    this.getTableList()
+  }
+
+  getTableList () {
+    const { formData } = this.state
+    console.log(formData)
+    request({ ...apis.activityDataStatis.activityVisitPersonNum, params: formData }).then(data => {
+      console.log(data)
+      this.setState({ tableData: data.records, total: data.total})
+    }).catch()
+  }
+
+  handleSubmit = (e, props) => {
+    let startDate = null
+    let endDate = null
+    const province = this.props.form.getFieldValue("province");
+    const personFrom = this.props.form.getFieldValue("personFrom");
+    const realtyConsultant = this.props.form.getFieldValue("realtyConsultant");
+    const realtyConsultantPhone = this.props.form.getFieldValue("realtyConsultantPhone");
+
+    const { formData } = this.state
+    this.setState({
+      formData: {
+        ...formData,
+        personFrom: personFrom,
+        province: province,
+        realtyConsultant: realtyConsultant,
+        realtyConsultantPhone: realtyConsultantPhone
+      }
+    }, this.getTableList)
+  }
+
+  //重置搜索
+  handleReset = e => {
+    this.props.form.resetFields()
+  }
+
+  exportActivityStats = () => {
+    const { formData } = this.state
+    request({ ...apis.activityDataStatis.activityVisitPersonNumExport, params: formData }).then(data => {
+      if (!data) {
+        return
+      }
+      const url = window.URL.createObjectURL(new Blob([data]))
+        const link = document.createElement('a')
+        link.style.display = 'none'
+        link.href = url
+        link.setAttribute('download', '访问统计.xlsx')
+        document.body.append(link)
+        link.click()
+    }).catch()
+  }
+
+  //排序
+  handleTableChange = (pagination, filters, sorter) => {
+    console.log(pagination, filters, sorter)
+    const { formData } = this.state
+    this.setState({
+      formData: {
+        ...formData,
+        personFrom: formData.personFrom,
+        pageNum: pagination.current,
+        pageSize: pagination.pageSize
+      }
+    }, this.getTableList)
+  };
+
+  render() {
+    const { radioVal } = this.state
+    const { getFieldDecorator } = this.props.form;
+
+    return (
+    <>
+        <Form layout="inline" onSubmit={e => this.handleSubmit(e, this.props)}>
+        <Form.Item style={{marginTop:'20px', marginBottom:'20px'}}>
+          {getFieldDecorator('personFrom')(
+            <WxDictSelect />,
+          )}
+        </Form.Item>
+        <Form.Item style={{marginTop:'20px', marginBottom:'20px'}}>
+            {getFieldDecorator('province')(<Input placeholder="请输入归属地"/>)}
+        </Form.Item>
+        <Form.Item style={{marginTop:'20px', marginBottom:'20px'}}>
+            {getFieldDecorator('realtyConsultant')(<Input placeholder="置业顾问"/>)}
+        </Form.Item>
+        <Form.Item style={{marginTop:'20px', marginBottom:'20px'}}>
+            {getFieldDecorator('realtyConsultantPhone')(<Input placeholder="置业顾问电话"/>)}
+        </Form.Item>
+          <Form.Item style={{marginTop:'20px', marginBottom:'20px'}}>
+            <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }}>
+                查询
+            </Button>
+            <Button onClick={e => this.handleReset()} style={{ marginLeft: '30px' }}>重置</Button>
+          </Form.Item>
+          </Form>     
+        <div>
+        <AuthButton name="admin.customer.import" noRight={null}>
+            <Button type="primary" style={{ float: 'right', margin: '20px 0', zIndex: 1 }} onClick={this.exportActivityStats}>
+                导出
+            </Button>
+            </AuthButton>
+          <Table style={{marginTop:'20px'}} dataSource={this.state.tableData} columns={columns} pagination={{ total: this.state.total}} onChange={this.handleTableChange} scroll={{ y: 500 }}></Table>
+        </div>
+    </>
+    )
+    
+  }
+}
+const WrappedTypeForm = Form.create()(SharePersonNum);
+export default WrappedTypeForm

src/services/apis.js

@@ -1662,7 +1662,17 @@ export default {
     },
     activityVisitNumExport: {
       method: 'GET',
-      url: `${prefix}/activityStatistical/activityVisitNumExport`,
+      url: `${prefix}/activityStatistical/selectActivityVisitNumExport`,
+      action: 'admin.contract.list.get',
+    },
+    activityVisitPersonNum: {
+      method: 'GET',
+      url: `${prefix}/activityStatistical/selectActivityVisitPersonNum`,
+      action: 'admin.contract.list.get',
+    },
+    activityVisitPersonNumExport: {
+      method: 'GET',
+      url: `${prefix}/activityStatistical/selectActivityVisitPersonNumExport`,
       action: 'admin.contract.list.get',
     },
   },