Merge branch 'dev'

config/routes.js

@@ -296,7 +296,7 @@ export default [
               },
               {
                 path: '/activity/helpActivity/signList',
-                name: '报名列表',
+                name: '助力记录',
                 hideInMenu: true,
                 component: './activity/helpActivity/signList',
               },

src/components/GlobalHeader/AvatarDropdown.jsx

@@ -79,7 +79,7 @@ class AvatarDropdown extends React.Component {
       <>
         <HeaderDropdown overlay={menuHeaderDropdown}>
             <span className={`${styles.action} ${styles.account}`}>
-              <Avatar size="small" className={styles.avatar} src={currentUser.avatar} alt="avatar" />
+              <Avatar size="small" className={styles.avatar} src={currentUser.avatar === null ? currentUser.photo:currentUser.avatar} alt="avatar" />
               <span className={styles.name}>{currentUser.userName}</span>
             </span>
         </HeaderDropdown>

src/components/SelectButton/WxDictSelect.jsx

@@ -0,0 +1,45 @@
+import React, { useState, useEffect, useRef } from 'react';
+import { Select } from 'antd';
+import apis from '../../services/apis';
+import request from '../../utils/request'
+
+const { Option } = Select;
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const WxDictSelect = props => {
+  const [data, setData] = useState([])
+  const [value, setValue] = useState([])
+  useEffect(() => {
+    getWxDictList();
+  }, [props.value])
+
+
+  const getWxDictList = e => {
+    request({ ...apis.wxDict.list, params: { pageNumber: 1, pageSize: 999 } }).then(data => {
+        setData(data.records)
+        // 默认选中第一个
+    })
+  }
+
+  return (
+      <Select
+      showSearch
+      value={props.value}
+      style={{ width: '250px' }}
+      placeholder="请选择用户来源"
+      onChange={props.onChange}
+      filterOption={(input, option) =>
+        option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      }>
+          {data.map(wxDict => (
+            <Option key={wxDict.sceneType} value={wxDict.sceneType}>{wxDict.sceneAlias}</Option>
+          ))}
+      </Select>
+  )
+}
+export default WxDictSelect

src/pages/activity/SignList.jsx

@@ -121,7 +121,7 @@ const handleSubmit = (e, props) => {
         const link = document.createElement('a')
         link.style.display = 'none'
         link.href = url
-        link.setAttribute('download', '助力者记录.xlsx')
+        link.setAttribute('download', '报名列表.xlsx')
         document.body.append(link)
         link.click()
       }).catch(() => {

src/pages/activity/drainage/DrainageList.jsx

@@ -73,6 +73,23 @@ const header = (props) => {
     });
   }
 
+  const newQrcode = row => {
+    const x = new XMLHttpRequest();
+    const resourceUrl = row.qrCode
+    console.log(resourceUrl);
+    x.open('GET', resourceUrl, true);
+    x.responseType = 'blob';
+    x.onload = function (e) {
+      const url = window.URL.createObjectURL(x.response)
+      const a = document.createElement('a');
+      a.href = url;
+      a.style.display = 'none'
+      a.download = 'H5二维码.png';
+      a.click();
+    }
+    x.send();
+  }
+
   const exchangeDrainage = drainage => () => {
     if(drainage.status === 1){
       if(drainage.isMiniapp){
@@ -206,6 +223,12 @@ const header = (props) => {
               数据
             </span>
           </AuthButton>
+          <AuthButton name="admin.taDrainage.id.delete" noRight={null}>
+            <span>{datas.isMiniapp === false ? "" : <span style={{ right: '20px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', cursor: 'pointer', marginLeft: 20 }} onClick={newQrcode.bind(this, datas)}>
+              下载二维码
+            </span>}</span>
+            
+          </AuthButton >
         </>
       ),
     },

src/pages/building/list/add/components/base.jsx

@@ -83,9 +83,9 @@ function AddBuilding(props) {
    // 获取详情信息
    function getById(currentId) {
     request({ ...apis.building.buildingGetById, urlData: { id: currentId } }).then(res => {
-      if (res.openingDate !== null) {
-        res.openingDate = moment(res.openingDate)
-      }
+      // if (res.openingDate !== null) {
+      //   res.openingDate = moment(res.openingDate)
+      // }
       if (res.receivedDate !== null) {
         res.receivedDate = moment(res.receivedDate)
       }
@@ -161,7 +161,7 @@ function AddBuilding(props) {
       data.mapJson = poi
     }
 
-    data.openingDate = moment(data.openingDate, 'yyyy-MM-dd HH:mm:ss')
+    // data.openingDate = moment(data.openingDate, 'yyyy-MM-dd HH:mm:ss')
     data.receivedDate = moment(data.receivedDate, 'yyyy-MM-dd HH:mm:ss')
     // 项目主图
     data.img = data.avatarImage && data.avatarImage.map((item, index) => ({ imgType: 'banner', url: item, orderNo: index + 1 }))
@@ -363,7 +363,7 @@ function AddBuilding(props) {
             {getFieldDecorator('price')(<Input type="number" style={{ width: '210px' }}/>)}元/m²
           </Form.Item>
           <Form.Item label="开盘时间" >
-            {getFieldDecorator('openingDate')(<DatePicker format="YYYY/MM/DD" />)}
+            {getFieldDecorator('openingDate')(<Input placeholder="预计xxxx年xx月开盘" maxLength = "15"/>)}
           </Form.Item>
           <Form.Item label="电话" >
             {getFieldDecorator('tel', {
@@ -549,6 +549,15 @@ function AddBuilding(props) {
           <Form.Item label="装修标准" >
             {getFieldDecorator('decoration')(<Input />)}
           </Form.Item>
+          <Form.Item label="开发商" >
+            {getFieldDecorator('propertyDeveloper')(<Input placeholder="不超过15个字" maxLength = "15"/>)}
+          </Form.Item>
+          <Form.Item label="备案名" >
+            {getFieldDecorator('recordName')(<Input placeholder="不超过15个字" maxLength = "15"/>)}
+          </Form.Item>
+          <Form.Item label="楼栋总数" >
+            {getFieldDecorator('buildingNum')(<Input min={0} type="number" style={{ width: 80}}/>)}
+          </Form.Item>
           {/* <Form.Item label="交房时间" >
             {getFieldDecorator('receivedDate')(<DatePicker />)}
           </Form.Item> */}

src/pages/building/list/add/components/buildingImage.jsx

@@ -123,7 +123,7 @@ function ModalEdi(props) {
             })(<Input />)}
           </Form.Item>
           {
-            !props.noImage && <Form.Item label="选择图片">
+            !props.noImage && <Form.Item label="选择图片" help="建议图片尺寸256px*252px，比例4:3,格式：jpg">
             {getFieldDecorator('img', {
               rules: [
                 {

src/pages/building/list/add/components/buildingProjectType.jsx

@@ -74,7 +74,7 @@ class TypeForm extends React.Component {
               {getFieldDecorator('status')(<Input disabled />)}
             </Form.Item>
             <Form.Item label="价格">
-              {getFieldDecorator('price')(<Input type="number" placeholder="元/㎡" onChange={e => this.onChange(e, 'price')} />)}
+              {getFieldDecorator('price')(<Input placeholder="元/㎡" maxLength="9" onChange={e => this.onChange(e, 'price')} />)}
             </Form.Item>
             <Form.Item label="装修标准">
               {getFieldDecorator('decoration')(<Input onChange={e => this.onChange(e, 'decoration')} />)}

src/pages/building/list/add/components/imageSet.jsx

@@ -25,6 +25,29 @@ const saleType = [
   },
 ]
 
+const houseType = [
+  {
+    id: 1,
+    name: '1室',
+  },
+  {
+    id: 2,
+    name: '2室',
+  },
+  {
+    id: 3,
+    name: '3室',
+  },
+  {
+    id: 4,
+    name: '4室',
+  },
+  {
+    id: 5,
+    name: '5室及以上',
+  },
+]
+
 /**
  *图片设置
  *
@@ -115,6 +138,12 @@ function imageSet(props) {
       key: 'marketStatus',
       render: (_, record) => <span>{ (saleType.filter(x => x.id == record.marketStatus)[0] || {}).name }</span>,
     },
+    {
+      title: '户型',
+      dataIndex: 'houseType',
+      key: 'houseType',
+      render: (_, record) => <span>{ (houseType.filter(x => x.id == record.houseType)[0] || {}).name }</span>,
+    },
     {
       title: '面积',
       dataIndex: 'buildingArea',

src/pages/building/list/add/components/modalImage.jsx

@@ -42,6 +42,29 @@ const saleType = [
   },
 ]
 
+const houseType = [
+  {
+    id: '1',
+    name: '1室',
+  },
+  {
+    id: '2',
+    name: '2室',
+  },
+  {
+    id: '3',
+    name: '3室',
+  },
+  {
+    id: '4',
+    name: '4室',
+  },
+  {
+    id: '5',
+    name: '5室及以上',
+  },
+]
+
 /**
  * 图片信息
  *
@@ -186,7 +209,7 @@ class ModalImage extends React.Component {
                   </Select>,
                 )}
               </Form.Item>
-              <Form.Item label="图片">
+              <Form.Item label="图片" help="建议图片尺寸336px*336px，比例1:1,格式：jpg">
               {getFieldDecorator('img', {
                   rules: [{ required: true, message: '请上传户型图片' }],
               })(
@@ -194,6 +217,17 @@ class ModalImage extends React.Component {
                 <ImageUpload />,
               )}
               </Form.Item>
+              <Form.Item label="户型">
+                {getFieldDecorator('houseType', {
+                  rules: [{ required: true, message: '请选择户型' }],
+                })(
+                  <Select placeholder="户型">
+                    {
+                      houseType.map((item, _) => <Option value={item.id}>{item.name}</Option>)
+                    }
+                  </Select>,
+                )}
+              </Form.Item>
               <Form.Item label="面积" help="单位 ㎡">
                 {getFieldDecorator('buildingArea')(<Input type="number" precision = '2' min='0.00' step='0.01'/>)}
               </Form.Item>

src/pages/customer/customerlist/customerDetail.jsx

@@ -5,6 +5,7 @@ import styles from './style.less';
 import apis from '../../../services/apis';
 import request from '../../../utils/request';
 import moment from 'moment';
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
 
 import router from 'umi/router';
 
@@ -19,6 +20,7 @@ function header(props) {
   const [tableData, setTableDataData] = useState([{}])
   const [dataConsultant, setDataonsultant] = useState({})
   const [intentionData, setIntentionData] = useState([])
+  const [buildingIdValue, setBuildingIdData] = useState()
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
@@ -71,6 +73,12 @@ function header(props) {
       setDataonsultant(res.geoInfo)
     })
   }
+
+  function changBuilding(buildingId) {
+    setBuildingIdData(buildingId)
+    getById({ pageNumber: 1, pageSize: 10, buildingId: buildingId })
+  }
+
   const columns = [
     {
       title: '访问事件',
@@ -190,7 +198,8 @@ function header(props) {
       </div>
       <div className={styles.recordBox}>
         <p className={styles.tableName}>访问记录</p>
-        <Table dataSource={tableData.records} columns={columns} pagination={{ pageSize: 10, total: tableData.total, onChange }} />
+        <BuildSelect onChange={changBuilding} value={buildingIdValue} />
+        <Table dataSource={tableData.records} columns={columns} style={{marginTop: '15px'}} pagination={{ pageSize: 10, total: tableData.total, onChange }} />
         {/* <Pagination showQuickJumper defaultCurrent={1} total={data.records} onChange={e => changePageNum(e)} current={data.visitRecords.total}/> */}
       </div>
 

src/pages/customer/customerlist/index.jsx

@@ -12,6 +12,7 @@ import ModalRecommendRecord from './components/recommend'
 import ChangeStatus from './components/changeStatus'
 import BuildSelect from '../../../components/SelectButton/BuildSelect'
 import AuthButton from '@/components/AuthButton';
+import WxDictSelect from '@/components/SelectButton/WxDictSelect';
 
 
 const { Option } = Select;
@@ -425,6 +426,11 @@ function body(props) {
             <Input placeholder="置业顾问电话" />,
           )}
         </Form.Item>}
+        <Form.Item>
+          {getFieldDecorator('sceneType')(
+            <WxDictSelect />,
+          )}
+        </Form.Item>
         <Form.Item>
             <AuthButton name="admin.customer.recommend.search" noRight={null}>
               <Button type="primary" htmlType="submit" >

src/pages/customer/customerlist/publicCustomerDetail.jsx

@@ -5,6 +5,7 @@ import publicStyle from './publicStyle.less';
 import apis from '../../../services/apis';
 import request from '../../../utils/request';
 import moment from 'moment';
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
 
 import router from 'umi/router';
 
@@ -19,6 +20,7 @@ function header(props) {
   const [tableData, setTableDataData] = useState([{ }])
   const [dataConsultant, setDataonsultant] = useState({})
   const [intentionData, setIntentionData] = useState([])
+  const [buildingIdValue, setBuildingIdData] = useState()
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
@@ -72,6 +74,12 @@ function onChange(number) {
       setDataonsultant(res.geoInfo)
     })
   }
+
+  function changBuilding(buildingId) {
+    setBuildingIdData(buildingId)
+    getById({ pageNumber: 1, pageSize: 10, buildingId: buildingId })
+  }
+
   const columns = [
     {
       title: '访问事件',
@@ -158,7 +166,8 @@ function onChange(number) {
       </div>
       <div className={publicStyle.recordBox}>
         <p className={publicStyle.tableName}>访问记录</p>
-        <Table dataSource={tableData.records} columns={columns} pagination={{ pageSize: 10, total: tableData.total, onChange }} />
+        <BuildSelect onChange={changBuilding} value={buildingIdValue} />
+        <Table dataSource={tableData.records} columns={columns} style={{marginTop: '15px'}} pagination={{ pageSize: 10, total: tableData.total, onChange }} />
       </div>
     </>
   )

src/pages/customer/drift/index.jsx

@@ -1,11 +1,13 @@
 import React, { useState, useEffect } from 'react';
-import { Table, Avatar, Alert } from 'antd';
+import { Form, Table, Avatar, Alert, Select, Button } from 'antd';
 
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import Styles from './style.less'
+import WxDictSelect from '@/components/SelectButton/WxDictSelect';
 
-function costomerDrift() {
+function costomerDrift(props) {
+  const { getFieldDecorator } = props.form
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [dataSources, setDataSources] = useState({ records: [] })
 
@@ -37,6 +39,24 @@ function costomerDrift() {
     getList({ pageNumber: pageNum, pageSize: 10 })
   }
 
+  //重置搜索
+  function handleReset() {
+    props.form.resetFields();
+    getList({ pageNumber: '1', pageSize: '10' })
+  }
+
+  // 提交事件
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+        const { startDate } = values
+        getList({ pageNum: 1, pageSize: 10, ...values })
+      }
+    });
+  }
+
   const columns = [
     {
       title: '头像',
@@ -56,12 +76,39 @@ function costomerDrift() {
       // eslint-disable-next-line no-nested-ternary
       render: (_, record) => <><span>{ record.gender === '1' ? '男' : record.gender === '2' ? '女' : '未知' }</span></>,
     },
+    {
+      title: '用户来源',
+      dataIndex: 'sceneAlias',
+      key: 'sceneAlias',
+    },
   ];
-
+  
   return (
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('sceneType')(
+            <WxDictSelect />,
+          )}
+        </Form.Item>
+
+        <Form.Item>
+            {/* <AuthButton name="admin.customer.recommend.search" noRight={null}> */}
+            <Button type="primary" htmlType="submit" >
+              查询
+            </Button>
+            {/* </AuthButton> */}
+            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
+        </Form.Item>
+      </Form>
+      <Table dataSource={dataSources.records} rowKey="drift" columns={columns} pagination={{ total: dataSources.total, onChange }} />
+    </>
     // eslint-disable-next-line max-len
-    <Table dataSource={dataSources.records} rowKey="drift" columns={columns} pagination={{ total: dataSources.total, onChange }} />
+    
   )
 }
 
-export default costomerDrift
+const WrappedBody = Form.create()(costomerDrift);
+export default WrappedBody

src/pages/indexEcharts/components/IntentionalCustomers.jsx

@@ -10,19 +10,26 @@ const UserBehavior = (props) => {
   const [data, setData] = useState({ records: [] })
   const [buildingId, setBuildingId] = useState('')
   useEffect(() => {
-    IntentionUsers()
+    IntentionUsers({ pageNum: 1, pageSize: 5 })
     // getUserBehaviorProfile(formatDate(props.startDate, props.endDate))
 
   }, [])
   function IntentionUsers (params) {
     request({
       ...apis.indexEcharts.intentionUsers,
-      params: { pageSize: 9999, ...params }
+      params: { ...params }
     }).then((data) => {
+      console.log(data,"datadata")
       setData(data)
     })
   }
 
+  // 分页
+  function onChange(pageNum) {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    IntentionUsers({ pageNum: pageNum, pageSize: 5, buildingId })
+  }
+
   // getIntentionUsers({ commit }, payload) {
   //   return new Promise((resolve, reject) => {
   //     request({
@@ -78,7 +85,7 @@ const UserBehavior = (props) => {
   ];
 
   function handleBuildingChange (e) {
-    IntentionUsers({ buildingId: e })
+    IntentionUsers({  pageNum: 1, pageSize: 5, buildingId: e })
     setBuildingId(e)
   }
   return (
@@ -88,7 +95,7 @@ const UserBehavior = (props) => {
 
         <BuildSelect slot='action' onChange={(e => handleBuildingChange(e))} value={buildingId}></BuildSelect>
 
-        <Table rowKey="IntentionalCustomers" dataSource={data.records} columns={columns} style={{marginTop:'15px'}} pagination={false} scroll={{ y: 500 }} />
+        <Table rowKey="IntentionalCustomers" dataSource={data.records} columns={columns} style={{marginTop:'15px'}} pagination={{ total: data.total, defaultPageSize: 5, onChange: e => onChange(e) }} scroll={{ y: 500 }} />
 
       </div>
 

src/pages/indexEcharts/components/UserBehaviorIndex.jsx

@@ -0,0 +1,289 @@
+import React, { Component, useState, useEffect } from 'react';
+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 'echarts/lib/component/dataZoom'
+import { Table, Select, Row, Col, Menu, Dropdown, Button, Icon, message, Modal } from 'antd';
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+
+const { Option } = Select;
+
+
+const eventcolumns = [
+  {
+    title: '编号',
+    dataIndex: 'recordId',
+    key: 'recordId',
+    align: 'center',
+    width: '16%',
+  },
+  {
+    title: '访问时间',
+    dataIndex: 'visitTime',
+    key: 'visitTime',
+    align: 'center',
+    width: '18%',
+    render: (x, row) => (
+      <>
+        <span>{ moment(row.visitTime).format('YYYY-MM-DD hh:mm:ss') }</span>
+      </>
+    ),
+  },
+  {
+    title: '离开时间',
+    dataIndex: 'leaveTime',
+    key: 'leaveTime',
+    align: 'center',
+    width: '18%',
+    render: (x, row) => (
+      <>
+        <span>{ row.leaveTime && moment(row.leaveTime).format('YYYY-MM-DD hh:mm:ss') }</span>
+      </>
+    ),
+  },
+]
+
+
+class EventcoModal extends React.Component {
+  constructor(props) {
+    super(props)
+    this.state = {
+      eventList: [],
+      visibleData: { visible: false, row: {} },
+    }
+  }
+
+  componentDidUpdate(prevProps) {
+    if (this.props.visibleData.visible !== prevProps.visibleData.visible) {
+      // eslint-disable-next-line react/no-did-update-set-state
+      this.setState({ visibleData: this.props.visibleData }, () => {
+        this.showDetails(this.props.visibleData.row)
+      })
+    }
+  }
+
+  showDetails = row => {
+    request({
+      ...apis.indexEcharts.userBehavior.profile,
+      params: { event: row.event, personId: row.personId },
+    }).then(data => {
+        this.setState({ eventList: data })
+    })
+  }
+
+  handleOk = e => {
+    this.props.onSuccess()
+  };
+
+  handleCancel = e => {
+    this.props.onSuccess()
+  };
+
+  render() {
+    return (
+      <>
+        <Modal
+          title="访问详情"
+          visible={this.state.visibleData.visible}
+          onOk={() => this.handleOk()}
+          onCancel={() => this.handleCancel()}
+          footer={null}
+        >
+         <Table rowKey="UserBehavior" dataSource={this.state.eventList} columns={eventcolumns} pagination={false} rowKey="eventall" scroll={{ y: 400 }} />
+        </Modal>
+      </>
+    )
+  }
+}
+
+
+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 UserBehaviorIndex = props => {
+  const [data, setData] = useState({ records: [] })
+  const [visibleData, setVisibleData] = useState({ visible: false, row: {} })
+  const [buildingId, setBuildingId] = useState('')
+
+  // 柱图
+  useEffect(() => {
+    const date = formatDate(props.startDate, props.endDate)
+    getUserBehaviorSummary({
+      ...date,
+      activity: props.activity,
+      event: props.event,
+      eventType: props.eventType,
+      buildingId: props.buildingId,
+    })
+    // getUserBehaviorProfile(formatDate(props.startDate, props.endDate))
+  }, [props.startDate, props.endDate, props.activity, props.event, props.eventType, props.buildingId])
+
+  const [recordList, setList] = useState([])
+  function getUserBehaviorSummary(params) {
+    request({
+      ...apis.indexEcharts.userBehavior.tsUserBehavior,
+      params,
+    }).then(data => {
+      setData(data || {})
+      // setList((data.data.records || []).filter(e => e.activity !== '客户'))
+    })
+  }
+
+
+  const seriesMaker = (data.selectUserBehavior || []).filter(e => e.activity !== '客户' && e.activity !== '首页').reduce((series, item) => {
+    let { date, activityCount, activity } = item
+    date = moment(date).format('YYYY-MM-DD')
+    if (!activityCount) activityCount = 0
+
+    // 使用对象, 可以去重
+    series[`${activity}`] = (series[`${activity}`] || []).concat([[date, activityCount]])
+
+    return series;
+  }, {})
+
+
+  const dataZoom = props.dataZoom ? [
+    {
+      type: 'inside',
+      start: 0,
+      end: 100,
+    },
+    {
+      type: 'slider',
+      start: 0,
+      end: 100,
+    },
+  ] : undefined
+
+
+  const options = {
+    title: {},
+    icon: 'rect',
+    legend: {
+      show: true,
+      zlevel: 10,
+      itemGap: 100,
+    },
+    color: ['#F12B3E', '#FE929C', '#647CE1', '#A2B9FF', '#FF844F', '#FFBB9D'],
+    tooltip: {
+      trigger: 'axis',
+    },
+    xAxis: { type: 'category' },
+    yAxis: {},
+    dataZoom,
+    series: Object.keys(seriesMaker).map(x => ({
+        type: 'line',
+        smooth: true,
+        name: x,
+        data: seriesMaker[x],
+      })),
+  }
+  function handleBuildingChange(e) {
+    const date = formatDate(props.startDate, props.endDate)
+    getUserBehaviorSummary({
+      ...date,
+      activity: props.activity,
+      event: props.event,
+      eventType: props.eventType,
+      buildingId: e,
+    })
+    setBuildingId(e)
+  }
+
+  function showDetails(row) {
+    setVisibleData({ visible: true, row })
+  }
+
+  function onSuccess() {
+    setVisibleData({ visible: false, row: {} })
+  }
+
+
+  const style = {
+    width: '100%',
+    height: '400px',
+
+  }
+
+  const columns = [
+    {
+      title: '访问事件',
+      dataIndex: 'eventName',
+      key: 'eventName',
+      align: 'center',
+      width: '16%',
+
+    },
+    {
+      title: '访问用户',
+      dataIndex: 'userName',
+      key: 'userName',
+      align: 'center',
+      width: '15%',
+
+    },
+    {
+      title: '访问次数',
+      dataIndex: 'accessCount',
+      key: 'accessCount',
+      align: 'center',
+      width: '17%',
+
+      render: (x, row) => (
+        <>
+          <span style={{ color: '#EF273A', cursor: 'pointer' }} onClick={() => showDetails(row)}> {row.accessCount}</span>
+        </>
+      ),
+    },
+    {
+      title: '首次访问时间',
+      dataIndex: 'visitTime',
+      key: 'visitTime',
+      align: 'center',
+      width: '18%',
+      render: (x, row) => (
+        <>
+          <span>{ row.visitTime && moment(row.visitTime).format('YYYY-MM-DD hh:mm:ss') }</span>
+        </>
+      ),
+    },
+    {
+      title: '离开时间',
+      dataIndex: 'leaveTime',
+      key: 'leaveTime',
+      width: '18%',
+      align: 'center',
+      render: (x, row) => (
+        <>
+          <span>{ row.leaveTime && moment(row.leaveTime).format('YYYY-MM-DD hh:mm:ss') }</span>
+        </>
+      ),
+    },
+  ]
+
+
+  return (
+    <>
+      <div>
+        {/* <p onClick={() => router.push('/indexEcharts/userBehavior')} style={{cursor: 'pointer'}}> */}
+          <span style={{ borderBottom: '1px solid #f02d40', color: '#333', fontSize: '0.12rem', fontWeight: '600' }}>用户行为</span>
+          {!props.BuildSelectHide && <span style={{ fontSize: '0.09rem', color: '#888', marginLeft: '0.06rem' }}>最近七天</span>}
+        {/* </p> */}
+        <div style={{ float: 'right', marginTop: '-40px', marginBottom: '20px' }}>
+          {!props.BuildSelectHide && <BuildSelect slot="action" onChange={(e => handleBuildingChange(e))} value={buildingId}></BuildSelect>}
+        </div>
+        <EChart options={options} style={style} />
+        {false &&
+          <Table rowKey="UserBehaviorTwo" dataSource={recordList} columns={columns} pagination={false} rowKey="userbehavior" scroll={{ y: 500 }} />
+        }
+      </div>
+      <EventcoModal visibleData={visibleData} onSuccess={() => onSuccess()} />
+    </>
+  )
+}
+
+export default UserBehaviorIndex

src/pages/indexEcharts/components/UserConversion.jsx

@@ -79,13 +79,7 @@ const UserSource = props => {
       radius: ['34%', '52%'],
       avoidLabelOverlap: false,
       label: {
-        normal: {
-          show: false,
-          position: 'center',
-          color: '#666666',
-          fontSize: 22,
-          formatter: '{d}%'
-        },
+        formatter: '{b} {@value}',
         emphasis: {
           show: true,
           formatter: '{d}%',

src/pages/indexEcharts/components/UserSex.jsx

@@ -51,6 +51,9 @@ const UserSource = (props) => {
       name: '性别比例',
       center: ['44%', '65%'],
       radius: ['34%', '52%'],
+      label: {
+        formatter: '{b} {@value}',
+      },
       data:
         dataset,
     }

src/pages/indexEcharts/components/UserSource.jsx

@@ -16,7 +16,9 @@ const formatDate = (start, end) => {
 }
 
 const UserSource = (props) => {
-  const [data, setData] = useState({ records: [] })
+  const [xData, setxData] = useState([])
+  const [fromData, setFromData] = useState([])
+  const [registerData, setRegisterData] = useState([])
   //柱图
   useEffect(() => {
     userResource(formatDate(props.startDate, props.endDate))
@@ -24,21 +26,25 @@ const UserSource = (props) => {
 
   function userResource(params) {
     request({
-      ...apis.indexEcharts.userResource,
+      ...apis.indexEcharts.selectPersonFrom,
       params,
     }).then((data) => {
-      setData(data)
-      console.log(data,"datadatadatadatavvvdatadatav")
+      console.log(data,"222222")
+      setxData(data.tdWxDicts.map(x =>  x.sceneAlias))
+      setFromData(data.tdWxDicts.map(x => x.fromData))
+      setRegisterData(data.tdWxDicts.map(x => x.registerSum))
       props.onSuccess(data)
     })
   }
 
-  const dataset = data || {};
-  const source = dataset.columnar || [];
   const subtitle = '最近7天';
   const baroptions = {
     title: { },
-    xAxis: { type: 'category' },
+    xAxis: { 
+              type: 'category',
+              data: xData,
+              axisLabel: {rotate: 45}
+            },
     legend: {
       left: '20%',
       data: ['所有用户', '注册用户']
@@ -51,6 +57,7 @@ const UserSource = (props) => {
       {
         type: 'bar', name: '所有用户', datasetIndex: 0,
         barWidth: 20,
+        data: fromData,
         itemStyle: {
           normal: {
             barBorderRadius: [20, 20, 0, 0],
@@ -70,6 +77,7 @@ const UserSource = (props) => {
         type: 'bar',
         name: '注册用户',
         barWidth: 20,
+        data: registerData,
         itemStyle: {
           normal: {
             barBorderRadius: [20, 20, 0, 0],
@@ -87,11 +95,11 @@ const UserSource = (props) => {
 
       },
     ],
-    dataset: {
-      id: 'bar',
-      dimensions: ['fromName', 'userCount', 'registered'],
-      source: source,
-    },
+    // dataset: {
+    //   id: 'bar',
+    //   dimensions: ['fromName', 'userCount', 'registered'],
+    //   source: source,
+    // },
   }
 
 

src/pages/indexEcharts/components/UserSourceDetail.jsx

@@ -0,0 +1,139 @@
+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, Menu, 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 UserSourceDetail = (props) => {
+  const [xData, setxData] = useState([])
+  const [fromData, setFromData] = useState([])
+  const [registerData, setRegisterData] = useState([])
+  //柱图
+  useEffect(() => {
+    userResource(formatDate(props.startDate, props.endDate))
+  }, [props.startDate, props.endDate])
+
+  function userResource(params) {
+    request({
+      ...apis.indexEcharts.selectPersonFromGroupByDay,
+      params,
+    }).then((data) => {
+      setxData(data.map(x =>  x.createTime))
+      setFromData(data.map(x => x.fromNum))
+      setRegisterData(data.map(x => x.registeredNum))
+      props.onSuccess(data)
+    })
+  }
+
+  const subtitle = '最近7天';
+  const baroptions = {
+    title: {
+    },
+    tooltip: {
+        trigger: 'axis'
+    },
+    legend: {
+        data: ['新用户数', '授权注册']
+    },
+    toolbox: {
+        show: true,
+        feature: {
+            dataZoom: {
+                yAxisIndex: 'none'
+            },
+            dataView: {readOnly: false},
+            magicType: {type: ['line', 'bar']},
+            restore: {},
+            saveAsImage: {}
+        }
+    },
+    xAxis: {
+        type: 'category',
+        boundaryGap: false,
+        data: xData
+    },
+    yAxis: {
+        type: 'value',
+        axisLabel: {
+            formatter: '{value} °C'
+        }
+    },
+    series: [
+        {
+            name: '新用户数',
+            type: 'line',
+            data: fromData,
+            markPoint: {
+                data: [
+                    {type: 'max', name: '最大值'},
+                    {type: 'min', name: '最小值'}
+                ]
+            },
+            markLine: {
+                data: [
+                    {type: 'average', name: '平均值'}
+                ]
+            }
+        },
+        {
+            name: '授权注册',
+            type: 'line',
+            data: registerData,
+            markPoint: {
+                data: [
+                    {name: '周最低', value: -2, xAxis: 1, yAxis: -1.5}
+                ]
+            },
+            markLine: {
+                data: [
+                    {type: 'average', name: '平均值'},
+                    [{
+                        symbol: 'none',
+                        x: '90%',
+                        yAxis: 'max'
+                    }, {
+                        symbol: 'circle',
+                        label: {
+                            position: 'start',
+                            formatter: '最大值'
+                        },
+                        type: 'max',
+                        name: '最高点'
+                    }]
+                ]
+            }
+        }
+    ]
+}
+
+  const barstyle = {
+    width: '100%',
+    height: '480px',
+    minWidth: '400px'
+  }
+
+  return (
+    <>
+      <div>
+      <p onClick={()=>router.push('/indexEcharts/userSource')}><span style={{borderBottom:'1px solid #f02d40',cursor: 'pointer',color:'#333',fontSize:'0.12rem',fontWeight:'600'}}>用户来源</span> {!props.BuildSelectHide && <span style={{ fontSize: '0.09rem', color: '#888', marginLeft: '0.06rem' }}>最近七天</span>}</p>
+
+        <EChart options={baroptions} style={barstyle} />
+
+      </div>
+
+    </>
+  )
+}
+
+export default UserSourceDetail;

src/pages/indexEcharts/components/UserSourcepie.jsx

@@ -45,7 +45,7 @@ const UserSource = (props) => {
     legend: {
       orient: 'vertical',
       x: 'left',
-      data: ['来源置业顾问', '来源全民经纪人', '自主进入'],
+      data: ['来源置业', '来源客户', '其他'],
     },
     tooltip: {
       // trigger: 'item',
@@ -53,17 +53,12 @@ const UserSource = (props) => {
     },
     series: [
       {
+        name: '用户来源',
         type: 'pie',
-        center: ['40%', '65%'],
-        radius: ['34%', '52%'],
+        center: ['50%', '65%'],
+        radius: ['25%', '40%'],
         label: {
-          normal: {
-            show: false,
-            position: 'center',
-            color: '#666666',
-            fontSize: 22,
-            formatter: '{d}%'
-          },
+          formatter: '{b} {@value}',
           emphasis: {
             show: true,
             formatter: '{d}%',
@@ -71,7 +66,7 @@ const UserSource = (props) => {
               fontSize: '22',
               fontWeight: 'bold'
             }
-          }
+          },
         },
       },
 
@@ -80,9 +75,9 @@ const UserSource = (props) => {
     dataset: {
       id: 'pie',
       source: [
-        { '用户来源': '来源置业顾问', value: person_realty_consultant, },
-        { '用户来源': '来源全民经纪人', value: person_estate_agent },
-        { '用户来源': '自主进入', value: person_null },
+        { '用户来源': '来源置业', value: person_realty_consultant, },
+        { '用户来源': '来源客户', value: person_estate_agent },
+        { '用户来源': '其他', value: person_null },
       ]
     },
   }

src/pages/indexEcharts/index.jsx

@@ -6,7 +6,7 @@ import request from '../../utils/request'
 import apis from '../../services/apis';
 import UserSource from './components/UserSource.jsx';
 import UserSourcepie from './components/UserSourcepie.jsx';
-import UserBehavior from './components/UserBehavior.jsx';
+import UserBehaviorIndex from './components/UserBehaviorIndex.jsx';
 import UserActive from './components/UserActive';
 import UserSex from './components/UserSex';
 import NewUsers from './components/NewUsers'
@@ -56,7 +56,7 @@ const indexEcharts = props => {
       }
       {checkData.includes('user_behavior') &&
         <div className={styles.behavior}>
-          <UserBehavior tableShow={false} endDate={endDate} startDate={startDate} dataZoom={false}></UserBehavior>
+          <UserBehaviorIndex tableShow={false} endDate={endDate} startDate={startDate} dataZoom={false}></UserBehaviorIndex>
         </div>
       }
       <div style={{ display: 'flex' }}>

src/pages/indexEcharts/userSource.jsx

@@ -21,40 +21,44 @@ const { Option } = Select
 // }
 
 let daterange = []
-let tableTitle = ['日期']
+let tableTitle = ['类型']
 
-const columns = [
+let columns = [
   {
     title: '日期',
-    dataIndex: 'label',
-    key: 'label',
-    width:'20%'
+    dataIndex: 'createTime',
+    key: 'createTime',
   },
-  {
-    title: '名片分享',
-    dataIndex: '名片分享',
-    key: '名片分享',
-  },
-  {
-    title: '生成海报',
-    dataIndex: '生成海报',
-    key: '生成海报',
-  },
-  {
-    title: '小程序搜索',
-    dataIndex: '小程序搜索',
-    key: '小程序搜索',
-  },
-  {
-    title: '好友分享',
-    dataIndex: '好友分享',
-    key: '好友分享',
-
-  },
-
-
+  // {
+  //   title: '名片分享',
+  //   dataIndex: '名片分享',
+  //   key: '名片分享',
+  // },
+  // {
+  //   title: '生成海报',
+  //   dataIndex: '生成海报',
+  //   key: '生成海报',
+  // },
+  // {
+  //   title: '小程序搜索',
+  //   dataIndex: '小程序搜索',
+  //   key: '小程序搜索',
+  // },
+  // {
+  //   title: '好友分享',
+  //   dataIndex: '好友分享',
+  //   key: '好友分享',
+  // },
 ]
 
+// let columns = [
+//   {
+//     title: '类型',
+//     dataIndex: 'value',
+//     key: 'value',
+//   }
+// ]
+
 class Header extends React.Component {
 
   constructor(props) {
@@ -72,8 +76,6 @@ class Header extends React.Component {
     this.setState({ endDate: new Date(), startDate: moment().subtract(7, 'day').toDate() })
   }
 
-
-
   formatDate = (start, end) => {
     const tempStartDate = `${moment(start).format('YYYY-MM-DDT00:00:00.000')}Z`
     const tempEndDate = `${moment(end).format('YYYY-MM-DDT23:59:59.999')}Z`
@@ -111,17 +113,32 @@ class Header extends React.Component {
 
   onTabledatas = (e) => {
     console.log('this.state.userType: ', this.state.userType)
-    const data = (e.data || []).reduce((acc, item) => {
-      const { date, fromName, count, registered } = item
-      const num = this.state.userType === 'registered' ? registered : count
+    e.tdWxDicts.map(x => {
+        columns = columns.filter(y => y.key != x.sceneType).concat({
+          title: x.sceneAlias,
+          dataIndex: x.sceneType,
+          key: x.sceneType,
+        })
+    })
+    const data = (e.list || []).reduce((acc, item) => {
+      const { sceneType, fromNum, registeredNum, createTime } = item
+      const num = this.state.userType === 'registered' ? registeredNum : fromNum
+      acc[createTime] = { ...acc[createTime], ...item, [`${sceneType}`]: !num ? 0 : num }
+      return acc
+    }, {})
 
-      tableTitle = tableTitle.indexOf(fromName) > -1 ? tableTitle : tableTitle.concat(fromName) // eslint-disable-line
-      acc[date] = { ...acc[date], [`${fromName}`]: !num ? 0 : num }
+    const dictData =  e.tdWxDicts.reduce((acc,item,index) => {
+      const { sceneType } = item
+      acc[sceneType] = 0
+      return acc
+    },{})
 
+    const tableData = Object.keys(data).map(k => data[k]).reduce((acc,item,index) => {
+      acc[index] = { ...dictData, ...item }
       return acc
-    }, {})
+    },[])
 
-    this.setState({ tableData: Object.keys(data).map(x => ({ label: x, ...data[x] })) })
+    this.setState({ tableData })
 
   }
 
@@ -152,7 +169,7 @@ class Header extends React.Component {
             Today: [moment(), moment()],
             'This Month': [moment().startOf('month'), moment().endOf('month')],
           }}
-          showTime
+          // showTime
           // format="YYYY/MM/DD HH:mm:ss"
           onChange={(_dates, dateStrings) => this.onChangetime(_dates, dateStrings)}
         />

src/pages/record/drainage/DrainageVisitRecordList.jsx

@@ -83,7 +83,7 @@ const header = props => {
       dataIndex: 'personType',
       key: 'personType',
       align: 'center',
-      render: (text, record) => <span>{record.shareName ? record.consultantId === null || record.consultantId === '' ? '普通客户' : '置业顾问' : ''}</span>,
+      render: (text, record) => <span>{record.personType === 'Realty Consultant' ? '置业顾问' : '普通客户' }</span>,
     },
   ];
   

src/services/apis.js

@@ -320,6 +320,16 @@ export default {
       url: `${prefix}/selectUserResource`,
       action: 'userStatistics',
     },
+    selectPersonFrom: {
+      method: 'GET',
+      url: `${prefix}/selectPersonFrom`,
+      action: 'userStatistics',
+    },
+    selectPersonFromGroupByDay: {
+      method: 'GET',
+      url: `${prefix}/selectPersonFromGroupByDay`,
+      action: 'userStatistics',
+    },
     list:{
       method:'Get',
       url: `${prefix}/indexStatistical`,
@@ -336,6 +346,11 @@ export default {
         url: `${prefix}/selectEventAll`,
         action: 'behaviorIncident',
       },
+      tsUserBehavior: {
+        method: 'GET',
+        url: `${prefix}/tsUserBehavior`,
+        action: 'tsUserBehavior',
+      },
     },
     bizEvent: {
       dict: {
@@ -999,6 +1014,13 @@ export default {
     action: 'admin.thirdPartyMiniapp.id.get',
   },
  },
+ wxDict: {
+  list: {
+    url: `${prefix}/tdWxDict`,
+    method: 'GET',
+    action: 'admin.tdWxDict.get',
+  },
+ },
  poster: {
   posterTemplate: {
     url: `${prefix}/posterTemplate`,

src/utils/request.js

@@ -89,11 +89,11 @@ request.interceptors.response.use(async (response, options) => {
       const { code, data, message } = await response.clone().json();
       if (code != 1000) {
         if (code === 1001) {
-          notification.error({
-            message: `请登录系统`,
-            // description: '请登录系统',
-          });
-          throw new Error('请登录系统');
+          // notification.error({
+          //   message: `请登录系统`,
+          //   // description: '请登录系统',
+          // });
+          // throw new Error('请登录系统');
         } else {
           notification.error({
             message: message || '请求错误',