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

src/pages/statistical/activity/sharePersonNum.jsx

@@ -24,6 +24,8 @@ let staticStartDate = ''
 let staticEndDate = ''
 let queryDate = ''
 let activityName = ''
+let activityId = ''
+let activityType = ''
 
 const toShareNum = rowData => () => {
   if(rowData) {
@@ -34,7 +36,9 @@ const toShareNum = rowData => () => {
       personId: rowData.personId,
       startDate: staticStartDate,
       endDate: staticEndDate,
-      activityName: activityName
+      activityName: activityName,
+      activityId: activityId,
+      activityType: activityType
     },
   });
     return
@@ -50,7 +54,9 @@ const toVisitPersonNum = rowData => () => {
       personId: rowData.personId,
       startDate: staticStartDate,
       endDate: staticEndDate,
-      activityName: activityName
+      activityName: activityName,
+      activityId: activityId,
+      activityType: activityType
     },
   });
     return
@@ -66,7 +72,9 @@ const toVisitNum = rowData => () => {
       personId: rowData.personId,
       startDate: staticStartDate,
       endDate: staticEndDate,
-      activityName: activityName
+      activityName: activityName,
+      activityId: activityId,
+      activityType: activityType
     },
   });
     return
@@ -133,6 +141,8 @@ class SharePersonNum extends React.Component {
     activityName = props.location.query.activityName
     staticStartDate = props.location.query.startDate;
     staticEndDate = props.location.query.endDate;
+    activityId = props.location.query.activityId;
+    activityType = props.location.query.activityType;
     
     if (props.location.query.queryDate){
       startDate = moment(props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).toDate();

src/pages/statistical/building/component/StatsChart.jsx

@@ -13,50 +13,50 @@ class StatsChart extends React.Component {
   }
 
   render() {
-    const { data = {}} = this.props
+    const { data = {} } = this.props
     const options = {
       title: {
         text: this.props.title,
         subtext: this.props.subtext,
-    },
-    xAxis: {
+      },
+      xAxis: {
         type: 'category',
-        axisLabel: {rotate: 45},
+        axisLabel: { rotate: 45 },
         data: data.buildingNameList || []
-    },
-    grid: {
-      bottom:'30%'
-    },  
-    tooltip: {},
-    yAxis: {
+      },
+      grid: {
+        bottom: '30%'
+      },
+      tooltip: {},
+      yAxis: {
         type: 'value'
-    },
-    series: {
-      type: 'bar',
-      name: this.props.title,
-      barWidth: 50,
-      data: data.numList || [],
-      itemStyle: {
-        normal: {
-          barBorderRadius: [50, 50, 0, 0],
-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-            offset: 0,
-            color: '#FD8A95'
-          }, {
-            offset: 1,
-            color: '#F13043'
-          }]),
-          shadowColor: 'rgba(0, 0, 0, 0.4)',
+      },
+      series: {
+        type: 'bar',
+        name: this.props.title,
+        barWidth: 50,
+        data: data.numList || [],
+        itemStyle: {
+          normal: {
+            barBorderRadius: [50, 50, 0, 0],
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+              offset: 0,
+              color: '#FD8A95'
+            }, {
+              offset: 1,
+              color: '#F13043'
+            }]),
+            shadowColor: 'rgba(0, 0, 0, 0.4)',
 
+          }
         }
       }
     }
-}
 
     return (
-    <>
-      <EChart options={options} style={{ width: '100%', height: '400px', }} />
-    </>
+      <>
+        <EChart options={options} style={{ width: '100%', height: '400px', padding: '0.09rem 0 0 0.09rem', boxShadow: '0px 0px 16px 2px rgba(0, 0, 0, 0.12)', marginBottom: '0.16rem', borderRadius: '12px' }} />
+      </>
     )
   }
 }

src/pages/statistical/building/detail.jsx

@@ -109,6 +109,12 @@ class buildingDetailStats extends React.Component {
       })
   }
 
+   //重置搜索
+  handleReset = () => {
+    daterange = []
+    this.props.form.resetFields();
+  }
+
   render() {
     const columns = [
         {
@@ -142,26 +148,35 @@ class buildingDetailStats extends React.Component {
         },
       ];
 
+    const { getFieldDecorator } = this.props.form;
     return (
     <div>
+      <Form layout="inline">
       <Radio.Group buttonStyle="solid" defaultValue="a">
           <Radio.Button value="c" onClick={() => this.getDataOf(0)}>今日</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>
-        <RangePicker
-          style={{ paddingLeft: '30px' }}
-          ranges={{
-            Today: [moment(), moment()],
-            'This Month': [moment().startOf('month'), moment().endOf('month')],
-          }}
-          onChange={(_dates, dateStrings) => this.onChangetime(_dates, dateStrings)}
-        />
+        <Form.Item>
+        {getFieldDecorator('time', {
+            initialValue: [],
+            rules: [{ required: true, message: '请上传封面图1' }],
+        })(
+          <RangePicker
+            style={{ paddingLeft: '30px' }}
+            ranges={{
+              Today: [moment(), moment()],
+              'This Month': [moment().startOf('month'), moment().endOf('month')],
+            }}
+            onChange={(_dates, dateStrings) => this.onChangetime(_dates, dateStrings)}
+          />
+        )}
+        </Form.Item>
         <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }} onClick={() => this.datalist()}>
           查询
         </Button>
-        <Button type="danger" onClick={() => router.go(-1)} style={{ marginBottom: '18px', marginLeft: '30px' }}>重置</Button>
-
+        <Button type="danger" onClick={this.handleReset} style={{ marginBottom: '18px', marginLeft: '30px' }}>重置</Button>
+        </Form>
         <StatsChartLine title={this.state.buildingName} data={this.state.barData} />
         <Row>
             <Col span={22}>
@@ -179,5 +194,6 @@ class buildingDetailStats extends React.Component {
     )
   }
 }
+const WrappedHeader = Form.create({ name: 'record' })(buildingDetailStats);
 
-export default buildingDetailStats
+export default WrappedHeader

src/pages/statistical/building/index.jsx

@@ -32,24 +32,24 @@ class buildingStats extends React.Component {
   }
 
   componentDidMount() {
-    this.getBarData(moment().subtract(7, 'day').toDate(),new Date())
-    this.getTableData(moment().subtract(7, 'day').toDate(),new Date(),this.state.buildingId)
-    this.setState({...this.state, endDate: new Date(), startDate: moment().subtract(7, 'day').toDate() })
-    
+    this.getBarData(moment().subtract(7, 'day').toDate(), new Date())
+    this.getTableData(moment().subtract(7, 'day').toDate(), new Date(), this.state.buildingId)
+    this.setState({ ...this.state, endDate: new Date(), startDate: moment().subtract(7, 'day').toDate() })
+
   }
 
   // 获取图表数据
   getBarData = (startDate, endDate) => {
     request({ ...apis.stats.barList, params: { startDate, endDate } }).then((data) => {
-        this.setState({...this.state, barData: data})
-      })
+      this.setState({ ...this.state, barData: data })
+    })
   }
 
   //获取表格数据
-  getTableData = (startDate, endDate, buildingId,pageNum,pageSize,sortField,sortOrder) => {
-    request({ ...apis.stats.tableList, params: { startDate, endDate, buildingId,pageNum,pageSize,sortField,sortOrder } }).then((data) => {
-        this.setState({...this.state, tableData: data.records, total: data.total})
-      })
+  getTableData = (startDate, endDate, buildingId, pageNum, pageSize, sortField, sortOrder) => {
+    request({ ...apis.stats.tableList, params: { startDate, endDate, buildingId, pageNum, pageSize, sortField, sortOrder } }).then((data) => {
+      this.setState({ ...this.state, tableData: data.records, total: data.total })
+    })
   }
 
   formatDate = (start, end) => {
@@ -66,33 +66,33 @@ class buildingStats extends React.Component {
 
   //切换三个标签页
   getDataOf = (days) => {
-    this.getBarData(moment().subtract(days, 'day').toDate(),new Date())
-    this.getTableData(moment().subtract(days, 'day').toDate(),new Date(),this.state.buildingId)
+    this.getBarData(moment().subtract(days, 'day').toDate(), new Date())
+    this.getTableData(moment().subtract(days, 'day').toDate(), new Date(), this.state.buildingId)
     this.setState({ ...this.state, endDate: new Date(), startDate: moment().subtract(days, 'day').toDate() })
   }
 
   //点击查询
   datalist = () => {
-    this.getBarData(daterange[0] === undefined ? moment().subtract(7, 'day').toDate() : daterange[0],daterange[1] === undefined ? new Date() : daterange[1])
-    this.getTableData(daterange[0] === undefined ? moment().subtract(7, 'day').toDate() : daterange[0],daterange[1] === undefined ? new Date() : daterange[1],this.state.buildingId)
-    this.setState({ 
+    this.getBarData(daterange[0] === undefined ? moment().subtract(7, 'day').toDate() : daterange[0], daterange[1] === undefined ? new Date() : daterange[1])
+    this.getTableData(daterange[0] === undefined ? moment().subtract(7, 'day').toDate() : daterange[0], daterange[1] === undefined ? new Date() : daterange[1], this.state.buildingId)
+    this.setState({
       ...this.state,
       endDate: daterange[1] === undefined ? new Date() : daterange[1],
       startDate: daterange[0] === undefined ? moment().subtract(7, 'day').toDate() : daterange[0],
     })
-    
+
   }
-  
+
   //切换楼盘信息
   handleBuildingChange = (e) => {
-    this.getTableData(this.state.startDate,this.state.endDate,e)
-    this.setState({...this.state, buildingId: e})
+    this.getTableData(this.state.startDate, this.state.endDate, e)
+    this.setState({ ...this.state, buildingId: e })
   }
 
   //排序
   handleTableChange = (pagination, filters, sorter) => {
     console.log(pagination, filters, sorter)
-    this.getTableData(this.state.startDate,this.state.endDate,this.state.buildingId,pagination.current,10,sorter.columnKey,sorter.order)
+    this.getTableData(this.state.startDate, this.state.endDate, this.state.buildingId, pagination.current, 10, sorter.columnKey, sorter.order)
   };
 
   //导出
@@ -125,104 +125,123 @@ class buildingStats extends React.Component {
     });
   }
 
+  //重置搜索
+  handleReset = () => {
+    daterange = []
+    this.props.form.resetFields();
+  }
+
   render() {
     const columns = [
-        {
-          title: '项目名称',
-          dataIndex: 'buildingName',
-          key: 'buildingName',
-        },
-        {
-          title: '新增客户',
-          dataIndex: 'khNum',
-          key: 'kh_num',
-          sorter: true,
-        },
-        {
-          title: '公客',
-          dataIndex: 'gkNum',
-          key: 'gk_num',
-          sorter: true,
-        },
-        {
-          title: '私客',
-          dataIndex: 'skNum',
-          key: 'sk_num',
-          sorter: true,
-        },
-        {
-            title: '访问人数',
-            dataIndex: 'uvNum',
-            key: 'uv_num',
-            sorter: true,
-        },
-        {
-            title: '访问次数',
-            dataIndex: 'pvNum',
-            key: 'pv_num',
-            sorter: true,
-        },
-        {
-            title: '详情',
-            render: (_, record) => (
-                    <Button type="link" style={{ color: 'red' }} onClick={() => this.toDetailPage(record)}>查看详情</Button>
-                ),
-        },
-      ];
+      {
+        title: '项目名称',
+        dataIndex: 'buildingName',
+        key: 'buildingName',
+      },
+      {
+        title: '新增客户',
+        dataIndex: 'khNum',
+        key: 'kh_num',
+        sorter: true,
+      },
+      {
+        title: '公客',
+        dataIndex: 'gkNum',
+        key: 'gk_num',
+        sorter: true,
+      },
+      {
+        title: '私客',
+        dataIndex: 'skNum',
+        key: 'sk_num',
+        sorter: true,
+      },
+      {
+        title: '访问人数',
+        dataIndex: 'uvNum',
+        key: 'uv_num',
+        sorter: true,
+      },
+      {
+        title: '访问次数',
+        dataIndex: 'pvNum',
+        key: 'pv_num',
+        sorter: true,
+      },
+      {
+        title: '详情',
+        render: (_, record) => (
+          <Button type="link" style={{ color: 'red' }} onClick={() => this.toDetailPage(record)}>查看详情</Button>
+        ),
+      },
+    ];
 
+    const { getFieldDecorator } = this.props.form;
     return (
+
     <div>
+      <Form layout="inline">
       <Radio.Group buttonStyle="solid" defaultValue="a">
           <Radio.Button value="c" onClick={() => this.getDataOf(0)}>今日</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>
-        <RangePicker
-          style={{ paddingLeft: '30px' }}
-          ranges={{
-            Today: [moment(), moment()],
-            'This Month': [moment().startOf('month'), moment().endOf('month')],
-          }}
-          onChange={(_dates, dateStrings) => this.onChangetime(_dates, dateStrings)}
-        />
+        <Form.Item>
+        {getFieldDecorator('time', {
+            initialValue: [],
+            rules: [{ required: true, message: '请上传封面图1' }],
+        })(
+          <RangePicker
+              style={{ paddingLeft: '30px' }}
+              ranges={{
+                Today: [moment(), moment()],
+                'This Month': [moment().startOf('month'), moment().endOf('month')],
+              }}
+              onChange={(_dates, dateStrings) => this.onChangetime(_dates, dateStrings)}
+            />
+        )}
+        </Form.Item>
         <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }} onClick={() => this.datalist()}>
           查询
         </Button>
-        <Button type="danger" onClick={() => router.go(-1)} style={{ marginBottom: '18px', marginLeft: '30px' }}>重置</Button>
-
+        <Button type="danger" onClick={this.handleReset} style={{ marginBottom: '18px', marginLeft: '30px' }}>重置</Button>
+        </Form>
+        <div style={{fontSize:'0.09rem',color:'#999',marginBottom:'0.16rem'}}>最多显示6个项目，其他项目请在下方详细数据中搜索</div>
         <Row>
-            <Col span={12}>
-                <StatsChart title="项目公客排行" data={this.state.barData.gkBarMap} />
-            </Col>
-            <Col span={12}>
-                <StatsChart title="项目私客排行" data={this.state.barData.skBarMap} />
-            </Col>
+          <Col span={12} style={{paddingRight:'0.08rem'}}>
+            <StatsChart title="项目公客排行" data={this.state.barData.gkBarMap} />
+          </Col>
+          <Col span={12}style={{paddingLeft:'0.08rem'}}>
+            <StatsChart title="项目私客排行" data={this.state.barData.skBarMap} />
+          </Col>
         </Row>
         <Row>
-            <Col span={12}>
-                <StatsChart title="项目访问人数排行" subtext="项目详情访问情况" data={this.state.barData.wgBarMap} />
-            </Col>
-            <Col span={12}>
-                <StatsChart title="项目访问次数排行" subtext="项目详情访问情况,与上方时间筛选无关" data={this.state.barData.fwBarMap} />
-            </Col>
+          <Col span={12} style={{paddingRight:'0.08rem'}}>
+            <StatsChart title="项目访问人数排行" subtext="项目详情访问情况" data={this.state.barData.wgBarMap} />
+          </Col>
+          <Col span={12} style={{paddingLeft:'0.08rem'}}>
+            <StatsChart title="项目访问次数排行" subtext="项目详情访问情况,与上方时间筛选无关" data={this.state.barData.fwBarMap} />
+          </Col>
         </Row>
         <Row>
-            <Col span={22}>
-              <span style={{marginRight: '10px'}} >详细数据</span>
-              <BuildSelect slot='action' onChange={(e => this.handleBuildingChange(e))} value={this.state.buildingId}></BuildSelect>
-            </Col>
-            <Col span={2}>
+          <Col span={22}>
+            <span style={{ marginRight: '10px' }} >详细数据</span>
+            <BuildSelect slot='action' onChange={(e => this.handleBuildingChange(e))} value={this.state.buildingId}></BuildSelect>
+          </Col>
+          <Col span={2}>
             <AuthButton name="admin.statistical.building.export" noRight={null}>
               <Button type="primary" onClick={this.exportBuildingStats}>导出</Button>
             </AuthButton>
-            </Col>
+          </Col>
         </Row>
-        
-        
-        <Table style={{marginTop:'20px'}} dataSource={this.state.tableData} columns={columns} pagination={{ total: this.state.total}} onChange={this.handleTableChange} scroll={{ y: 500 }}></Table>
-    </div>
+
+
+        <Table style={{ marginTop: '20px' }} dataSource={this.state.tableData} columns={columns} pagination={{ total: this.state.total }} onChange={this.handleTableChange} scroll={{ y: 500 }}></Table>
+      </div>
     )
   }
 }
 
-export default buildingStats
+const WrappedHeader = Form.create({ name: 'record' })(buildingStats);
+
+export default WrappedHeader

src/pages/statistical/consultant/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Button, DatePicker, Modal, Table, Pagination, Radio, Typography } from 'antd';
+import { Form, Button, DatePicker, Modal, Table, Pagination, Radio, Icon, Typography } from 'antd';
 import router from 'umi/router';
 import moment from 'moment';
 import BuildSelect from '../../../components/SelectButton/BuildSelect'
@@ -385,7 +385,7 @@ function record(props) {
     return (
 
         <>
-            <p style={{ fontSize: '0.09rem', color: '#999' }} onClick={() => setVisible(true)}>指标说明</p>
+            <Icon type="question-circle" theme="filled" style={{ fontSize: '25px', color: '#F00',marginBottom:'10px' }} onClick={() => setVisible(true)} />
             <Modal
                 title="指标说明（数据会存在一定时间延迟）"
                 centered
@@ -398,7 +398,7 @@ function record(props) {
                 <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>主页访问次数：</p>
                 <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>访问置业顾问名片的用户数</p>
                 <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>客户总计：</p>
-                <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>当前置业顾问的所有客户数(与列表时间筛选无关)</p>
+                <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>当前置业顾问的所有客户数(与列表时间筛选无关；重复客户不记录在内，因此与下方列表置业顾问客户数总和有出入)</p>
                 <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>新增客户：</p>
                 <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>当前时间段内置业顾问新增的客户数</p>
                 <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>分享次数：</p>

src/pages/statistical/consultant/sharetable.jsx

@@ -27,7 +27,7 @@ const typeList = [
         value: 'live'
     },
     {
-        label: '房源列表',
+        label: '在线选房',
         value: 'house'
     },
     {
@@ -42,6 +42,10 @@ const typeList = [
         label: '首页',
         value: 'main'
     },
+    {
+        label: '个人主页',
+        value: 'card_share'
+    },
 ]
 const showTypeList = [
     {
@@ -53,11 +57,11 @@ const showTypeList = [
         value: 'liveApp',
     },
     {
-        label: '房源列表',
+        label: '在线选房',
         value: 'housePost',
     },
     {
-        label: '房源列表',
+        label: '在线选房',
         value: 'houseApp',
     },
 ]
@@ -95,6 +99,7 @@ function record(props) {
     //重置搜索
     function handleReset() {
         props.form.resetFields();
+        getList(formData);
     }
 
     // 提交事件

src/pages/statistical/consultant/visitNum.jsx

@@ -27,7 +27,7 @@ const typeList = [
         value: 'live_share'
     },
     {
-        label: '房源列表',
+        label: '在线选房',
         value: 'house_share'
     },
     {
@@ -42,6 +42,10 @@ const typeList = [
         label: '首页',
         value: 'share'
     },
+    {
+        label: '个人主页',
+        value: 'card_share'
+    },
 ]
 
 
@@ -79,6 +83,7 @@ function record(props) {
     //重置搜索
     function handleReset() {
         props.form.resetFields();
+        getList(formData);
     }
 
     // 提交事件
@@ -137,10 +142,10 @@ function record(props) {
         },
         {
             title: '访问时间',
-            dataIndex: 'createDate',
-            key: 'createDate',
+            dataIndex: 'visitTime',
+            key: 'visitTime',
             align: 'center',
-            render: (_, record) => <><span>{record.createDate && moment(record.createDate).format('YYYY-MM-DD HH:mm:ss')}</span></>,
+            render: (_, record) => <><span>{record.visitTime && moment(record.visitTime).format('YYYY-MM-DD HH:mm:ss')}</span></>,
         },
 
     ];