zls

config/routes.js

@@ -550,6 +550,11 @@ export default [
                 name: '活动统计',
                 component: './statistical/activity'
               },
+              {
+                path: '/statistical/activity/detail',
+                name: '查看详情',
+                component: './statistical/activity/detail'
+              },
               {
                 path: '/statistical/activity/sharePersonNum',
                 name: '分享统计',

src/pages/Index.jsx

@@ -29,32 +29,32 @@ const index = (props) => {
         {
             title: '客户列表',
             img: customerImg,
-            path: '',
+            path: '/customer/customerlist/list',
             value: '2',
         },
         {
             title: '数据报表',
             img: reportImg,
-            path: '',
+            path: '/statistical/monitor',
             value: '3',
         },
 
         {
             title: '项目统计',
             img: projectImg,
-            path: '',
+            path: '/statistical/building',
             value: '4',
         },
         {
             title: '活动统计',
             img: statisticsImg,
-            path: '',
+            path: '/statistical/activity',
             value: '5',
         },
         {
             title: '置业顾问KPI',
             img: consultantImg,
-            path: '',
+            path: '/statistical/consultant',
             value: '6',
         },
 

src/pages/carouselFigure/advertisingList.jsx

@@ -210,6 +210,7 @@ const handleSubmit = (e, props) => {
    //重置搜索
    function handleReset() {
     props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 10, showType: 'screen' });
   }
 
 

src/pages/carouselFigure/carouselFigureList.jsx

@@ -208,6 +208,7 @@ const handleSubmit = (e, props) => {
    //重置搜索
    function handleReset() {
     props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 10, showType: 'banner' });
   }
 
   const { getFieldDecorator } = props.form

src/pages/carouselFigure/propagandaList.jsx

@@ -210,6 +210,7 @@ const handleSubmit = (e, props) => {
    //重置搜索
    function handleReset() {
     props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 10, showType: 'propaganda' });
   }
 
 

src/pages/charts/CityNums.jsx

@@ -40,7 +40,7 @@ const geoOptions = {
   },
 }
 
-const getCityData = fetch(apis.indexEcharts.userCity)
+const getCityData = fetch(apis.indexEcharts.personCity)
 
 const mapDataRange = x => {
   // 映射区间 [1, 100000] => [rangeStart, rangeEnd]

src/pages/news/list/NewsList.jsx

@@ -270,7 +270,7 @@ function body(props) {
   function handleReset() {
     props.form.resetFields();
     localStorage.setItem("newsPageParams",JSON.stringify({ pageNum: 1, pageSize: 6 }));
-    // getList({ pageNum: 1, pageSize: 6 })
+    getList({ pageNum: 1, pageSize: 6 })
   }
 
   function getDate(value, dateString) {

src/pages/statistical/activity/addRegistNum.jsx

@@ -97,8 +97,7 @@ class SharePersonNum extends React.Component {
       dataSoures: [],
       tableData: [],
       userType: 'all',
-      buildingId: [],
-      targetType: []
+      activityName:  props.location.query.activityName
     }
   }
 
@@ -169,6 +168,9 @@ class SharePersonNum extends React.Component {
 
     return (
     <>
+        <div>
+          <span style={{marginLeft:'20px'}}>分享内容：{this.state.activityName}</span>
+        </div>
         <Form layout="inline" onSubmit={e => this.handleSubmit(e, this.props)}>
         <Form.Item style={{marginTop:'20px', marginBottom:'20px'}}>
           {getFieldDecorator('personFrom')(
@@ -183,7 +185,7 @@ class SharePersonNum extends React.Component {
           </Form.Item>
           </Form>     
         <div>
-        <AuthButton name="admin.customer.import" noRight={null}>
+        <AuthButton name="admin.statistical.activity.export" noRight={null}>
             <Button type="primary" style={{ float: 'right', margin: '20px 0', zIndex: 1 }} onClick={this.exportActivityStats}>
                 导出
             </Button>

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

@@ -15,10 +15,10 @@ const { RangePicker } = DatePicker;
 const { Option } = Select
 
 const formItemLayout = {
-    labelCol: { span: 10},
-    wrapperCol: { span: 14 },
-  };
-  
+  labelCol: { span: 10 },
+  wrapperCol: { span: 14 },
+};
+
 let daterange = []
 let tableTitle = ['类型']
 let dateType = ''
@@ -27,7 +27,7 @@ const toSharePersonNum = rowData => () => {
   const startDate = moment().subtract(dateType, 'day').toDate()
   const endDate = new Date()
 
-  if(rowData) {
+  if (rowData) {
     router.push({
     pathname: '/statistical/activity/sharePersonNum',
     query: {
@@ -35,6 +35,7 @@ const toSharePersonNum = rowData => () => {
       endDate: endDate,
       activityId: rowData.activityId,
       activityType: rowData.activityType,
+      activityName: rowData.activityName
     },
   });
     return
@@ -44,7 +45,7 @@ const toSharePersonNum = rowData => () => {
 const toShareNum = rowData => () => {
   const startDate = moment().subtract(dateType, 'day').toDate()
   const endDate = new Date()
-  if(rowData) {
+  if (rowData) {
     router.push({
     pathname: '/statistical/activity/shareNum',
     query: {
@@ -52,17 +53,18 @@ const toShareNum = rowData => () => {
       endDate: endDate,
       activityId: rowData.activityId,
       activityType: rowData.activityType,
+      activityName: rowData.activityName
     },
   });
     return
   }
-} 
+}
 
 const toAddRegistNum = rowData => () => {
   const startDate = moment().subtract(dateType, 'day').toDate()
   const endDate = new Date()
   console.log(rowData, 'rowData')
-  if(rowData) {
+  if (rowData) {
     router.push({
     pathname: '/statistical/activity/addRegistNum',
     query: {
@@ -70,17 +72,18 @@ const toAddRegistNum = rowData => () => {
       endDate: endDate,
       activityId: rowData.activityId,
       activityType: rowData.activityType,
+      activityName: rowData.activityName
     },
   });
     return
   }
-} 
+}
 
 const toAddVisitNum = rowData => () => {
   const startDate = moment().subtract(dateType, 'day').toDate()
   const endDate = new Date()
   console.log(rowData, 'rowData')
-  if(rowData) {
+  if (rowData) {
     router.push({
     pathname: '/statistical/activity/visitNum',
     query: {
@@ -88,16 +91,17 @@ const toAddVisitNum = rowData => () => {
       endDate: endDate,
       activityId: rowData.activityId,
       activityType: rowData.activityType,
+      activityName: rowData.activityName
     },
   });
     return
   }
-} 
+}
 
 const toAddVisitPersonNum = rowData => () => {
   const startDate = moment().subtract(dateType, 'day').toDate()
   const endDate = new Date()
-  if(rowData) {
+  if (rowData) {
     router.push({
     pathname: '/statistical/activity/visitPersonNum',
     query: {
@@ -105,12 +109,34 @@ const toAddVisitPersonNum = rowData => () => {
       endDate: endDate,
       activityId: rowData.activityId,
       activityType: rowData.activityType,
+      activityName: rowData.activityName
     },
   });
     return
   }
 }
 
+const toDetail = rowData => {
+  const startDate = moment().subtract(dateType, 'day').format('YYYY-MM-DD')
+  const endDate = moment().format('YYYY-MM-DD')
+  // const { formData } = this.state
+  if (rowData) {
+    router.push({
+      pathname: '/statistical/activity/detail',
+      query: {
+        startDate: startDate,
+        endDate: endDate,
+        targetId: rowData.activityId,
+        targetType: rowData.activityType,
+        targetName: rowData.activityName,
+        buildingId: '',
+      },
+    });
+  
+    return
+  }
+}
+
 let columns = [
   {
     title: '活动类型',
@@ -178,7 +204,7 @@ let columns = [
     title: '详情',
     align: 'center',
     render: (text, record) => (
-        <a style={{ color: '#66B3FF' }}>查看</a>
+      <a style={{ color: '#66B3FF' }} onClick={() => toDetail(record)}>查看</a>
     ),
   },
 ]
@@ -205,18 +231,18 @@ class OverView extends React.Component {
     this.state = {
       radioVal: defaultDays,
       formData: {
-        
+
         startDate: moment().subtract(7, 'day').toDate(),
         endDate: new Date,
         buildingId: '',
         targetType: '',
-        pageNum:'',
-        pageSize:'',
-        activityName:'',
-        sort:null,
-        colKey:null
+        pageNum: '',
+        pageSize: '',
+        activityName: '',
+        sort: null,
+        colKey: null
       },
-      personData: [],  
+      personData: [],
       dataSoures: [],
       tableData: [],
       barData: {},
@@ -232,11 +258,11 @@ class OverView extends React.Component {
     this.getTableList()
   }
 
-  getTableList () {
+  getTableList() {
     const { formData } = this.state
     request({ ...apis.activityDataStatis.activityDetailTableData, params: formData }).then(data => {
       console.log(data)
-      this.setState({ tableData: data.records, total: data.total})
+      this.setState({ tableData: data.records, total: data.total })
     }).catch()
   }
 
@@ -252,10 +278,10 @@ class OverView extends React.Component {
     const buildingId = this.props.form.getFieldValue("buildingId");
     const targetType = this.props.form.getFieldValue("targetType");
     const activityName = this.props.form.getFieldValue("activityName");
-    if (this.props.form.getFieldValue("startDate") != undefined){
+    if (this.props.form.getFieldValue("startDate") != undefined) {
       startDate = this.props.form.getFieldValue("startDate").toDate()
     }
-    if (this.props.form.getFieldValue("endDate") != undefined){
+    if (this.props.form.getFieldValue("endDate") != undefined) {
       endDate = this.props.form.getFieldValue("endDate").toDate()
     }
     const { formData } = this.state
@@ -284,12 +310,12 @@ class OverView extends React.Component {
         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()
+      const link = document.createElement('a')
+      link.style.display = 'none'
+      link.href = url
+      link.setAttribute('download', '活动统计.xlsx')
+      document.body.append(link)
+      link.click()
     }).catch()
   }
 
@@ -299,7 +325,7 @@ class OverView extends React.Component {
   }
 
   datalist = () => {
-    this.setState({ 
+    this.setState({
       endDate: daterange[1] === '' ? new Date() : daterange[1],
       startDate: daterange[0] === '' ? moment().subtract(7, 'day').toDate() : daterange[0],
     })
@@ -342,19 +368,13 @@ class OverView extends React.Component {
   render() {
     const { radioVal } = this.state
     const { getFieldDecorator } = this.props.form;
-    console.log(this.state.formData,'this.state.formData')
+    console.log(this.state.formData, 'this.state.formData')
     const startDate = this.state.formData.startDate
     const endDate = this.state.formData.endDate
 
     return (
     <>
-      <div style={{
-        backgroundColor: '#fff',
-        padding: '32PX 28px',
-        boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)',
-        borderRadius: '12px',
-        minHeight: '60vh'
-      }}>
+      <div >
         <Radio.Group buttonStyle="solid" value={radioVal} onChange={this.handleRadioChange}>
           <Radio.Button value={0}>今日</Radio.Button>
           <Radio.Button value={7}>最近7天</Radio.Button>
@@ -368,49 +388,50 @@ class OverView extends React.Component {
                 <DatePicker placeholder="开始日期"/>,
             )}
             </Form.Item>
-            <Form.Item style={{marginTop:'20px', marginBottom:'20px'}}>
-            {getFieldDecorator('endDate', {initialValue: moment(endDate)
-              
-            })(
-                <DatePicker placeholder="结束日期"/>,
-            )}
+            <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+              {getFieldDecorator('endDate', {
+                initialValue: moment(endDate)
+
+              })(
+                <DatePicker placeholder="结束日期" />,
+              )}
             </Form.Item>
-          <Form.Item style={{marginTop:'20px', marginBottom:'20px'}}>
+            <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
               {getFieldDecorator('buildingId')(<BuildingSelect />)}
-          </Form.Item>
-          <Form.Item style={{marginTop:'20px', marginBottom:'20px'}}>
-            {getFieldDecorator('targetType')(
-                <Select placeholder="活动类型" style={{ width: 150, marginLeft:'20px'  }}>
-                <Option value="activity">报名活动</Option>
-                <Option value="help">助力活动</Option>
-                <Option value="group">拼团活动</Option>
-                <Option value="h5">H5活动</Option>
-                <Option value="live">直播</Option>
-            </Select>
-            )}
-          </Form.Item>
-          <Form.Item style={{marginTop:'20px', marginBottom:'20px'}}>
-              {getFieldDecorator('activityName')(<Input placeholder="请输入活动名称"/>)}
-          </Form.Item>
-          <Form.Item style={{marginTop:'20px', marginBottom:'20px'}}>
-            <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }}>
+            </Form.Item>
+            <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+              {getFieldDecorator('targetType')(
+                <Select placeholder="活动类型" style={{ width: 150, marginLeft: '20px' }}>
+                  <Option value="activity">报名活动</Option>
+                  <Option value="help">助力活动</Option>
+                  <Option value="group">拼团活动</Option>
+                  <Option value="h5">H5活动</Option>
+                  <Option value="live">直播</Option>
+                </Select>
+              )}
+            </Form.Item>
+            <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+              {getFieldDecorator('activityName')(<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}>
+            <AuthButton name="admin.statistical.activity.export" noRight={null}>
             <Button type="primary" style={{ float: 'right', margin: '20px 0', zIndex: 1 }} onClick={this.exportActivityStats}>
                 导出
             </Button>
             </AuthButton>
-          <Table style={{marginTop:'20px'}} dataSource={this.state.tableData} columns={columns} pagination={{ total: this.state.total}} onChange={this.handleTableChange} scroll={{ y: 500 }}></Table>
+            <Table style={{ marginTop: '20px' }} dataSource={this.state.tableData} columns={columns} pagination={{ total: this.state.total }} onChange={this.handleTableChange} scroll={{ y: 500 }}></Table>
+          </div>
         </div>
-      </div>
-    </>
+      </>
     )
-    
+
   }
 }
 const WrappedTypeForm = Form.create()(OverView);

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

@@ -22,6 +22,9 @@ const formItemLayout = {
 let daterange = []
 let tableTitle = ['类型']
 
+let buildingId = ''
+let activityType = ''
+
 const toSharePersonNum = rowData => () => {
   console.log(rowData, 'rowData')
   if(rowData) {
@@ -29,6 +32,8 @@ const toSharePersonNum = rowData => () => {
     pathname: '/statistical/activity/sharePersonNum',
     query: {
       queryDate: rowData.date,
+      buildingId: buildingId, 
+      acticvityType: activityType
     },
   });
     return
@@ -42,6 +47,8 @@ const toShareNum = rowData => () => {
     pathname: '/statistical/activity/shareNum',
     query: {
       queryDate: rowData.date,
+      buildingId: buildingId, 
+      acticvityType: activityType
     },
   });
     return
@@ -55,6 +62,8 @@ const toAddRegistNum = rowData => () => {
     pathname: '/statistical/activity/addRegistNum',
     query: {
       queryDate: rowData.date,
+      buildingId: buildingId, 
+      acticvityType: activityType
     },
   });
     return
@@ -68,6 +77,8 @@ const toAddVisitNum = rowData => () => {
     pathname: '/statistical/activity/visitNum',
     query: {
       queryDate: rowData.date,
+      buildingId: buildingId, 
+      acticvityType: activityType
     },
   });
     return
@@ -81,6 +92,8 @@ const toAddVisitPersonNum = rowData => () => {
     pathname: '/statistical/activity/visitPersonNum',
     query: {
       queryDate: rowData.date,
+      buildingId: buildingId, 
+      acticvityType: activityType
     },
   });
     return
@@ -221,7 +234,10 @@ class OverView extends React.Component {
   handleSubmit = (e, props) => {
     let startDate = null
     let endDate = null
-    const buildingId = this.props.form.getFieldValue("buildingId");
+    buildingId = this.props.form.getFieldValue("buildingId");
+    activityType = this.props.form.getFieldValue("targetType");
+
+    const buildingIdSearch = this.props.form.getFieldValue("buildingId");
     const targetType = this.props.form.getFieldValue("targetType");
     if (this.props.form.getFieldValue("startDate") != undefined){
       startDate = this.props.form.getFieldValue("startDate").toDate()
@@ -235,7 +251,7 @@ class OverView extends React.Component {
         ...formData,
         startDate: startDate,
         endDate: endDate,
-        buildingId: buildingId,
+        buildingId: buildingIdSearch,
         targetType: targetType
       }
     }, this.getAllList)
@@ -321,13 +337,7 @@ class OverView extends React.Component {
 
     return (
     <>
-      <div style={{
-        backgroundColor: '#fff',
-        padding: '32PX 28px',
-        boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)',
-        borderRadius: '12px',
-        minHeight: '60vh'
-      }}>
+      <div >
         <Radio.Group buttonStyle="solid" value={radioVal} onChange={this.handleRadioChange}>
           <Radio.Button value={0}>今日</Radio.Button>
           <Radio.Button value={7}>最近7天</Radio.Button>
@@ -364,7 +374,7 @@ class OverView extends React.Component {
           </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>
@@ -373,36 +383,32 @@ class OverView extends React.Component {
 
             <div style={{ display: 'flex', marginBottom: '33px' }}>
             <div style={{
-                textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(255,126,74,1) 0%,rgba(255,196,168,1) 100%)', height: '100px',
-                boxShadow: '0px  0.106rem 14px -15px rgba(255,126,74,1)',
+                textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(241,43,62,1) 0%,rgba(254,144,155,1) 100%)', height: '100px',
                 borderRadius: '12px', width: '32%', marginRight: '2%'
             }}>
                 <span style={{ fontSize: '24px', color: '#fff' }}>分享总次数 </span>
-                <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{ this.state.personData.sharePersonNum || '0'}</span>
+                <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{ this.state.personData.shareNum || '0'}</span>
             </div>
             <div style={{
-                textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(255,126,74,1) 0%,rgba(255,196,168,1) 100%)', height: '100px',
-                boxShadow: '0px  0.106rem 14px -15px rgba(255,126,74,1)',
+                textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: '#FFC6AA', height: '100px',
                 borderRadius: '12px', width: '32%', marginRight: '2%'
             }}>
                 <span style={{ fontSize: '24px', color: '#fff' }}>分享总人数 </span>
-                <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{ this.state.personData.shareNum || '0'}</span>
+                <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{ this.state.personData.sharePersonNum || '0'}</span>
             </div>
             <div style={{
-                textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(255,126,74,1) 0%,rgba(255,196,168,1) 100%)', height: '100px',
-                boxShadow: '0px  0.106rem 14px -15px rgba(255,126,74,1)',
+                textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(137deg,rgba(107,130,230,1) 0%,rgba(152,175,251,1) 100%)', height: '100px',
                 borderRadius: '12px', width: '32%', marginRight: '2%'
             }}>
                 <span style={{ fontSize: '24px', color: '#fff' }}>访问总次数 </span>
-                <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{ this.state.personData.visitPersonNum || '0'}</span>
+                <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{ this.state.personData.visitNum || '0'}</span>
             </div>
             <div style={{
-                textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(255,126,74,1) 0%,rgba(255,196,168,1) 100%)', height: '100px',
-                boxShadow: '0px  0.106rem 14px -15px rgba(255,126,74,1)',
+                textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(137deg,rgba(150,83,215,1) 0%,rgba(208,160,255,1) 100%)', height: '100px',
                 borderRadius: '12px', width: '32%', marginRight: '2%'
             }}>
                 <span style={{ fontSize: '24px', color: '#fff' }}>访问总人数 </span>
-                <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{ this.state.personData.visitNum || '0'}</span>
+                <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{ this.state.personData.visitPersonNum || '0'}</span>
             </div>
             </div>
           
@@ -411,7 +417,7 @@ class OverView extends React.Component {
                     <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}>
+            <AuthButton name="admin.statistical.activity.export" noRight={null}>
             <Button type="primary" style={{ float: 'right', margin: '20px 0', zIndex: 1 }} onClick={this.exportActivityStats}>
                 导出
             </Button>

src/pages/statistical/activity/compenents/style.less

@@ -1,5 +1,5 @@
 .bar {
-    width: 70%;
+    width: 100%;
     min-width: 400px;
     min-height: 560px;
     background: rgba(255, 255, 255, 1);

src/pages/statistical/activity/detail.jsx

@@ -0,0 +1,377 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Button, DatePicker, Table, Pagination, Radio, Typography } from 'antd';
+import sortBy from 'lodash/sortBy';
+import router from 'umi/router';
+import moment from 'moment';
+import apis from '../../../services/apis';
+import request from '../../../utils/request'
+import AuthButton from '../../../components/AuthButton';
+import echarts from 'echarts/lib/echarts';
+import EChart from '../../../components/EchartsTest/EChart';
+
+/**
+  @param {*} props
+  @returns
+ */
+const { RangePicker } = DatePicker;
+const { Text } = Typography;
+
+function record(props) {
+    const [radioVal, updateRadioVal] = useState(7)
+    const [formData, updateFormData] = useState({
+        pageNum: 1,
+        pageSize: 10,
+        ...props.location.query,
+    })
+
+    // 获取初始化数据
+    const [data, setData] = useState([])
+    const [chartsData, setChartsData] = useState([])
+    const [loading, updataLoading] = useState(true)
+    const [btnloading, updataBtnloading] = useState(false)
+
+    useEffect(() => {
+        getList(formData);
+    }, [])
+
+    // 查询列表
+    const getList = (params) => {
+        request({ ...apis.stats.activityDetail, params: { ...params }, }).then((data) => {
+            setData(data)
+            setChartsData(data)
+            updataLoading(false)
+        }).catch(err => {
+            updataLoading(false)
+        })
+    }
+
+    //重置搜索
+    function handleReset() {
+        props.form.resetFields();
+    }
+
+    // 提交事件
+    const handleSubmit = (e) => {
+        e.preventDefault();
+        getList(formData);
+    }
+    // 更新页码
+    const changePageNum = (pageNumber) => {
+        props.form.validateFields((err, values) => {
+            if (!err) {
+                getList({ ...formData, pageNum: pageNumber });
+            }
+        });
+    }
+    // 切换日期 与picker联动
+    function setFormData(e) {
+        updateRadioVal(e.target.value)
+        updateFormData({
+            ...formData,
+            startDate: moment().subtract(e.target.value, 'day').format('YYYY-MM-DD'),
+            endDate: moment().format('YYYY-MM-DD'),
+        })
+        getList({
+            ...formData, startDate: moment().subtract(e.target.value, 'day').format('YYYY-MM-DD'),
+            endDate: moment().format('YYYY-MM-DD'),
+        });
+
+    }
+    // 选择日期
+    const handleDateChange = (val) => {
+        updateFormData({
+            ...formData,
+            startDate: val[0].format('YYYY-MM-DD'),
+            endDate: val[1].format('YYYY-MM-DD'),
+        })
+    }
+    const clickCon = (val, record, type) => {
+        if (val == 0) {
+            return <><span>{val}</span></>
+        }
+        return <><span style={{ color: 'blue', cursor: 'pointer' }} onClick={() => toDetail(record, type)} >{val}</span></>
+    }
+
+    //排序
+    const handleChange = (pagination, filters, sorter) => {
+        const keyValue = sorter.columnKey
+
+        if (sorter.order == 'ascend') {
+            setData(sortBy(data, function (item) {
+                return item[keyValue];
+            }))
+
+        } else if (sorter.order == 'descend') {
+
+            setData(sortBy(data, function (item) {
+                return -item[keyValue];
+            }))
+
+        } else {
+            setData(sortBy(data, function (item) {
+                return item.statisDate;
+            }))
+        }
+    };
+
+    const toSharePersons = rowData => () => {
+        console.log(rowData, 'rowData')
+        if (rowData) {
+            router.push({
+                pathname: '/statistical/activity/sharePersonNum',
+                query: {
+                    queryDate: rowData.statisDate,
+                },
+            });
+            return
+        }
+    }
+
+    const toShareNum = rowData => () => {
+        console.log(rowData, 'rowData')
+        if (rowData) {
+            router.push({
+                pathname: '/statistical/activity/shareNum',
+                query: {
+                    queryDate: rowData.statisDate,
+                },
+            });
+            return
+        }
+    }
+
+    const toAddVisitNum = rowData => () => {
+        console.log(rowData, 'statisDate')
+        if (rowData) {
+            router.push({
+                pathname: '/statistical/activity/visitNum',
+                query: {
+                    queryDate: rowData.date,
+                },
+            });
+            return
+        }
+    }
+
+    const toAddVisitPersonNum = rowData => () => {
+        console.log(rowData, 'rowData')
+        if (rowData) {
+            router.push({
+                pathname: '/statistical/activity/visitPersonNum',
+                query: {
+                    queryDate: rowData.statisDate,
+                },
+            });
+            return
+        }
+    }
+
+    const toAddRegistNum = rowData => () => {
+        console.log(rowData, 'rowData')
+        if (rowData) {
+            router.push({
+                pathname: '/statistical/activity/addRegistNum',
+                query: {
+                    queryDate: rowData.statisDate,
+                },
+            });
+            return
+        }
+    }
+
+    // 表格数据
+    const columns = [
+        {
+            title: '日期',
+            dataIndex: 'statisDate',
+            key: 'statisDate',
+            align: 'center',
+        },
+        {
+            title: '分享人数',
+            dataIndex: 'sharePersons',
+            key: 'sharePersons',
+            sorter: true,
+            render: (text, record) => (
+                <a style={{ color: '#66B3FF' }} onClick={toSharePersons(record)}><span>{record.sharePersons}</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: 'visitPersons',
+            key: 'visitPersons',
+            sorter: true,
+            render: (text, record) => (
+                <a style={{ color: '#66B3FF' }} onClick={toAddVisitPersonNum(record)}><span>{record.visitPersons}</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: 'newCustomers',
+            key: 'newCustomers',
+            sorter: true,
+            render: (text, record) => (
+                <a style={{ color: '#66B3FF' }} onClick={toAddRegistNum(record)}><span>{record.newCustomers}</span></a>
+            ),
+        },
+    ];
+    // 下载文档
+    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', `${props.location.query.targetName}.xlsx`)
+        document.body.append(link)
+        link.click()
+    }
+    // 导出
+    function exportRecord() {
+        updataBtnloading(true)
+        request({ ...apis.stats.exportActivityDetail, responseType: 'blob', params: { ...props.location.query, startDate: formData.startDate, endDate: formData.endDate, } })
+            .then(response => {
+                download(response)
+                updataBtnloading(false)
+            }).catch(error => {
+                updataBtnloading(false)
+            })
+    }
+    // 默认日期
+    const dateRange = [
+        moment(formData.startDate),
+        moment(formData.endDate),
+    ]
+
+    const dataZoom = props.dataZoom ? [
+        {
+            type: 'inside',
+            start: 0,
+            end: 100
+        },
+        {
+            type: 'slider',
+            start: 0,
+            end: 100
+        },
+    ] : undefined
+    const dataset = chartsData || []
+    const options = {
+
+        color: ["#FF814C", "#F02B3E", "#FD9FFF", "#7BFF82", "#95CCFF", "#8C4FFF"],
+        tooltip: {
+            trigger: "axis"
+        },
+        icon: "rect",
+        legend: {
+            data: ["分享次数", "分享人数", "访问次数", "访问人数", "新增注册用户"]
+        },
+        toolbox: {},
+        xAxis: {
+            type: "category",
+        },
+        yAxis: {},
+        dataZoom,
+        series: [
+            {
+                name: "分享次数",
+                type: "line",
+            },
+            {
+                name: "分享人数",
+                type: "line",
+            },
+            {
+                name: "访问次数",
+                type: "line",
+            },
+            {
+                name: "访问人数",
+                type: "line",
+            },
+            {
+                name: "新增注册用户",
+                type: "line",
+            }
+        ],
+        dataset: {
+            dimensions: ['statisDate', 'shareNum', 'sharePersons', 'visitNum', 'visitPersons', 'newCustomers'],
+            source: dataset
+        }
+    }
+
+
+    const piestyles = {
+        width: '100%',
+        height: '400px',
+    }
+    return (
+
+        <>
+            <Button type="danger" style={{ marginBottom: '18px' }} onClick={() => router.go(-1)}>返回</Button>
+            <Form layout="inline">
+                <div style={{ display: 'flex', alignItems: 'center' }}>
+                    <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>
+                        <RangePicker value={dateRange} onChange={handleDateChange} 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>
+            <div style={{ fontSize: '0.12rem', lineHeight: '2.6', fontWeight: '600' }}>趋势图：{props.location.query.targetName}</div>
+            <div>
+                <EChart options={options} style={piestyles} />
+            </div>
+
+            <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between' }}>
+                <h4 style={{ fontSize: '0.12rem', fontWeight: '600' }}>详细数据</h4>
+                <AuthButton name="admin.statistical.consultant.export" noRight={null}>
+                    <Button type="primary" onClick={exportRecord} loading={btnloading} style={{ zIndex: 1 }}>
+                        导出
+                </Button>
+                </AuthButton>
+            </div>
+
+            <Table rowKey={(index => { index })}
+                style={{ marginTop: '30px' }}
+                dataSource={data}
+                columns={columns}
+                pagination={{ pageSize: 10 }}
+                onChange={handleChange}
+                loading={loading}
+            />
+            {/* < div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+                <Pagination size={2} 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/activity/index.jsx

@@ -51,6 +51,7 @@ function EditHouse(props) {
       <Tabs type="card" value={ tab } buttonStyle="solid" onChange={e => tabsCallback(e)}>
         <TabPane tab="统计总况" key="overView" ></TabPane>
         <TabPane tab="统计内容" key="content" ></TabPane>
+        {/* <Icon type="question-circle" theme="filled" style={{ fontSize: '25px', color: '#F00', marginLeft:'30px'}} /> */}
       </Tabs>
       <div style={{ marginTop: '20px' }}>
         { (tab === 'overView' && <OverView />)}

src/pages/statistical/activity/shareNum.jsx

@@ -19,6 +19,7 @@ const formItemLayout = {
   
 let daterange = []
 let tableTitle = ['类型']
+let queryDate = ''
 
 let columns = [
   {
@@ -60,6 +61,7 @@ class SharePersonNum extends React.Component {
   constructor(props) {
     super(props)
     console.log(props)
+    queryDate = props.location.query.queryDate
     let startDate;
     let endDate;
     if (props.location.query.queryDate){
@@ -81,14 +83,14 @@ class SharePersonNum extends React.Component {
         startDate: startDate,
         endDate: endDate,
         activityId: props.location.query.activityId,
-        activityType:props.location.query.activityType   
+        activityType:props.location.query.activityType,
+        personId: props.location.query.personId   
       },
       personData: [],  
       dataSoures: [],
       tableData: [],
       userType: 'all',
-      buildingId: [],
-      targetType: []
+      activityName:  props.location.query.activityName
     }
   }
 
@@ -167,6 +169,9 @@ class SharePersonNum extends React.Component {
 
     return (
     <>
+        <div>
+          <span style={{marginLeft:'20px'}}>分享内容：{this.state.activityName}</span>
+        </div>
         <Form layout="inline" onSubmit={e => this.handleSubmit(e, this.props)}>
           <Form.Item style={{marginTop:'20px', marginBottom:'20px'}}>
             {getFieldDecorator('sharePersonType')(
@@ -191,7 +196,7 @@ class SharePersonNum extends React.Component {
           </Form.Item>
           </Form>     
         <div>
-        <AuthButton name="admin.customer.import" noRight={null}>
+        <AuthButton name="admin.statistical.activity.export" noRight={null}>
             <Button type="primary" style={{ float: 'right', margin: '20px 0', zIndex: 1 }} onClick={this.exportActivityStats}>
                 导出
             </Button>

src/pages/statistical/activity/sharePersonNum.jsx

@@ -20,6 +20,59 @@ const formItemLayout = {
 let daterange = []
 let tableTitle = ['类型']
 
+let staticStartDate = ''
+let staticEndDate = ''
+let queryDate = ''
+let activityName = ''
+
+const toShareNum = rowData => () => {
+  if(rowData) {
+    router.push({
+    pathname: '/statistical/activity/shareNum',
+    query: {
+      queryDate: queryDate,
+      personId: rowData.personId,
+      startDate: staticStartDate,
+      endDate: staticEndDate,
+      activityName: activityName
+    },
+  });
+    return
+  }
+}
+
+const toVisitPersonNum = rowData => () => {
+  if(rowData) {
+    router.push({
+    pathname: '/statistical/activity/visitPersonNum',
+    query: {
+      queryDate: queryDate,
+      personId: rowData.personId,
+      startDate: staticStartDate,
+      endDate: staticEndDate,
+      activityName: activityName
+    },
+  });
+    return
+  }
+} 
+
+const toVisitNum = rowData => () => {
+  if(rowData) {
+    router.push({
+    pathname: '/statistical/activity/visitNum',
+    query: {
+      queryDate: queryDate,
+      personId: rowData.personId,
+      startDate: staticStartDate,
+      endDate: staticEndDate,
+      activityName: activityName
+    },
+  });
+    return
+  }
+} 
+
 let columns = [
   {
     title: '分享者姓名',
@@ -46,18 +99,27 @@ let columns = [
     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={toVisitPersonNum(record)}><span>{record.visitPersonNum}</span></a>
+      ),
   },
   {
     title: '访问次数',
     dataIndex: 'visitNum',
     key: 'visitNum',
     sorter: true,
+    render: (text, record) => (
+      <a style={{ color: '#66B3FF' }} onClick={toVisitNum(record)}><span>{record.visitNum}</span></a>
+      ),
   },
 ]
 
@@ -67,7 +129,11 @@ class SharePersonNum extends React.Component {
     super(props)
     let startDate;
     let endDate;
-    console.log(props)
+    queryDate = props.location.query.queryDate
+    activityName = props.location.query.activityName
+    staticStartDate = props.location.query.startDate;
+    staticEndDate = props.location.query.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();
@@ -89,14 +155,14 @@ class SharePersonNum extends React.Component {
         startDate: startDate,
         endDate: endDate,
         activityId: props.location.query.activityId,
-        activityType:props.location.query.activityType        
+        activityType: props.location.query.activityType,
+        buildingId: props.location.query.buildingId,         
       },
       personData: [],  
       dataSoures: [],
       tableData: [],
       userType: 'all',
-      buildingId: [],
-      targetType: []
+      activityName:  props.location.query.activityName
     }
   }
 
@@ -175,6 +241,9 @@ class SharePersonNum extends React.Component {
 
     return (
     <>
+        <div>
+          <span style={{marginLeft:'20px'}}>分享内容：{this.state.activityName}</span>
+        </div>
         <Form layout="inline" onSubmit={e => this.handleSubmit(e, this.props)}>
           <Form.Item style={{marginTop:'20px', marginBottom:'20px'}}>
             {getFieldDecorator('sharePersonType')(
@@ -199,7 +268,7 @@ class SharePersonNum extends React.Component {
           </Form.Item>
           </Form>     
         <div>
-        <AuthButton name="admin.customer.import" noRight={null}>
+        <AuthButton name="admin.statistical.activity.export" noRight={null}>
             <Button type="primary" style={{ float: 'right', margin: '20px 0', zIndex: 1 }} onClick={this.exportActivityStats}>
                 导出
             </Button>

src/pages/statistical/activity/visitNum.jsx

@@ -20,6 +20,7 @@ const formItemLayout = {
   
 let daterange = []
 let tableTitle = ['类型']
+let queryDate = ''
 
 let columns = [
   {
@@ -79,6 +80,8 @@ class SharePersonNum extends React.Component {
 
   constructor(props) {
     super(props)
+    queryDate = props.location.query.queryDate
+
     let startDate;
     let endDate;
     if (props.location.query.queryDate){
@@ -100,14 +103,14 @@ class SharePersonNum extends React.Component {
         realtyConsultant:'',
         realtyConsultantPhone:'',
         activityId: props.location.query.activityId,
-        activityType:props.location.query.activityType  
+        activityType: props.location.query.activityType,
+        personId: props.location.query.personId,
       },
       personData: [],  
       dataSoures: [],
       tableData: [],
       userType: 'all',
-      buildingId: [],
-      targetType: []
+      activityName:  props.location.query.activityName
     }
   }
 
@@ -185,6 +188,9 @@ class SharePersonNum extends React.Component {
 
     return (
     <>
+        <div>
+          <span style={{marginLeft:'20px'}}>分享内容：{this.state.activityName}</span>
+        </div>
         <Form layout="inline" onSubmit={e => this.handleSubmit(e, this.props)}>
         <Form.Item style={{marginTop:'20px', marginBottom:'20px'}}>
           {getFieldDecorator('personFrom')(
@@ -208,7 +214,7 @@ class SharePersonNum extends React.Component {
           </Form.Item>
           </Form>     
         <div>
-        <AuthButton name="admin.customer.import" noRight={null}>
+        <AuthButton name="admin.statistical.activity.export" noRight={null}>
             <Button type="primary" style={{ float: 'right', margin: '20px 0', zIndex: 1 }} onClick={this.exportActivityStats}>
                 导出
             </Button>

src/pages/statistical/activity/visitPersonNum.jsx

@@ -20,6 +20,7 @@ const formItemLayout = {
   
 let daterange = []
 let tableTitle = ['类型']
+let queryDate = ''
 
 let columns = [
   {
@@ -78,8 +79,11 @@ class SharePersonNum extends React.Component {
 
   constructor(props) {
     super(props)
+    queryDate = props.location.query.queryDate
+
     let startDate;
     let endDate;
+    
     if (props.location.query.queryDate){
       startDate = moment(props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).toDate();
       endDate = moment(props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
@@ -99,14 +103,14 @@ class SharePersonNum extends React.Component {
         realtyConsultant:'',
         realtyConsultantPhone:'',
         activityId: props.location.query.activityId,
-        activityType:props.location.query.activityType  
+        activityType:props.location.query.activityType ,
+        personId:  props.location.query.personId
       },
       personData: [],  
       dataSoures: [],
       tableData: [],
       userType: 'all',
-      buildingId: [],
-      targetType: []
+      activityName:  props.location.query.activityName
     }
   }
 
@@ -184,6 +188,9 @@ class SharePersonNum extends React.Component {
 
     return (
     <>
+        <div>
+          <span style={{marginLeft:'20px'}}>分享内容：{this.state.activityName}</span>
+        </div>
         <Form layout="inline" onSubmit={e => this.handleSubmit(e, this.props)}>
         <Form.Item style={{marginTop:'20px', marginBottom:'20px'}}>
           {getFieldDecorator('personFrom')(
@@ -207,7 +214,7 @@ class SharePersonNum extends React.Component {
           </Form.Item>
           </Form>     
         <div>
-        <AuthButton name="admin.customer.import" noRight={null}>
+        <AuthButton name="admin.statistical.activity.export" noRight={null}>
             <Button type="primary" style={{ float: 'right', margin: '20px 0', zIndex: 1 }} onClick={this.exportActivityStats}>
                 导出
             </Button>

src/services/apis.js

@@ -424,6 +424,11 @@ export default {
       url: `${prefix}/selectCityUser`,
       action: 'admin.selectCityUser.get',
     },
+    personCity: {
+      method: 'get',
+      url: `${prefix}/selectCityPerson`,
+      action: 'admin.selectCityPerson.get',
+    },
     indexBanner: {
       method: 'get',
       url: `${prefix}/listNoticeByCondition`,
@@ -1687,6 +1692,16 @@ export default {
       url: `${prefix}/stats/tableList`,
       action: 'admin.contract.list.get',
     },
+    activityDetail: {
+      method: 'GET',
+      url: `${prefix}/stats/activity/detail`,
+      action: 'admin.contract.list.get',
+    },
+    exportActivityDetail: {
+      method: 'POST',
+      url: `${prefix}/stats/activity/detail`,
+      action: 'admin.contract.list.post',
+    },
     consultantKPI: {
       method: 'GET',
       url: `${prefix}/stats/consultant/kpi`,