Merge branch 'master' of http://git.ycjcjy.com/marketing/pc-admin

config/routes.js

                 hideInMenu: true,
                 component: './customer/Customer/StatusChange',
               },
-              
+
               // {
               //   path: '/customer/drift/list',
               //   name: '游客列表',
                 component: './customer/Customer/PublicCustomer/publicCustomerDetail',
               },
 
-               {
+              {
                 path: '/customer/recommend/channel',
                 name: '经纪人报备',
                 component: './recommend/channel',
                 hideInMenu: true,
                 component: './recommend/customer/audit',
               },
-
-             
             ],
           },
 
               //   hideInMenu: true,
               //   component: './Live/video/add',
               // },
-              
+
               // {
               //   path: '/staff/Staff/Edit',
               //   name: '编辑员工',
                 hideInMenu: true,
                 component: './activity/groupRoomActivity/registrationRecord',
               },
-              
 
               {
                 path: '/activity/lookHouseActivity',
                 component: './activity/lookHouseActivity/registrationRecord',
               },
 
-
-
               {
                 path: '/activity/SignupActivity',
                 name: '报名活动',
               //   hideInMenu: true,
               //   component: './activity/SignupActivity/registrationRecord',
               // },
-              
             ],
           },
           {
                 hideInMenu: true,
                 component: './findRoom/buyRoom/audit',
               },
-              
 
               {
                 path: '/findRoom/rent',
                 name: '回访设置',
                 component: './findRoom/setting',
               },
-               {
+              {
                 path: '/findRoom/messageList',
                 name: '客户留言',
                 component: './system/messageList',
             ],
           },
           {
-            path: '/statistical',
+            path: '/statistics',
             name: '数据统计',
             component: '../layouts/BlankLayout',
-            hideInMenu: true,
+            // hideInMenu: true,
             routes: [
               {
-                path: '/statistical',
-                redirect: '/statistical/monitor',
-              },
-              {
-                path: '/statistical/monitor',
+                path: '/statistics/dataReport',
                 name: '数据报表',
-                component: './statistical/Monitor',
+                component: './statistics/dataReport',
               },
               {
-                path: '/statistical/activity',
+                path: '/statistics/activity',
                 name: '活动统计',
-                component: './statistical/activity',
-              },
-              {
-                path: '/statistical/activity/detail',
-                name: '查看详情',
-                hideInMenu: true,
-                component: './statistical/activity/detail',
-              },
-              {
-                path: '/statistical/activity/sharePersonNum',
-                name: '分享统计',
-                hideInMenu: true,
-                component: './statistical/activity/sharePersonNum',
-              },
-              {
-                path: '/statistical/activity/shareNum',
-                name: '分享统计',
-                hideInMenu: true,
-                component: './statistical/activity/shareNum',
-              },
-              {
-                path: '/statistical/activity/addRegistNum',
-                name: '分享统计',
-                hideInMenu: true,
-                component: './statistical/activity/addRegistNum',
-              },
-              {
-                path: '/statistical/activity/visitNum',
-                name: '访问统计',
-                hideInMenu: true,
-                component: './statistical/activity/visitNum',
-              },
-              {
-                path: '/statistical/activity/visitPersonNum',
-                name: '访问统计',
-                hideInMenu: true,
-                component: './statistical/activity/visitPersonNum',
-              },
-              {
-                path: '/statistical/building',
-                name: '项目统计',
-                component: './statistical/building',
-              },
-              {
-                path: '/statistical/consultant',
-                name: '置业顾问KPI',
-                component: './statistical/consultant',
-              },
-
-              {
-                path: '/statistical/userSource',
-                name: '用户来源',
-                component: './indexEcharts/userSource',
-                hideInMenu: true,
-              },
-              {
-                path: '/statistical/newUsers',
-                name: '新增用户',
-                component: './indexEcharts/newUsers',
-                hideInMenu: true,
-              },
-              {
-                path: '/statistical/userBehavior',
-                name: '用户行为',
-                component: './indexEcharts/userBehavior',
-                hideInMenu: true,
-              },
-              {
-                path: '/statistical/building/detail',
-                name: '项目统计详情',
-                component: './statistical/building/detail',
-                hideInMenu: true,
-              },
-              {
-                path: '/statistical/consultant/table',
-                name: '客户总计',
-                hideInMenu: true,
-                component: './statistical/consultant/table',
-              },
-              {
-                path: '/statistical/consultant/newPersons',
-                name: '新增客户',
-                hideInMenu: true,
-                component: './statistical/consultant/table',
-              },
-              {
-                path: '/statistical/consultant/sharetable',
-                name: '分享次数',
-                hideInMenu: true,
-                component: './statistical/consultant/sharetable',
-              },
-              {
-                path: '/statistical/consultant/visitPersons',
-                name: '分享访问人数',
-                hideInMenu: true,
-                component: './statistical/consultant/visitPersons',
-              },
-              {
-                path: '/statistical/consultant/visitNum',
-                name: '分享访问次数',
-                hideInMenu: true,
-                component: './statistical/consultant/visitNum',
-              },
-              {
-                path: '/statistical/consultant/sharePersons',
-                name: '分享拓客',
-                hideInMenu: true,
-                component: './statistical/consultant/table',
-              },
-              {
-                path: '/statistical/consultant/homePagePersons',
-                name: '主页访问人数',
-                hideInMenu: true,
-                component: './statistical/consultant/homePagePersons',
-              },
-              {
-                path: '/statistical/consultant/homepageNum',
-                name: '主页访问次数',
-                hideInMenu: true,
-                component: './statistical/consultant/table',
-              },
-              {
-                path: '/statistical/consultant/chatPersons',
-                name: '咨询数',
-                hideInMenu: true,
-                component: './statistical/consultant/table',
-              },
-              {
-                path: '/statistical/consultant/favorNum',
-                name: '点赞数',
-                hideInMenu: true,
-                component: './statistical/consultant/table',
+                component: './statistics/activity',
               },
             ],
           },
+          // {
+          //   path: '/statistical',
+          //   name: '数据统计',
+          //   component: '../layouts/BlankLayout',
+          //   routes: [
+          //     {
+          //       path: '/statistical',
+          //       redirect: '/statistical/monitor',
+          //     },
+          //     {
+          //       path: '/statistical/monitor',
+          //       name: '数据报表',
+          //       component: './statistical/Monitor',
+          //     },
+          //     {
+          //       path: '/statistical/activity',
+          //       name: '活动统计',
+          //       component: './statistical/activity',
+          //     },
+          //     {
+          //       path: '/statistical/activity/detail',
+          //       name: '查看详情',
+          //       hideInMenu: true,
+          //       component: './statistical/activity/detail',
+          //     },
+          //     {
+          //       path: '/statistical/activity/sharePersonNum',
+          //       name: '分享统计',
+          //       hideInMenu: true,
+          //       component: './statistical/activity/sharePersonNum',
+          //     },
+          //     {
+          //       path: '/statistical/activity/shareNum',
+          //       name: '分享统计',
+          //       hideInMenu: true,
+          //       component: './statistical/activity/shareNum',
+          //     },
+          //     {
+          //       path: '/statistical/activity/addRegistNum',
+          //       name: '分享统计',
+          //       hideInMenu: true,
+          //       component: './statistical/activity/addRegistNum',
+          //     },
+          //     {
+          //       path: '/statistical/activity/visitNum',
+          //       name: '访问统计',
+          //       hideInMenu: true,
+          //       component: './statistical/activity/visitNum',
+          //     },
+          //     {
+          //       path: '/statistical/activity/visitPersonNum',
+          //       name: '访问统计',
+          //       hideInMenu: true,
+          //       component: './statistical/activity/visitPersonNum',
+          //     },
+          //     {
+          //       path: '/statistical/building',
+          //       name: '项目统计',
+          //       component: './statistical/building',
+          //     },
+          //     {
+          //       path: '/statistical/consultant',
+          //       name: '置业顾问KPI',
+          //       component: './statistical/consultant',
+          //     },
+
+          //     {
+          //       path: '/statistical/userSource',
+          //       name: '用户来源',
+          //       component: './indexEcharts/userSource',
+          //       hideInMenu: true,
+          //     },
+          //     {
+          //       path: '/statistical/newUsers',
+          //       name: '新增用户',
+          //       component: './indexEcharts/newUsers',
+          //       hideInMenu: true,
+          //     },
+          //     {
+          //       path: '/statistical/userBehavior',
+          //       name: '用户行为',
+          //       component: './indexEcharts/userBehavior',
+          //       hideInMenu: true,
+          //     },
+          //     {
+          //       path: '/statistical/building/detail',
+          //       name: '项目统计详情',
+          //       component: './statistical/building/detail',
+          //       hideInMenu: true,
+          //     },
+          //     {
+          //       path: '/statistical/consultant/table',
+          //       name: '客户总计',
+          //       hideInMenu: true,
+          //       component: './statistical/consultant/table',
+          //     },
+          //     {
+          //       path: '/statistical/consultant/newPersons',
+          //       name: '新增客户',
+          //       hideInMenu: true,
+          //       component: './statistical/consultant/table',
+          //     },
+          //     {
+          //       path: '/statistical/consultant/sharetable',
+          //       name: '分享次数',
+          //       hideInMenu: true,
+          //       component: './statistical/consultant/sharetable',
+          //     },
+          //     {
+          //       path: '/statistical/consultant/visitPersons',
+          //       name: '分享访问人数',
+          //       hideInMenu: true,
+          //       component: './statistical/consultant/visitPersons',
+          //     },
+          //     {
+          //       path: '/statistical/consultant/visitNum',
+          //       name: '分享访问次数',
+          //       hideInMenu: true,
+          //       component: './statistical/consultant/visitNum',
+          //     },
+          //     {
+          //       path: '/statistical/consultant/sharePersons',
+          //       name: '分享拓客',
+          //       hideInMenu: true,
+          //       component: './statistical/consultant/table',
+          //     },
+          //     {
+          //       path: '/statistical/consultant/homePagePersons',
+          //       name: '主页访问人数',
+          //       hideInMenu: true,
+          //       component: './statistical/consultant/homePagePersons',
+          //     },
+          //     {
+          //       path: '/statistical/consultant/homepageNum',
+          //       name: '主页访问次数',
+          //       hideInMenu: true,
+          //       component: './statistical/consultant/table',
+          //     },
+          //     {
+          //       path: '/statistical/consultant/chatPersons',
+          //       name: '咨询数',
+          //       hideInMenu: true,
+          //       component: './statistical/consultant/table',
+          //     },
+          //     {
+          //       path: '/statistical/consultant/favorNum',
+          //       name: '点赞数',
+          //       hideInMenu: true,
+          //       component: './statistical/consultant/table',
+          //     },
+          //   ],
+          // },
           {
             component: './404',
           },

src/components/EchartsTest/EChart.jsx

 
     render () {
         const style = {
-            width: '600px',
+            width: '100%',
             height: '400px',
             ...this.props.style || {}
         }

src/components/SelectButton/CitySelect2.jsx

   return (
       <Select
       showSearch
-      value={props.value}
+      value={props.value||''}
       style={{ width: '180px' }}
       placeholder="请选择城市"
       onChange={props.onChange}
         option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
       }
       >
+         {props.all&&<Option key={'all'} value={''}>全部</Option>}
           {data.map(city => (
             <Option key={city.id} value={city.id}>{city.name}</Option>
           ))}

src/pages/activity/SignupActivity/index.jsx

           </AuthButton>
         ) : null,
 
-        <AuthButton name="admin.buildingDynamic.tag" noRight={null}>
-          <EditIcon
-            type={row.weight === 1 ? 'cancel' : 'add'}
-            text={row.weight === 1 ? '取消标签' : '添加标签'}
-            onClick={topDynamic(row)}
-          />
-        </AuthButton>,
-
         <EditIcon
           type={row.home === 1 ? 'cancel' : 'top'}
           text={row.home === 1 ? '取消推首页' : '推荐首页'}
           onClick={homeDynamic(row)}
         />,
 
-        //   <AuthButton name="admin.buildingDynamic.dataRecord" noRight={null}>
-        //     <EditIcon type="record" text="数据记录" onClick={toDataReacord(row.dynamicId)} />
-        //   </AuthButton>,
-
         row.activityStatus === 0 || row.activityStatus === 1 ? (
           <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
             <EditIcon

src/pages/activity/groupRoomActivity/edit/Basic.jsx

   router.go('-1');
 };
 
-const type= 'house'
+const type = 'house';
 
 const BasicForm = props => {
   const [isEnlist, setIsEnlist] = useState(1);
           values.enlistEnd = moment(enlistEnd).format('YYYY-MM-DD HH:mm');
         }
 
-        values.type = type
+        values.type = type;
         if (dynamicId) {
           const checks = checkTime();
           if (checks != true) {
           request({ ...apis.activity.add, data: { ...values } })
             .then(data => {
               message.info('保存成功');
-              router.go('-1')
+              router.go('-1');
             })
             .catch(err => {
               message.info(err.msg || err.message);
             ],
           })(<Input type="number" min={1} />)}
         </Form.Item> */}
+        <Form.Item label="团房价">
+          {getFieldDecorator('groupBuyPrice', {
+          })(<Input />)}
+        </Form.Item>
+
         <Form.Item label="活动详情">{getFieldDecorator('desc')(<Wangedit />)}</Form.Item>
         <Form.Item label="报名时间">
           {getFieldDecorator('signupTime', {

src/pages/activity/groupRoomActivity/index.jsx

           </AuthButton>
         ) : null,
 
-        <AuthButton name="admin.buildingDynamic.tag" noRight={null}>
-          <EditIcon
-            type={row.weight === 1 ? 'cancel' : 'add'}
-            text={row.weight === 1 ? '取消标签' : '添加标签'}
-            onClick={topDynamic(row)}
-          />
-        </AuthButton>,
+        // <AuthButton name="admin.buildingDynamic.tag" noRight={null}>
+        //   <EditIcon
+        //     type={row.weight === 1 ? 'cancel' : 'add'}
+        //     text={row.weight === 1 ? '取消标签' : '添加标签'}
+        //     onClick={topDynamic(row)}
+        //   />
+        // </AuthButton>,
 
         <EditIcon
           type={row.home === 1 ? 'cancel' : 'top'}

src/pages/activity/lookHouseActivity/index.jsx

     });
   };
 
-  //   置顶
-  const topDynamic = row => () => {
-    const weight = Math.abs(row.weight - 1);
-    request({ ...apis.activity.weight, params: { dynamicId: row.dynamicId, weight } })
-      .then(data => {
-        message.info('操作成功！');
-        ref.current.reload();
-      })
-      .catch(err => {
-        console.log(err);
-        message.info(err.msg || err.message);
-      });
-  };
 
   //   推首页
   const homeDynamic = row => () => {
           />
         </AuthButton>,
 
-        // //   <EditIcon type="look" text="查看详情" onClick={toSignupActivityDetail(row.dynamicId)} />,
-
         row.activityStatus === 0 ? (
           <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
             <EditIcon type="end" text="结束活动" onClick={finishDynamic.bind(this, row)} />
           </AuthButton>
         ) : null,
 
-        <AuthButton name="admin.buildingDynamic.tag" noRight={null}>
-          <EditIcon
-            type={row.weight === 1 ? 'cancel' : 'add'}
-            text={row.weight === 1 ? '取消标签' : '添加标签'}
-            onClick={topDynamic(row)}
-          />
-        </AuthButton>,
-
         <EditIcon
           type={row.home === 1 ? 'cancel' : 'top'}
           text={row.home === 1 ? '取消推首页' : '推荐首页'}
           onClick={homeDynamic(row)}
         />,
 
-        //   <AuthButton name="admin.buildingDynamic.dataRecord" noRight={null}>
-        //     <EditIcon type="record" text="数据记录" onClick={toDataReacord(row.dynamicId)} />
-        //   </AuthButton>,
-
         row.activityStatus === 0 || row.activityStatus === 1 ? (
           <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
             <EditIcon

src/pages/carouselFigure/customImg/edit.jsx

           label: '首页分享',
           value: 'index',
         },
-        {
-          label: '首页资讯',
-          value: 'indexNews',
-        },
+        // {
+        //   label: '首页资讯',
+        //   value: 'indexNews',
+        // },
       ],
       rules: [{ required: true, message: '请选择类型' }],
     },

src/pages/carouselFigure/editCarousel.jsx

         help: () =>
           locationType
             ? '建议图片尺寸：750*250px，比例3:1,格式：jpg，用于积分商城banner轮播'
-            : '建议图片尺寸：750*464px，比例1.:0.618,格式：jpg，用于：首页顶部banner轮播',
+            : '建议图片尺寸：690*345px，比例1.:0.5,格式：jpg，用于：首页顶部banner轮播',
         rules: [{ required: true, message: '请上传轮播图' }],
       },
       {

src/pages/staff/staff/Edit/index.jsx

     {
       label: '简介',
       name: 'description',
-      render: <TextArea></TextArea>,
+      render: <TextArea rows={7}></TextArea>,
       value: userData.description,
       // className={channels.inpuitTxt}
     },

src/pages/statistics/activity/index.jsx

+import React, { Component, useState, useEffect } from 'react';
+import { Card, Row, Col, Statistic, Icon } from 'antd';
+// import IndexEcharts from './components/indexEcharts';
+// import Swiper from './swiper/index';
+import router from 'umi/router';
+import request from '@/utils/request';
+import apis from '@/services/apis';
+// import Count from './components/Count';
+// import SourceRole from './components/SourceRole';
+// import UserSex from './components/UserSex';
+// import UserConversion from './components/UserConversion';
+// import BuildingStatistic from './BuildingStatistic';
+
+const DataReport = props => {
+  const [data, setData] = useState([]);
+
+  return (
+    <>234
+      {/* <div style={{ marginBottom: '20px' }}>
+        <Count></Count>
+      </div>
+      <div style={{ marginBottom: '20px' }}>
+        <Row gutter={16} style={{ textAlign: 'center' }}>
+          <Col span={8}>
+            <SourceRole></SourceRole>
+          </Col>
+          <Col span={8}>
+            <UserSex></UserSex>
+          </Col>
+          <Col span={8}>
+            <UserConversion></UserConversion>
+          </Col>
+        </Row>
+      </div>
+      <div style={{ marginBottom: '20px' }}>
+        <BuildingStatistic></BuildingStatistic>
+      </div> */}
+    </>
+  );
+};
+export default DataReport;

src/pages/statistics/compents/TimeSelect.jsx

+import React, { Component, useState, useEffect } from 'react';
+import { Card, Row, Col, Statistic, Icon, Button, DatePicker } from 'antd';
+import ButtonGroup from 'antd/lib/button/button-group';
+import moment from 'moment';
+
+const { RangePicker } = DatePicker;
+const TimeSelect = props => {
+  const { value, onChange } = props;
+
+  const [rangePickerValue, setRangePickerValue] = useState();
+  const [type, setType] = useState('');
+  //   const [rangePickerValue,setRangePickerValue] = useState()
+  useEffect(() => {
+    setType('week');
+  }, []);
+  useEffect(() => {
+    console.log(type);
+    if (type == 'today') {
+      setRangePickerValue([moment().subtract('day'), moment()]);
+    } else if (type == 'week') {
+      setRangePickerValue([moment().subtract(1, 'week'), moment()]);
+    } else if (type == 'month') {
+      setRangePickerValue([moment().subtract(1, 'month'), moment()]);
+    }
+  }, [type]);
+
+  useEffect(() => {
+    if (rangePickerValue) {
+      onChange(rangePickerValue);
+    }
+  }, [rangePickerValue]);
+
+  const isActive = e => {
+    // const { rangePickerValue } = this.state;
+    // const value = getTimeDistance(type);
+    // if (!rangePickerValue[0] || !rangePickerValue[1]) {
+    //   return;
+    // }
+    // if (
+    //   rangePickerValue[0].isSame(value[0], 'day') &&
+    //   rangePickerValue[1].isSame(value[1], 'day')
+    // ) {
+    //   return styles.currentDate;
+    // }
+  };
+
+  const selectDate = e => {};
+
+  const handleRangePickerChange = e => {
+    onChange(e);
+  };
+
+  return (
+    <div style={{ display: 'flex' }}>
+      <div>
+        <Button type='link' style={type==='today'?undefined:{color:'rgba(0,0,0,0.65)'}} onClick={() => setType('today')}>今日</Button>
+        <Button type='link' style={type==='week'?undefined:{color:'rgba(0,0,0,0.65)'}} onClick={() => setType('week')}>最近一周</Button>
+        <Button type='link' style={type==='month'?undefined:{color:'rgba(0,0,0,0.65)'}} onClick={() => setType('month')}>最近一月</Button>
+      </div>
+      <RangePicker
+        value={rangePickerValue}
+        onChange={handleRangePickerChange}
+        style={{ width: 256 }}
+      />
+    </div>
+  );
+};
+export default TimeSelect;

src/pages/statistics/dataReport/BuildingStatistic/component/StatsChart.jsx

+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 echarts from 'echarts/lib/echarts';
+import EChart from '@/components/EchartsTest/EChart';
+import router from 'umi/router';
+
+class StatsChart extends React.Component {
+
+  constructor(props) {
+    super(props)
+    this.state = {}
+  }
+
+  render() {
+    const { data = {} } = this.props
+    const options = {
+      title: {
+        text: this.props.title,
+        subtext: this.props.subtext,
+      },
+      xAxis: {
+        type: 'category',
+        axisLabel: { rotate: 45 },
+        data: data.buildingNameList || []
+      },
+      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: '#FFC6AA'
+            }, {
+              offset: 1,
+              color: '#FF7E48'
+            }]),
+            shadowColor: 'rgba(0, 0, 0, 0.4)',
+
+          }
+        }
+      }
+    }
+
+    return (
+      <>
+        <EChart options={options} style={{ width: '100%', height: '400px'}} />
+      </>
+    )
+  }
+}
+
+export default StatsChart

src/pages/statistics/dataReport/BuildingStatistic/component/StatsChartLine.jsx

+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 echarts from 'echarts/lib/echarts';
+import EChart from '../../../../components/EchartsTest/EChart';
+import router from 'umi/router';
+
+class StatsChart extends React.Component {
+
+  constructor(props) {
+    super(props)
+    this.state = {}
+  }
+
+  render() {
+    const { data = {}} = this.props
+    const options = {
+      title: {
+          text: this.props.title,
+      },
+      tooltip: {
+          trigger: 'axis'
+      },
+      legend: {
+          data: ['公客数', '私客数', '新增客户数', '访问人数']
+      },
+      grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true
+      },
+      toolbox: {
+          feature: {
+              saveAsImage: {}
+          }
+      },
+      xAxis: {
+          type: 'category',
+          boundaryGap: false,
+          axisLabel: {rotate: 45},
+          data: data.timeList || []
+      },
+      yAxis: {
+          type: 'value'
+      },
+      series: [
+          {
+              name: '公客数',
+              type: 'line',
+              data: data.gkList || []
+              
+          },
+          {
+              name: '私客数',
+              type: 'line',
+              data: data.skList || []
+          },
+          {
+              name: '新增客户数',
+              type: 'line',
+              data: data.khList || []
+          },
+          {
+              name: '访问人数',
+              type: 'line',
+              data: data.uvList || []
+          }
+      ]
+  };
+  
+
+    return (
+    <>
+      <EChart options={options} style={{ width: '100%', height: '400px', }} />
+    </>
+    )
+  }
+}
+
+export default StatsChart

src/pages/statistics/dataReport/BuildingStatistic/index.jsx

+import React, { Component, useState, useEffect } from 'react';
+import { Card, Row, Col, Statistic, Icon, Button } from 'antd';
+// import IndexEcharts from './components/indexEcharts';
+import moment from 'moment';
+import request from '@/utils/request';
+import apis from '@/services/apis';
+import CitySelect from '@/components/SelectButton/CitySelect2';
+import TimeSelect from '../../compents/TimeSelect';
+import StatsChart from './component/StatsChart'
+
+const BuildingStatistic = props => {
+  const [city, setCity] = useState('');
+
+  const [data, setData] = useState({});
+  const onTimeChange = e => {
+    console.log(e, 'onTimeChange');
+    getData({startDate:e[0],endDate:e[1]})
+  };
+
+  const getData = params => {
+    request({
+      ...apis.stats.barList,
+      params: {
+        startDate: moment(params.startDate).format('YYYY-MM-DDT00:00:00.000') + 'Z',
+        endDate: moment(params.endDate).format('YYYY-MM-DDT23:59:59.999') + 'Z',
+      },
+    }).then(data => {
+        setData( data);
+    });
+  };
+console.log(data,'----------')
+  return (
+    <Card
+      title={<CitySelect value={city} onChange={e => setCity('e')} all />}
+      headStyle={{ textAlign: 'left' }}
+      extra={<TimeSelect onChange={onTimeChange}></TimeSelect>}
+    >
+      <Row>
+        <Col span={12}>
+          <StatsChart title="项目公客排行" data={data.gkBarMap} />
+        </Col>
+        <Col span={12}>
+          <StatsChart title="项目私客排行" data={data.skBarMap} />
+        </Col>
+      </Row>
+      <Row>
+        <Col span={12}>
+          <StatsChart
+            title="项目访问人数排行"
+            subtext="项目详情访问情况"
+            data={data.wgBarMap}
+          />
+        </Col>
+        <Col span={12}>
+          <StatsChart
+            title="项目访问次数排行"
+            data={data.fwBarMap}
+          />
+        </Col>
+      </Row>
+    </Card>
+  );
+};
+export default BuildingStatistic;

src/pages/statistics/dataReport/components/Count.jsx

+import React, { Component, useState, useEffect } from 'react';
+import { Card, Row, Col, Statistic, Icon } from 'antd';
+// import IndexEcharts from './components/indexEcharts';
+// import Swiper from './swiper/index';
+import router from 'umi/router';
+import request from '@/utils/request';
+import apis from '@/services/apis';
+
+const Count = props => {
+  const [data, setData] = useState([]);
+
+  return (
+    <>
+      <Row gutter={16} style={{textAlign:'center'}}>
+        <Col span={4}>
+          <Card>
+            <Statistic
+              title="总用户"
+              value={110}
+              //   valueStyle={{ color: '#3f8600' }}
+            />
+          </Card>
+        </Col>
+        <Col span={4}>
+          <Card>
+            <Statistic
+              title="总注册用户"
+              value={110}
+              //   valueStyle={{ color: '#cf1322' }}
+            />
+          </Card>
+        </Col>
+        <Col span={4}>
+          <Card>
+            <Statistic
+              title="今日访问次数"
+              value={110}
+              //   valueStyle={{ color: '#3f8600' }}
+            />
+          </Card>
+        </Col>
+        <Col span={4}>
+          <Card>
+            <Statistic
+              title="今日新增用户"
+              value={110}
+              //   valueStyle={{ color: '#cf1322' }}
+            />
+          </Card>
+        </Col>
+        <Col span={4}>
+          <Card>
+            <Statistic
+              title="渠道数量"
+              value={110}
+              //   valueStyle={{ color: '#3f8600' }}
+            />
+          </Card>
+        </Col>
+        <Col span={4}>
+          <Card>
+            <Statistic
+              title="经纪人数量"
+              value={110}
+              //   valueStyle={{ color: '#cf1322' }}
+            />
+          </Card>
+        </Col>
+      </Row>
+    </>
+  );
+};
+export default Count;

src/pages/statistics/dataReport/components/SourceRole.jsx

+import React, { Component, useState, useEffect } from 'react';
+import echarts from 'echarts/lib/echarts';
+import EChart from '@/components/EchartsTest/EChart';
+import request from '@/utils/request';
+import apis from '@/services/apis';
+import moment from 'moment';
+import router from 'umi/router';
+import { Table, Select, Row, Col, Card, Dropdown, Button, Icon, message } from 'antd';
+
+const formatDate = (start, end) => {
+  const startDate = moment(start).format('YYYY-MM-DDT00:00:00.000') + 'Z';
+  const endDate = moment(end).format('YYYY-MM-DDT23:59:59.999') + 'Z';
+  return { startDate, endDate };
+};
+const SourceRole = props => {
+  const [data, setData] = useState({ records: [] });
+  const endDate = new Date();
+
+  const startDate = moment()
+    .subtract(7, 'day')
+    .toDate();
+
+  useEffect(() => {
+    userResource(formatDate(startDate, endDate));
+  }, []);
+
+  function userResource(params) {
+    request({
+      ...apis.indexEcharts.userResource,
+      params,
+    }).then(data => {
+      setData(data);
+    });
+  }
+  const dataset = data || {};
+
+  const { person_estate_agent = 0, person_null = 0, person_realty_consultant = 0 } =
+    dataset.pie || {};
+
+  const pieoptions = {
+    color: ['#6B82E6', '#F02D40', '#FF834E'],
+    tooltip: {
+      trigger: 'item',
+      formatter: '{a} <br/>{b}: {c} ({d}%)',
+    },
+    legend: {
+      orient: 'horizontal',
+      left: 10,
+      data: [`来源置业`, `来源客户`, `其他`],
+    },
+    // :${person_realty_consultant}:${person_estate_agent}${person_null}
+    series: [
+      {
+        name: '访问来源',
+        type: 'pie',
+        radius: ['45%', '70%'],
+        avoidLabelOverlap: false,
+        label: {
+          show: false,
+          position: 'center',
+        },
+        emphasis: {
+          label: {
+            show: true,
+            fontSize: '30',
+            fontWeight: 'bold',
+          },
+        },
+        labelLine: {
+          show: false,
+        },
+        data: [
+          { value: person_realty_consultant, name: '来源置业' },
+          { value: person_estate_agent, name: '来源客户' },
+          { value: person_null, name: '其他' },
+        ],
+        // data: [
+        //     { '用户来源': '来源置业', value: person_realty_consultant, },
+        //     { '用户来源': '来源客户', value: person_estate_agent },
+        //     { '用户来源': '其他', value: person_null },
+        // ]
+      },
+    ],
+  };
+
+  //   const pieoptions = {
+  //     color: ['#6B82E6', '#F02D40', '#FF834E'],
+  //     legend: {
+  //       orient: 'vertical',
+  //       x: 'left',
+  //       data: ['来源置业', '来源客户', '其他'],
+  //     },
+  //     tooltip: {
+  //       // trigger: 'item',
+  //       // formatter: "{a} <br/>{b} : {c} ({d}%)"
+  //     },
+  //     series: [
+  //       {
+  //         name: '用户来源',
+  //         type: 'pie',
+  //         center: ['50%', '65%'],
+  //         radius: ['25%', '40%'],
+  //         label: {
+  //           formatter: '{b} {@value}',
+  //           emphasis: {
+  //             show: true,
+  //             formatter: '{d}%',
+  //             textStyle: {
+  //               fontSize: '22',
+  //               fontWeight: 'bold'
+  //             }
+  //           },
+  //         },
+  //       },
+
+  //     ],
+
+  //     dataset: {
+  //       id: 'pie',
+  //       source: [
+  //         { '用户来源': '来源置业', value: person_realty_consultant, },
+  //         { '用户来源': '来源客户', value: person_estate_agent },
+  //         { '用户来源': '其他', value: person_null },
+  //       ]
+  //     },
+  //   }
+
+  return (
+    <Card title="来源角色" headStyle={{textAlign:'left'}}>
+      <EChart options={pieoptions} styles={{ width: '100%' }} />
+    </Card>
+  );
+};
+
+export default SourceRole;

src/pages/statistics/dataReport/components/UserConversion.jsx

+import React, { Component, useState, useEffect } from 'react';
+import echarts from 'echarts/lib/echarts';
+import EChart from '@/components/EchartsTest/EChart';
+import request from '@/utils/request';
+import apis from '@/services/apis';
+import moment from 'moment';
+import router from 'umi/router';
+import { Table, Select, Row, Col, Card, Dropdown, Button, Icon, message } from 'antd';
+
+// import styles from '../styles.less'
+
+
+const UserConversion = props => {
+
+  const [theCurrent, setTheCurrent] = useState({ records: [] })
+  const [conversionRate, setConversionRate] = useState(0)
+  useEffect(() => {
+    UserConversionRate({ conversion: 'authorization_phone' })
+  }, [])
+
+  function UserConversionRate(params) {
+
+    request({
+      ...apis.indexEcharts.userConversion,
+      params,
+    }).then(data => {
+      console.log(data.data_count.registeredCount / data.data_count.pvNum, '1241234')
+      setDataset(data, params.conversion)
+    })
+  }
+
+  function setDataset(data, theStatis) {
+    const { pvNum, ...other } = data.data_count
+
+    // 获取第一个值
+    let num = 0
+    for (const v of Object.keys(other)) {
+      num = other[v]
+      break
+    }
+
+    if (pvNum < num) {
+      setTheCurrent([
+        { name: getStatisName(theStatis), value: '0' },
+        { name: '其余', value:  '0' },
+      ])
+    } else {
+
+      setConversionRate(num / pvNum)
+      setTheCurrent([
+        { name: getStatisName(theStatis), value: num },
+        { name: '其余', value: pvNum - num },
+      ])
+    }
+  }
+
+  function getStatisName(theStatis) {
+    const statisTypes = [
+      { label: '授权手机', value: 'authorization_phone' },
+      { label: '项目收藏', value: 'building_save' },
+      { label: '项目转发', value: 'building_share' },
+      { label: '活动收藏', value: 'activity_save' },
+      { label: '活动转发', value: 'activity_share' },
+      { label: '资讯收藏', value: 'news_save' },
+      { label: '资讯转发', value: 'news_share' },
+      { label: '活动报名', value: 'activity_sign' },
+
+    ]
+    return statisTypes.filter(x => x.value === theStatis)[0].label
+  }
+
+  const options = {
+    color: ['#6B82E6', '#F02D40', '#FF834E'],
+    tooltip: {
+      trigger: 'item',
+      formatter: '{a} <br/>{b}: {c} ({d}%)',
+    },
+    label: {
+      show: false,
+      position: 'center',
+    },
+    legend: {
+      orient: 'horizontal',
+      left: 10,
+      // data: [`来源置业`, `来源客户`, `其他`],
+    },
+    series: {
+      type: 'pie',
+      name: '转化率',
+
+      radius: ['45%', '70%'],
+      avoidLabelOverlap: false,
+      label: {
+        show: false,
+        position: 'center',
+      },
+      emphasis: {
+        label: {
+          show: true,
+          fontSize: '30',
+          fontWeight: 'bold',
+        },
+      },
+      labelLine: {
+        show: false,
+      },
+      data: theCurrent,
+    },
+  };
+
+  function onChange(e) {
+    UserConversionRate({ conversion: e })
+  }
+
+
+  return (
+    <Card title="转化率" headStyle={{ textAlign: 'left' }}>
+    <EChart options={options}  styles={{ width: '100%' }}/>
+  </Card>
+    // <>
+    //   <div>
+    
+
+    //     <Select
+    //       style={{ width: 200 }}
+    //       placeholder="授权手机"
+    //       onChange={onChange}
+    //     >
+    //       <Select.Option value="authorization_phone">授权手机</Select.Option>
+    //       <Select.Option value="building_save">项目收藏</Select.Option>
+    //       <Select.Option value="building_share">项目转发</Select.Option>
+    //       <Select.Option value="activity_save">活动收藏</Select.Option>
+    //       <Select.Option value="activity_share">活动转发</Select.Option>
+    //       <Select.Option value="news_save">资讯收藏</Select.Option>
+    //       <Select.Option value="news_share">资讯转发</Select.Option>
+    //       <Select.Option value="activity_sign">活动报名</Select.Option>
+    //     </Select>
+    //     <EChart options={options} style={piestyles} />
+
+
+    //   </div>
+
+
+    // </>
+  )
+}
+
+export default UserConversion

src/pages/statistics/dataReport/components/UserSex.jsx

+import React, { Component, useState, useEffect } from 'react';
+import echarts from 'echarts/lib/echarts';
+import EChart from '@/components/EchartsTest/EChart';
+import request from '@/utils/request';
+import apis from '@/services/apis';
+import moment from 'moment';
+import router from 'umi/router';
+import { Table, Select, Row, Col, Card, Dropdown, Button, Icon, message } from 'antd';
+
+// import styles from '../styles.less'
+
+const formatDate = (start, end) => {
+  const startDate = moment(start).format('YYYY-MM-DDT00:00:00.000') + 'Z';
+  const endDate = moment(end).format('YYYY-MM-DDT23:59:59.999') + 'Z';
+  return { startDate, endDate };
+};
+
+const UserSource = props => {
+  const [data, setData] = useState({ records: [] });
+  const endDate = new Date();
+  const startDate = moment()
+    .subtract(7, 'day')
+    .toDate();
+
+  useEffect(() => {
+    UserSex(formatDate(startDate, endDate));
+  }, []);
+
+  function UserSex(params) {
+    request({
+      ...apis.indexEcharts.userSex,
+      params,
+    }).then(data => {
+      setData(data);
+    });
+  }
+  undefined;
+  const dataset = data.selectSexUser || [];
+
+  const options = {
+    color: ['#6B82E6', '#F02D40', '#FF834E'],
+    tooltip: {
+      trigger: 'item',
+      formatter: '{a} <br/>{b}: {c} ({d}%)',
+    },
+    label: {
+      show: false,
+      position: 'center',
+    },
+    legend: {
+      orient: 'horizontal',
+      left: 10,
+      // data: [`来源置业`, `来源客户`, `其他`],
+    },
+    series: {
+      type: 'pie',
+      name: '性别比例',
+
+      radius: ['45%', '70%'],
+      avoidLabelOverlap: false,
+      label: {
+        show: false,
+        position: 'center',
+      },
+      emphasis: {
+        label: {
+          show: true,
+          fontSize: '30',
+          fontWeight: 'bold',
+        },
+      },
+      labelLine: {
+        show: false,
+      },
+      data: dataset,
+    },
+  };
+
+  const piestyles = {
+    width: '100%',
+    height: '400px',
+    minWidth: '350px',
+  };
+
+  return (
+    <Card title="性别比例" headStyle={{ textAlign: 'left' }}>
+      <EChart options={options} styles={{ width: '100%' }} />
+    </Card>
+  );
+};
+
+export default UserSource;

src/pages/statistics/dataReport/index.jsx

+import React, { Component, useState, useEffect } from 'react';
+import { Card, Row, Col, Statistic, Icon } from 'antd';
+// import IndexEcharts from './components/indexEcharts';
+// import Swiper from './swiper/index';
+import router from 'umi/router';
+import request from '@/utils/request';
+import apis from '@/services/apis';
+import Count from './components/Count';
+import SourceRole from './components/SourceRole';
+import UserSex from './components/UserSex';
+import UserConversion from './components/UserConversion';
+import BuildingStatistic from './BuildingStatistic';
+
+const DataReport = props => {
+  const [data, setData] = useState([]);
+
+  return (
+    <>
+      <div style={{ marginBottom: '20px' }}>
+        <Count></Count>
+      </div>
+      <div style={{ marginBottom: '20px' }}>
+        <Row gutter={16} style={{ textAlign: 'center' }}>
+          <Col span={8}>
+            <SourceRole></SourceRole>
+          </Col>
+          <Col span={8}>
+            <UserSex></UserSex>
+          </Col>
+          <Col span={8}>
+            <UserConversion></UserConversion>
+          </Col>
+        </Row>
+      </div>
+      <div style={{ marginBottom: '20px' }}>
+        <BuildingStatistic></BuildingStatistic>
+      </div>
+    </>
+  );
+};
+export default DataReport;

src/pages/system/Sellhouse/Edit.jsx

       ],
     },
     {
-      label: '副标题',
+      label: '缩略标题',
       name: 'subtitle',
       type: FieldTypes.Text,
       value: policyData.subtitle,
+      help: '7个字以内',
       rules: [
         {
           required: true,
-          message: '请输入副标题',
+          message: '请输入缩略标题',
         },
         {
           max: 8,
-          message: '最大可输入8个字符',
+          message: '最大可输入7个字符',
         },
       ],
     },