fix

config/routes.js

@@ -663,6 +663,13 @@ export default [
                 component: './statistics/activity/addRegistNum',
                 menuCode: '/building/list',
               },
+              {
+                path: '/statistics/activity/detail',
+                name: '查看',
+                hideInMenu: true,
+                component: './statistics/activity/detail',
+                menuCode: '/building/list',
+              },
               
               {
                 path: '/statistics/building',

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

@@ -36,7 +36,6 @@ const activityOverView = props => {
 
   const [time, setTime] = useState();
 
-  
   //重置搜索
   const handleReset = e => {
     props.form.resetFields();
@@ -64,7 +63,6 @@ const activityOverView = props => {
     });
   };
 
-
   const { getFieldDecorator } = props.form;
   console.log(timeValue, 'timeValue');
   return (
@@ -77,14 +75,16 @@ const activityOverView = props => {
         <Form.Item>
           {getFieldDecorator('targetType')(
             <Select placeholder="活动类型" allowClear style={{ width: 150, marginLeft: '20px' }}>
-              <Option value="activity">报名活动</Option>
-              <Option value="help">助力活动</Option>
-              <Option value="group">拼团活动</Option>
-              <Option value="h5">H5活动</Option>
+              <Option value="dymic">报名</Option>
+              <Option value="look">带看</Option>
+              <Option value="house">团房</Option>
               <Option value="live">直播</Option>
             </Select>,
           )}
         </Form.Item>
+        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+          {getFieldDecorator('activityName')(<Input placeholder="请输入活动名称" />)}
+        </Form.Item>
         <Form.Item>
           <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }}>
             搜索

src/pages/statistics/activity/addRegistNum.jsx

@@ -121,7 +121,7 @@ class SharePersonNum extends React.Component {
           .milliseconds(999)
           .format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
     }
-    console.log(startDate);
+
     this.state = {
       formData: {
         personFrom: '',

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

@@ -1,5 +1,5 @@
 import React, { Component, useState, useEffect } from 'react';
-import { Card,Table,Button } from 'antd';
+import { Card, Table, Button } from 'antd';
 import EChart from '../../../../components/EchartsTest/EChart';
 import request from '../../../../utils/request';
 import apis from '../../../../services/apis';
@@ -36,50 +36,202 @@ const ContentTable = props => {
       })
       .catch();
   }
-  const columns = [
+
+  const toSharePersonNum = rowData => () => {
+    // const startDate = moment().subtract(dateType, 'day').toDate()
+    // const endDate = new Date()
+
+    if (rowData) {
+      router.push({
+        pathname: '/statistics/activity/sharePersonNum',
+        query: {
+          startDate: params.startDate,
+          endDate: params.endDate,
+          activityId: rowData.activityId,
+          activityType: rowData.activityType,
+          activityName: rowData.activityName,
+        },
+      });
+      return;
+    }
+  };
+
+  const toShareNum = rowData => () => {
+    // const startDate = moment().subtract(dateType, 'day').toDate()
+    // const endDate = new Date()
+    if (rowData) {
+      router.push({
+        pathname: '/statistics/activity/shareNum',
+        query: {
+          startDate: params.startDate,
+          endDate: params.endDate,
+          activityId: rowData.activityId,
+          activityType: rowData.activityType,
+          activityName: rowData.activityName,
+        },
+      });
+      return;
+    }
+  };
+
+  const toAddRegistNum = rowData => () => {
+    // const startDate = moment().subtract(dateType, 'day').toDate()
+    // const endDate = new Date()
+    // console.log(rowData, 'rowData')
+    if (rowData) {
+      router.push({
+        pathname: '/statistics/activity/addRegistNum',
+        query: {
+          startDate: params.startDate,
+          endDate: params.endDate,
+          activityId: rowData.activityId,
+          activityType: rowData.activityType,
+          activityName: rowData.activityName,
+        },
+      });
+      return;
+    }
+  };
+
+  const toAddVisitPersonNum = rowData => () => {
+    if (rowData) {
+      router.push({
+        pathname: '/statistics/activity/visitPersonNum',
+        query: {
+          startDate: params.startDate,
+          endDate: params.endDate,
+          activityId: rowData.activityId,
+          activityType: rowData.activityType,
+          activityName: rowData.activityName,
+        },
+      });
+      return;
+    }
+  };
+
+  const toAddVisitNum = rowData => () => {
+    if (rowData) {
+      router.push({
+        pathname: '/statistics/activity/visitNum',
+        query: {
+          startDate: params.startDate,
+          endDate: params.endDate,
+          activityId: rowData.activityId,
+          activityType: rowData.activityType,
+          activityName: rowData.activityName,
+        },
+      });
+      return;
+    }
+  };
+
+  const toDetail = rowData => {
+    if (rowData) {
+      router.push({
+        pathname: '/statistics/activity/detail',
+        query: {
+          startDate: params.startDate,
+          endDate: params.endDate,
+          targetId: rowData.activityId,
+          targetType: rowData.activityType,
+          targetName: rowData.activityName,
+          buildingId: '',
+        },
+      });
+  
+      return
+    }
+  }
+
+  let columns = [
+    {
+      title: '活动类型',
+      dataIndex: 'activityType',
+      key: 'activityType',
+      render: (text, records) => {
+        if (records.activityType === 'live') {
+          return '直播活动';
+        }
+        if (records.activityType === 'look') {
+          return '一键带看';
+        }
+        if (records.activityType === 'house') {
+          return '团房活动';
+        }
+        if (records.activityType === 'dymic') {
+          return '报名活动';
+        }
+      },
+    },
     {
       title: '活动名称',
-      dataIndex: 'title',
-      key: 'title',
-      // sorter: true,
+      dataIndex: 'activityName',
+      key: 'activityName',
     },
     {
       title: '访问人数',
       dataIndex: 'visitPersonNum',
-      key: 'visit_person_num',
-      width: '25%',
+      key: 'visitPersonNum',
       sorter: true,
-      render: text => text || 0,
+      render: (text, record) => (
+        <Navigate onClick={toAddVisitPersonNum(record)}>{record.visitPersonNum}</Navigate>
+      ),
     },
     {
       title: '访问次数',
       dataIndex: 'visitNum',
-      key: 'visit_num',
-      width: '25%',
+      key: 'visitNum',
+      sorter: true,
+      render: (text, record) => (
+        <Navigate onClick={toAddVisitNum(record)}>{record.visitNum}</Navigate>
+        // <a style={{ color: '#66B3FF' }} onClick={toAddVisitNum(record)}><span>{record.visitNum}</span></a>
+      ),
+    },
+    {
+      title: '新增注册用户',
+      dataIndex: 'addRegistNum',
+      key: 'addRegistNum',
+      sorter: true,
+      render: (text, record) => (
+        <Navigate onClick={toAddRegistNum(record)}>{record.addRegistNum}</Navigate>
+        // <a style={{ color: '#66B3FF' }} onClick={toAddRegistNum(record)}><span>{record.addRegistNum}</span></a>
+      ),
+    },
+    {
+      title: '分享人数',
+      dataIndex: 'sharePersonNum',
+      key: 'sharePersonNum',
       sorter: true,
-      render: text => text || 0,
+      render: (text, record) => (
+        <Navigate onClick={toSharePersonNum(record)}>{record.sharePersonNum}</Navigate>
+      ),
     },
     {
-      title: '报名人数',
-      dataIndex: 'signNum',
-      key: 'sign_num',
-      width: '25%',
+      title: '分享次数',
+      dataIndex: 'shareNum',
+      key: 'shareNum',
       sorter: true,
-      // render: (text)=>text||0
-      render: (text, record) =>
-        text ? <Navigate onClick={() => toAddVisitNum(record)}>{record.signNum}</Navigate> : 0,
-      // <a style={{ color: '#66B3FF' }} onClick={toAddVisitNum(record)}><span>{record.visitNum}</span></a>
+      render: (text, record) => <Navigate onClick={toShareNum(record)}>{record.shareNum}</Navigate>,
+    },
+    {
+      title: '详情',
+      align: 'center',
+      render: (text, record) => (
+        <a style={{ color: '#FF4A4A' }} onClick={() => toDetail(record)}>
+          查看
+        </a>
+      ),
     },
   ];
 
-  const toAddVisitNum = record => {
-    router.push({
-      pathname: '/activity/SignupActivity/registrationRecord',
-      query: {
-        dynamicId: record.dynamicId,
-      },
-    });
-  };
+  // const toAddVisitNum = record => {
+  //   router.push({
+  //     pathname: '/activity/SignupActivity/registrationRecord',
+  //     query: {
+  //       dynamicId: record.dynamicId,
+  //     },
+  //   });
+  // };
 
   //排序
   const handleTableChange = (pagination, filters, sorter) => {
@@ -96,31 +248,36 @@ const ContentTable = props => {
     });
   };
 
- const exportActivityStats = () => {
-
-    request({ ...apis.activityDataStatis.activityDetailTableDataExport, params: params }).then(data => {
-      if (!data) {
-        return
-      }
-      const url = window.URL.createObjectURL(new Blob([data]))
-      const link = document.createElement('a')
-      link.style.display = 'none'
-      link.href = url
-      link.setAttribute('download', '活动统计.xlsx')
-      document.body.append(link)
-      link.click()
-    }).catch()
-  }
+  const exportActivityStats = () => {
+    request({ ...apis.activityDataStatis.activityDetailTableDataExport, params: params })
+      .then(data => {
+        if (!data) {
+          return;
+        }
+        const url = window.URL.createObjectURL(new Blob([data]));
+        const link = document.createElement('a');
+        link.style.display = 'none';
+        link.href = url;
+        link.setAttribute('download', '活动统计.xlsx');
+        document.body.append(link);
+        link.click();
+      })
+      .catch();
+  };
   return (
     <Card>
-        <div style={{textAlign:'right'}}> 
-        <AuthButton name="admin.statistical.activity.export" noRight={null}>
-              <Button type="primary" style={{ float: 'right', margin: '20px 0', zIndex: 1 }} onClick={exportActivityStats}>
-                导出
-            </Button>
-            </AuthButton>
-        </div>
-        
+      <div style={{ textAlign: 'right' }}>
+        <AuthButton name="admin.staisttics.activity.export" noRight={null}>
+          <Button
+            type="primary"
+            style={{ float: 'right', margin: '20px 0', zIndex: 1 }}
+            onClick={exportActivityStats}
+          >
+            导出
+          </Button>
+        </AuthButton>
+      </div>
+
       <Table
         columns={columns}
         dataSource={data?.records}
@@ -129,12 +286,6 @@ const ContentTable = props => {
         onChange={handleTableChange}
       ></Table>
     </Card>
-    // <>
-    //   <div ><p><span style={{fontSize:'0.12rem',fontWeight:'600'}}>活动趋势图</span></p></div>
-    //   <div style={{marginTop:'30px'}}>
-
-    //   </div>
-    // </>
   );
 };
 

src/pages/statistics/activity/detail.jsx

@@ -0,0 +1,87 @@
+import React, { Component, useState, useEffect, useRef } from 'react';
+import { Card, Row, Col, Statistic, Icon, Tabs, Form, Select, Button, Modal } from 'antd';
+// import IndexEcharts from './components/indexEcharts';
+// import Swiper from './swiper/index';
+import moment from 'moment';
+import router from 'umi/router';
+import request from '@/utils/request';
+import apis from '@/services/apis';
+import TimeSelect from '../compents/TimeSelect';
+import BuildingSelect from '@/components/SelectButton/BuildSelect';
+import Navigate from '@/components/Navigate';
+import NewUsers from './compents/NewUsers';
+import OverviewDeatil from './compents/OverviewDeatil';
+
+const activityOverView = props => {
+  const timeRef = useRef();
+
+  const [data, setData] = useState({});
+  const [serachData, setSearchData] = useState({
+    startDate:
+      moment()
+        .subtract(7, 'day')
+        .format('YYYY-MM-DDT00:00:00.000') + 'Z',
+    endDate: moment().format('YYYY-MM-DDT23:59:59.999') + 'Z',
+    ...props.location.query,
+  });
+  const [timeValue, setTimeValue] = useState();
+
+  const [time, setTime] = useState();
+
+  //重置搜索
+  const handleReset = e => {
+    props.form.resetFields();
+    timeRef.current.reset();
+    setSearchData({
+      startDate:
+        moment()
+          .subtract(7, 'day')
+          .format('YYYY-MM-DDT00:00:00.000') + 'Z',
+      endDate: moment().format('YYYY-MM-DDT23:59:59.999') + 'Z',
+    });
+  };
+
+  const onTimeChange = e => {
+    setTime(e);
+  };
+  const handleSubmit = e => {
+    props.form.validateFieldsAndScroll((err, values) => {
+      setTimeValue();
+      setSearchData({
+        ...values,
+        startDate: moment(time[0]).format('YYYY-MM-DDT00:00:00.000') + 'Z',
+        endDate: moment(time[1]).format('YYYY-MM-DDT23:59:59.999') + 'Z',
+      });
+    });
+  };
+
+  const { getFieldDecorator } = props.form;
+
+  return (
+    <div>
+      <Form layout="inline" onSubmit={handleSubmit}>
+        <Form.Item>
+          <TimeSelect onChange={onTimeChange} ref={timeRef}></TimeSelect>
+        </Form.Item>
+        <Form.Item>
+          <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }}>
+            搜索
+          </Button>
+          <Button onClick={e => handleReset()} style={{ marginLeft: '30px' }}>
+            重置
+          </Button>
+        </Form.Item>
+      </Form>
+
+      <div style={{ marginTop: '20px' }}>
+        <NewUsers params={serachData} dataZoom={false}></NewUsers>
+      </div>
+      <div style={{ marginTop: '20px' }}>
+        <OverviewDeatil params={serachData}></OverviewDeatil>
+      </div>
+    </div>
+  );
+};
+
+const WrappedTypeForm = Form.create()(activityOverView);
+export default WrappedTypeForm;

src/pages/statistics/activity/sharePersonNum.jsx

@@ -47,7 +47,7 @@ const toShareNum = rowData => () => {
 const toVisitPersonNum = rowData => () => {
   if (rowData) {
     router.push({
-      pathname: '/statistical/activity/visitPersonNum',
+      pathname: '/statistics/activity/visitPersonNum',
       query: {
         queryDate: queryDate,
         personId: rowData.personId,
@@ -65,7 +65,7 @@ const toVisitPersonNum = rowData => () => {
 const toVisitNum = rowData => () => {
   if (rowData) {
     router.push({
-      pathname: '/statistical/activity/visitNum',
+      pathname: '/statistics/activity/visitNum',
       query: {
         queryDate: queryDate,
         personId: rowData.personId,
@@ -325,7 +325,7 @@ class SharePersonNum extends React.Component {
             </Button>
             <Button onClick={e => this.handleReset()} style={{ marginLeft: '30px' }}>重置</Button>
           </Form.Item>
-          <AuthButton name="admin.statistical.activity.export" noRight={null}>
+          <AuthButton name="admin.statistics.activity.export" noRight={null}>
             <Button type="primary" style={{ float: 'right', zIndex: 1, marginTop: '24px' }} onClick={this.exportActivityStats}>
               导出
             </Button>

src/pages/statistics/activity/visitNum.jsx

@@ -335,7 +335,7 @@ class SharePersonNum extends React.Component {
               重置
             </Button>
           </Form.Item>
-          <AuthButton name="admin.statistical.activity.export" noRight={null}>
+          <AuthButton name="admin.statistics.activity.export" noRight={null}>
             <Button
               type="primary"
               style={{ float: 'right', margin: '20px 0', zIndex: 1 }}

src/pages/statistics/activity/visitPersonNum.jsx

@@ -245,7 +245,7 @@ class SharePersonNum extends React.Component {
             </Button>
             <Button onClick={e => this.handleReset()} style={{ marginLeft: '30px' }}>重置</Button>
           </Form.Item>
-          <AuthButton name="admin.statistical.activity.export" noRight={null}>
+          <AuthButton name="admin.statistics.activity.export" noRight={null}>
             <Button type="primary" style={{ float: 'right', margin: '20px 0', zIndex: 1 }} onClick={this.exportActivityStats}>
               导出
             </Button>

src/services/apis.js

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