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

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

@@ -52,10 +52,8 @@ function AddBuilding(props) {
 
    // 获取详情信息
    function getById(currentId) {
-    const { url, method } = apis.building.buildingGetById
-    const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(currentId)
 
-    request({ url: tempUrl, method }).then(res => {
+    request({ ...apis.building.buildingGetById, urlData: { id: currentId } }).then(res => {
       res.openingDate = moment(res.openingDate)
       res.receivedDate = moment(res.receivedDate)
       res.avatarImage = res.buildingImg.map(item => item.url)

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

@@ -51,10 +51,7 @@ function imageSet(props) {
 
   function getList(params) {
     // 网路请求
-    const { url, method } = apis.building.buildingApartment
-    const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(props.building.buildingId)
-
-    request({ url: tempUrl, method, params: { ...params } }).then(res => {
+    request({ ...apis.building.buildingApartment, urlData: { id: props.building.buildingId }, params: { ...params } }).then(res => {
       setData(res)
     }).catch(err => {
       openNotificationWithIcon('error', err.message)
@@ -86,10 +83,7 @@ function imageSet(props) {
    */
   function deleteApartment(record) {
     // 网路请求
-    const { url, method } = apis.building.buildingApartmentDelete
-    const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(record.apartmentId)
-
-    request({ url: tempUrl, method }).then(res => {
+    request({ ...apis.building.buildingApartmentDelete, urlData: { id: record.apartmentId } }).then(res => {
       getList()
       openNotificationWithIcon('error', '操作成功')
     }).catch(err => {

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

@@ -87,10 +87,7 @@ class ModalImage extends React.Component {
     }
 
     // 网路请求
-    const { url, method } = apis.building.buildingApartmentGetById
-    const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(apartmentId)
-
-    request({ url: tempUrl, method, params: { ...params } }).then(res => {
+    request({ ...apis.building.buildingApartmentGetById, urlData: { id: apartmentId }, params: { ...params } }).then(res => {
       // res.img = res.buildingImgList.map((item, _) => item.url)
       res.img = res.buildingImgList.map(item => item.url)
       this.props.form.setFieldsValue(res)

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

@@ -51,10 +51,8 @@ const Poster = props => {
 
   // 获取详情信息
   function getById(currentId) {
-    const { url, method } = apis.building.buildingGetById
-    const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(currentId)
-
-    request({ url: tempUrl, method }).then(res => {
+ 
+    request({ ...apis.building.buildingGetById, urlData: { id: currentId } }).then(res => {
       setBuilding(res)
     })
   }

src/pages/building/list/index.jsx

@@ -77,16 +77,13 @@ function CartBody(props) {
    * @param {*} record
    */
   function deleteBuilding(record) {
-    const { url, method } = apis.building.deleteBuilding
-    const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(record.buildingId)
-
     const modal = Modal.confirm();
     modal.update({
       content: '确定删除此楼盘？',
       okText: '确认',
       cancelText: '关闭',
       onOk: () => {
-        request({ url: tempUrl, method }).then(() => {
+        request({ ...apis.building.deleteBuilding, urlData: { id: record.buildingId } }).then(() => {
           openNotificationWithIcon('success', '操作成功')
           props.onSuccess()
         }).catch(err => {
@@ -245,7 +242,6 @@ function body(props) {
           {getFieldDecorator('name')(
             <Input
               prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-              type="password"
               placeholder="楼盘名称"
             />,
           )}

src/pages/building/type/edi.jsx

@@ -31,10 +31,7 @@ function body(props) {
 
   // 获取详情信息
   function getById(currentId) {
-    const { url, method } = apis.buildingType.getById
-    const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(currentId)
-
-    request({ url: tempUrl, method }).then(res => {
+    request({ ...apis.buildingType.getById, urlData: { id: currentId } }).then(res => {
       data = res
       props.form.setFieldsValue(res)
     })

src/pages/customer/independentList/index.jsx

@@ -333,7 +333,12 @@ function body(props) {
   }
 
   function exportIndependen() {
+    request({ ...apis.customer.customerRecommendAgentsExport, responseType: 'blob' })
+    .then(response => {
+      download(response)
+    }).catch(error => {
 
+    })
   }
 
   function download(data) {
@@ -432,7 +437,7 @@ function body(props) {
             </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" onClick={() => exportIndependen()} className={Styles.SubmitButton} style={{ marginTop: '5px', marginBottom: '5px', display: 'none' }}>
+      <Button type="primary" onClick={() => exportIndependen()} className={Styles.SubmitButton} style={{ marginTop: '5px', marginBottom: '5px' }}>
         导出数据
       </Button>
       <Table dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />

src/pages/customer/recommendCustomer/index.jsx

@@ -86,7 +86,7 @@ function body(props) {
       ...apis.customer.customerRecommendRecommenderExport, 
       responseType: 'blob',
     }).then(response => {
-      // console.log('response: ', response)
+      console.log('exportRecommendCustomer: ', response)
       download(response)
     }).catch(error => {
 
@@ -213,7 +213,7 @@ function body(props) {
             </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" onClick={() => exportRecommendCustomer()} className={Styles.SubmitButton} style={{ marginTop: '5px', marginBottom: '5px', display: 'none' }}>
+      <Button type="primary" onClick={() => exportRecommendCustomer()} className={Styles.SubmitButton} style={{ marginTop: '5px', marginBottom: '5px' }}>
         导出数据
       </Button>
       <Table dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />

src/pages/customer/report/index.jsx

@@ -71,7 +71,10 @@ function body(props) {
   }
 
   function exportReport() {
-
+    request({ ...apis.customer.customerRecommendReportExport, responseType: 'blob' })
+    .then(response => {
+      download(response)
+    })
   }
 
   function download(data) {
@@ -176,7 +179,7 @@ function body(props) {
             </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" onClick={() => exportReport()} className={Styles.SubmitButton} style={{ marginTop: '5px', marginBottom: '5px', display: 'none' }}>
+      <Button type="primary" onClick={() => exportReport()} className={Styles.SubmitButton} style={{ marginTop: '5px' }}>
         导出数据
       </Button>
       <Table style={{marginTop:'40px'}} dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />

src/pages/indexEcharts/components/UserBehavior.jsx

@@ -24,10 +24,16 @@ const UserBehavior = (props) => {
   //柱图
 
   useEffect(() => {
-    getUserBehaviorSummary(formatDate(props.startDate, props.endDate))
+    const date = formatDate(props.startDate, props.endDate)
+    getUserBehaviorSummary({
+      ...date,
+      activity: props.activity,
+      event: props.event,
+      eventType: props.eventType
+    })
     getUserBehaviorProfile(formatDate(props.startDate, props.endDate))
 
-  }, [props.startDate, props.endDate])
+  }, [props.startDate, props.endDate, props.activity, props.event, props.eventType])
 
   function getUserBehaviorSummary(params) {
 

src/pages/indexEcharts/components/UserSex.jsx

@@ -42,7 +42,10 @@ const UserSource = (props) => {
     },
     legend: {},
     color: ['#FF7E48', '#dcdcdc'],
-    tooltip: {},
+    tooltip: {
+      trigger: 'item',
+      formatter: "{b}: ({d}%)"
+    },
     series: {
       type: 'pie',
       name: '性别比例',

src/pages/indexEcharts/components/UserSourcepie.jsx

@@ -19,18 +19,18 @@ const UserSource = (props) => {
 
   useEffect(() => {
     userResource(formatDate(props.startDate, props.endDate))
-   }, [props.startDate, props.endDate])
- 
-   function userResource (params) {
-     request({
-       ...apis.indexEcharts.userResource,
-       params,
-     }).then((data) => {
-       setData(data)
-     })
-   }
-
-  function toEdit () {
+  }, [props.startDate, props.endDate])
+
+  function userResource(params) {
+    request({
+      ...apis.indexEcharts.userResource,
+      params,
+    }).then((data) => {
+      setData(data)
+    })
+  }
+
+  function toEdit() {
     router.push({
       pathname: '/indexEcharts/userSource',
     });
@@ -47,7 +47,10 @@ const UserSource = (props) => {
       x: 'left',
       data: ['来源置业顾问', '来源全民经纪人', '自主进入'],
     },
-    tooltip: {},
+    tooltip: {
+      // trigger: 'item',
+      // formatter: "{a} <br/>{b} : {c} ({d}%)"
+    },
     series: [
       {
         type: 'pie',
@@ -55,24 +58,24 @@ const UserSource = (props) => {
         radius: ['34%', '52%'],
       },
     ],
+
     dataset: {
       id: 'pie',
       source: [
-        { '用户来源': '来源置业顾问', value: person_realty_consultant,},
+        { '用户来源': '来源置业顾问', value: person_realty_consultant, },
         { '用户来源': '来源全民经纪人', value: person_estate_agent },
         { '用户来源': '自主进入', value: person_null },
       ]
     },
   }
- 
+
 
   const piestyles = {
     width: '100%',
     height: '400px',
-    minWidth:'350px',
+    minWidth: '350px',
   }
 
-
   return (
     <>
       <div>

src/pages/indexEcharts/userBehavior.jsx

@@ -13,6 +13,7 @@ import BuildSelect from '../../components/SelectButton/BuildSelect'
 //   const endDate = moment(end).format('YYYY-MM-DDT23:59:59.999') + 'Z'
 //   return { startDate, endDate }
 // }
+const { Option } = Select;
 
 const header = props => {
 
@@ -26,8 +27,42 @@ const header = props => {
 
     setEndDate(new Date())
     setStartDate(moment().subtract(7, 'day').toDate())
+    getBizEventType()
+    getBizEventList()
+    getProperties()
 
   }, [])
+  const [eventypes, setEventTypes] = useState([])
+  function getBizEventType(row) {
+
+    request({
+      ...apis.indexEcharts.bizEvent.dict,
+    }).then((data) => {
+      setEventTypes(data.records)
+
+    })
+  }
+  const [eventList, setEventList] = useState([])
+  function getBizEventList(row) {
+
+    request({
+      ...apis.indexEcharts.bizEvent.list,
+    }).then((data) => {
+      setEventList(data.records)
+      
+    })
+  }
+  const [properties, setProperties] = useState([])
+  function getProperties(row) {
+
+    request({
+      ...apis.indexEcharts.bizEvent.properties,
+    }).then((data) => {
+
+      setProperties(data.records)
+
+    })
+  }
 
   const { RangePicker } = DatePicker;
 
@@ -42,10 +77,8 @@ const header = props => {
 
     setEndDate(new Date())
     setStartDate(moment().subtract(days, 'day').toDate())
-
   }
 
-
   function datalist() {
 
     setEndDate(daterange[1])
@@ -58,8 +91,20 @@ const header = props => {
 
     console.log('行为回调数据：', e)
   }
-  function handleChange(value) {
-    console.log(`selected ${value}`);
+  const [eventType, setEventType] = useState('')
+  function handleChangeType(value) {
+    console.log(value,"1111111111111");
+    setEventType(value)
+  }
+  const [event, setEvent] = useState('')
+  function handleChangeEvent(value) {
+    console.log(value,"222222222222");
+    setEvent(value)
+  }
+  const [activity, setActivity] = useState('')
+  function handleChangeProperty(value) {
+    console.log(value,"33333333333333");
+    setActivity(value)
   }
 
   const columns = [
@@ -105,47 +150,49 @@ const header = props => {
       borderRadius: '12px',
       minHeight: '60vh'
     }}>
-    <div>
-    <Radio.Group buttonStyle="solid" defaultValue="a">
-        <Radio.Button value="a" onClick={getDataOf(7)}>最近7天</Radio.Button>
-        <Radio.Button value="b" onClick={getDataOf(30)}>最近1月</Radio.Button>
-      </Radio.Group>
-      <RangePicker
-        style={{ paddingLeft: '30px' }}
-        ranges={{
-          Today: [moment(), moment()],
-          'This Month': [moment().startOf('month'), moment().endOf('month')],
-        }}
-        showTime
-        onChange={onChangetime}
-      />
-      <Button type="primary" htmlType="submit" style={{ marginLeft: '30px',float:'right' }} onClick={datalist}>
-        搜索
+      <div>
+        <Radio.Group buttonStyle="solid" defaultValue="a">
+          <Radio.Button value="a" onClick={getDataOf(7)}>最近7天</Radio.Button>
+          <Radio.Button value="b" onClick={getDataOf(30)}>最近1月</Radio.Button>
+        </Radio.Group>
+        <RangePicker
+          style={{ paddingLeft: '30px' }}
+          ranges={{
+            Today: [moment(), moment()],
+            'This Month': [moment().startOf('month'), moment().endOf('month')],
+          }}
+          showTime
+          onChange={onChangetime}
+        />
+        <Button type="primary" htmlType="submit" style={{ marginLeft: '30px', float: 'right' }} onClick={datalist}>
+          搜索
       </Button>
-    </div>
-     
+      </div>
+
       <div style={{ display: 'flex', margin: '24px 0' }}>
-      <BuildSelect slot='action' onChange={(e => handleBuildingChange(e))}></BuildSelect>
-        <Select placeholder="所有事件组" style={{ width: '14%',minWidth:'160px',marginLeft:'2%' }} onChange={handleChange}>
-          <Option value="jack">Jack</Option>
-          <Option value="lucy">Lucy</Option>
-          <Option value="Yiminghe">yiminghe</Option>
-        </Select>
-        <Select placeholder="请选择事件" style={{ width: '14%',minWidth:'160px',marginLeft:'2%' }} onChange={handleChange}>
-          <Option value="jack">Jack</Option>
-          <Option value="lucy">Lucy</Option>
-          <Option value="Yiminghe">yiminghe</Option>
-        </Select>
-        <Select placeholder="请选择属性" style={{ width: '14%',minWidth:'160px',marginLeft:'2%' }} onChange={handleChange}>
-          <Option value="jack">Jack</Option>
-          <Option value="lucy">Lucy</Option>
-          <Option value="Yiminghe">yiminghe</Option>
-        </Select>
+        <BuildSelect style={{ width: '14%', minWidth: '160px' }} slot='action' onChange={(e => handleBuildingChange(e))}></BuildSelect>
+       
+        <Select  style={{ width: '14%', minWidth: '160px', marginLeft: '2%' }} placeholder="所有事件组" onChange={handleChangeType}>
+          {eventypes.map(type => (
+            <Option key={type.typeId}>{type.typeName}</Option>
+          ))}
+      </Select>
+        <Select  style={{ width: '14%', minWidth: '200px', marginLeft: '2%' }} placeholder="请选择事件" onChange={handleChangeEvent}>
+          {eventList.map(event => (
+            <Option key={event.eventId}>{event.eventName}</Option>
+          ))}
+      </Select>
+        <Select  style={{ width: '14%', minWidth: '160px', marginLeft: '2%' }} placeholder="请选择属性" onChange={handleChangeProperty}>
+          {properties.map(property => (
+            <Option key={property.propertyId}>{property.propertyName}</Option>
+          ))}
+      </Select>
+     
       </div>
-      
-      
+
+
       <div style={{ margin: '24px 0' }}>
-        <UserBehavior BuildSelectHide={true} endDate={endDate} startDate={startDate} dataZoom={true} onReData={(e) => redata(e)}></UserBehavior>
+        <UserBehavior BuildSelectHide={true} endDate={endDate} startDate={startDate}  eventType={eventType} activity={activity}  event={event} dataZoom={true} onReData={(e) => redata(e)}></UserBehavior>
       </div>
 
       <Table dataSource={dataSource} columns={columns} pagination={false} scroll={{ y: 500 }} />

src/pages/indexEcharts/userSource.jsx

@@ -9,64 +9,107 @@ import request from '../../utils/request';
 import apis from '../../services/apis';
 
 
+
+const { RangePicker } = DatePicker;
+const { Option } = Select
+
+
 // 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 }
 // }
 
+let daterange = []
+let tableTitle = ['日期']
+
+const columns = [
+  {
+    title: '日期',
+    dataIndex: 'label',
+    key: 'label',
+    width:'20%'
+  },
+  {
+    title: '名片分享',
+    dataIndex: '名片分享',
+    key: '名片分享',
+  },
+  {
+    title: '生成海报',
+    dataIndex: '生成海报',
+    key: '生成海报',
+  },
+  {
+    title: '小程序搜索',
+    dataIndex: '小程序搜索',
+    key: '小程序搜索',
+  },
+  {
+    title: '好友分享',
+    dataIndex: '好友分享',
+    key: '好友分享',
+
+  },
+
+
+]
+
+class Header extends React.Component {
+
+  constructor(props) {
+    super(props)
+    this.state = {
+      dataSoures: [],
+      tableData: [],
+      userType: 'all',
+      endDate: {},
+      startDate: {}
+    }
+  }
 
-const header = props => {
-
-  const [tableData, setTableData] = useState([])
-  const [userType, setuserType] = useState([])
-  const [endDate, setEndDate] = useState({})
-  const [startDate, setStartDate] = useState({})
-  let daterange = []
+  componentDidMount() {
+    this.setState({ endDate: new Date(), startDate: moment().subtract(7, 'day').toDate() })
+  }
 
-  useEffect(() => {
-    setEndDate(new Date())
-    setStartDate(moment().subtract(7, 'day').toDate())
-    setuserType('all')
-  }, [])
 
-  const { RangePicker } = DatePicker;
 
-  function onChangetime(dates, dateStrings) {
+  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`
+    return { startDate: tempStartDate, endDate: tempEndDate }
+  }
 
+  onChangetime = (_dates, dateStrings) => {
     daterange[1] = dateStrings[1]
     daterange[0] = dateStrings[0]
-
   }
 
-  const handleSubmit = (e, props) => {
+  handleSubmit = (e, props) => {
 
     e.preventDefault();
 
   }
 
-  const getDataOf = (days) => () => {
-
-    setEndDate(new Date())
-    setStartDate(moment().subtract(days, 'day').toDate())
-
+  getDataOf = (days) => {
+    this.setState({ endDate: new Date(), startDate: moment().subtract(days, 'day').toDate() })
   }
 
-  function datalist() {
-
-    setEndDate(daterange[1])
-    setStartDate(daterange[0])
-
+  datalist = () => {
+    this.setState({ endDate: daterange[1], startDate: daterange[0] })
   }
 
+  onSuccess = e => {
+    this.setState({ dataSoures: e }, () => {
+      this.onTabledatas(e)
+    })
+  }
 
-  let tableTitle = ['日期']
-
-
-  function onTabledatas(e) {
-    const data = (e.data || []).reduce((acc, item, index) => {
+  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 = userType === 'registered' ? registered : count
+      const num = this.state.userType === 'registered' ? registered : count
 
       tableTitle = tableTitle.indexOf(fromName) > -1 ? tableTitle : tableTitle.concat(fromName) // eslint-disable-line
       acc[date] = { ...acc[date], [`${fromName}`]: !num ? 0 : num }
@@ -74,105 +117,75 @@ const header = props => {
       return acc
     }, {})
 
-    setTableData(Object.keys(data).map(x => ({ label: x, ...data[x] })))
+    this.setState({ tableData: Object.keys(data).map(x => ({ label: x, ...data[x] })) })
 
   }
 
-  const columns = [
-    {
-      title: '日期',
-      dataIndex: 'label',
-      key: 'label',
-      width:'20%'
-    },
-    {
-      title: '名片分享',
-      dataIndex: '名片分享',
-      key: '名片分享',
-    },
-    {
-      title: '生成海报',
-      dataIndex: '生成海报',
-      key: '生成海报',
-    },
-    {
-      title: '小程序搜索',
-      dataIndex: '小程序搜索',
-      key: '小程序搜索',
-    },
-    {
-      title: '好友分享',
-      dataIndex: '好友分享',
-      key: '好友分享',
-
-    },
-
-
-  ]
-
-  function handleSelectChange(e) {
-
-    console.log(e)
-    setuserType(e)
+  handleSelectChange = (e) => {
+    this.setState({ userType: e }, () => {
+      this.onTabledatas(this.state.dataSoures)
+    })
   }
 
 
-
-  return (<>
-    <div style={{
-      backgroundColor: '#fff',
-      padding: '32PX 28px',
-      boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)',
-      borderRadius: '12px',
-      minHeight: '60vh'
-    }}>
-      <Radio.Group buttonStyle="solid" defaultValue="a">
-        <Radio.Button value="a" onClick={getDataOf(7)}>最近7天</Radio.Button>
-        <Radio.Button value="b" onClick={getDataOf(30)}>最近1月</Radio.Button>
-      </Radio.Group>
-      <RangePicker
-        style={{ paddingLeft: '30px' }}
-        ranges={{
-          Today: [moment(), moment()],
-          'This Month': [moment().startOf('month'), moment().endOf('month')],
-        }}
-        showTime
-        // format="YYYY/MM/DD HH:mm:ss"
-        onChange={onChangetime}
-      />
-      <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }} onClick={datalist}>
-        查询
-          </Button>
-      <div>
-
-        <div style={{ display: 'flex' }}>
-          <div style={{
-            width: '1060px',
-            height: '560px',
-            paddingTop: '40px',
-            marginRight: ' 40px',
-          }}>
-            <UserSource BuildSelectHide={true} endDate={endDate} startDate={startDate} onSuccess={(e) => onTabledatas(e)}></UserSource>
-          </div>
-          <div style={{
-            width: '509px',
-            height: '600px',
-            paddingTop: '40px',
-
-          }}>
-            <UserSourcepie endDate={endDate} startDate={startDate}></UserSourcepie>
+  render() {
+    return (
+    <>
+      <div style={{
+        backgroundColor: '#fff',
+        padding: '32PX 28px',
+        boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)',
+        borderRadius: '12px',
+        minHeight: '60vh'
+      }}>
+        <Radio.Group buttonStyle="solid" defaultValue="a">
+          <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')],
+          }}
+          showTime
+          // format="YYYY/MM/DD HH:mm:ss"
+          onChange={(_dates, dateStrings) => this.onChangetime(_dates, dateStrings)}
+        />
+        <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }} onClick={() => this.datalist()}>
+          查询
+        </Button>
+        <div>
+  
+          <div style={{ display: 'flex' }}>
+            <div style={{
+              width: '1060px',
+              height: '560px',
+              paddingTop: '40px',
+              marginRight: ' 40px',
+            }}>
+              <UserSource BuildSelectHide={true} endDate={this.state.endDate} startDate={this.state.startDate} onSuccess={(e) => this.onSuccess(e)}></UserSource>
+            </div>
+            <div style={{
+              width: '509px',
+              height: '600px',
+              paddingTop: '40px',
+  
+            }}>
+              <UserSourcepie endDate={this.state.endDate} startDate={this.state.startDate}></UserSourcepie>
+            </div>
           </div>
+          <Select style={{ width: '180px' }} placeholder="所有用户" onChange={(e) => this.handleSelectChange(e)}>
+            <Option value='all'>所有用户</Option>
+            <Option value='registered'>注册用户</Option>
+          </Select>
+  
+          <Table style={{marginTop:'20px'}} dataSource={this.state.tableData} columns={columns} pagination={false} scroll={{ y: 500 }}></Table>
         </div>
-        <Select style={{ width: '180px' }} placeholder="所有用户" onChange={handleSelectChange}>
-          <Option value='all'>所有用户</Option>
-          <Option value='registered'>注册用户</Option>
-        </Select>
-
-        <Table style={{marginTop:'20px'}} dataSource={tableData} columns={columns} pagination={false} scroll={{ y: 500 }}></Table>
       </div>
-    </div>
-  </>
-  )
+    </>
+    )
+  }
 }
 
-export default header
+export default Header

src/pages/staff/list/addRole.jsx

@@ -29,7 +29,7 @@ const Poster = props => {
   const [dataMenuId, setDataMenuId] = useState([])
   const [dataButtonId, setDataButtonId] = useState([])
 
-  const [loading, setLoading] = useState(true);
+  const [loading, setLoading] = useState(false);
 
   useEffect(() => {
     // 新增和编辑用一个页面
@@ -64,6 +64,7 @@ const Poster = props => {
 
   // 根据角色id查询当前的菜单及其按钮
   function buttonAndMenuList(params, ids) {
+    setLoading(true)
     request({ ...apis.role.buttonAndMenuList, urlData: { id: ids }, params: { ...params } }).then(data => {
       setLoading(false)
       props.form.setFieldsValue({ roleName: data.roleName })

src/services/apis.js

@@ -55,22 +55,22 @@ export default {
     },
     buildingGetById: {
       method: 'GET',
-      url: `${prefix}/buildingSelectId/id`,
+      url: `${prefix}/buildingSelectId/:id`,
       action: 'admin.buildingSelectId.id.get',
     },
     deleteBuilding: {
       method: 'DELETE',
-      url: `${prefix}/building/delete/id`,
+      url: `${prefix}/building/delete/:id`,
       action: 'admin.building.delete.id.delete',
     },
     buildingApartment: {
       method: 'GET',
-      url: `${prefix}/buildingApartment/buildingId/id`,
+      url: `${prefix}/buildingApartment/buildingId/:id`,
       action: 'admin.buildingApartment.buildingId.id.get',
     },
     buildingApartmentGetById: {
       method: 'GET',
-      url: `${prefix}/buildingApartment/id`,
+      url: `${prefix}/buildingApartment/:id`,
       action: 'admin.buildingApartment.id.get',
     },
     buildingApartmentUpdate: {
@@ -85,7 +85,7 @@ export default {
     },
     buildingApartmentDelete: {
       method: 'DELETE',
-      url: `${prefix}/apartment/deleted/id`,
+      url: `${prefix}/apartment/deleted/:id`,
       action: 'admin.apartment.deleted.id.delete',
     },
     buildingSelect: {
@@ -102,12 +102,12 @@ export default {
     },
     delete: {
       method: 'DELETE',
-      url: `${prefix}/tdBuildingType/id`,
+      url: `${prefix}/tdBuildingType/:id`,
       action: 'admin.tdBuildingType.id.delete',
     },
     update: {
       method: 'PUT',
-      url: `${prefix}/tdBuildingType/id`,
+      url: `${prefix}/tdBuildingType/:id`,
       action: 'admin.tdBuildingType.id.put',
     },
     add: {
@@ -117,7 +117,7 @@ export default {
     },
     getById: {
       method: 'GET',
-      url: `${prefix}/tdBuildingType/id`,
+      url: `${prefix}/tdBuildingType/:id`,
       action: 'admin.tdBuildingType.id.get',
     },
   },
@@ -246,6 +246,16 @@ export default {
       url: `${prefix}/customer/recommend/recommender/export`,
       action: 'admin.customer.recommend.recommender.export.get',
     },
+    customerRecommendReportExport: { // 导出数据（报备客户）
+      method: 'GET',
+      url: `${prefix}/customer/recommend/report/export`,
+      action: 'admin.customer.recommend.report.export.get',
+    },
+    customerRecommendAgentsExport: { // 导出数据（经纪人）
+      method: 'GET',
+      url: `${prefix}/customer/recommend/agents/export`,
+      action: 'admin.customer.recommend.agents.export.get',
+    },
   },
   indexEcharts: {
     userResource: {
@@ -265,6 +275,23 @@ export default {
         action: 'behaviorIncident',
       },
     },
+    bizEvent: {
+      dict: {
+        method:'get',
+        url: `${prefix}/tdBizEventType`,
+        action:'select',
+      },
+      list: {
+        method:'get',
+        url: `${prefix}/tdBizEvent`,
+        action:'select',
+      },
+      properties: {
+        method:'get',
+        url: `${prefix}/taEventProperties`,
+        action:'select',
+      },
+    },
     userActive: {
       method: 'GET',
       url: `${prefix}/selectActiveUserCount`,
@@ -571,7 +598,7 @@ export default {
     getListInvite: {
       url: `${prefix}/channel/InviteClientsList`,
       method: 'GET',
-      action: 'admin.InviteClientsList.get',
+      action: 'admin.channel.InviteClientsList.get',
     },
  },
  role: {

src/utils/request.js

@@ -58,7 +58,7 @@ request.interceptors.request.use((url, options) => {
         requestType: data instanceof FormData ? 'form' : 'json',
         credentials: 'include', // 带 cookie
         interceptors: true,
-        getResponse: true
+        getResponse: true,
       },
     }
   );
@@ -76,8 +76,12 @@ request.interceptors.response.use(async (response, options) => {
       });
       throw new Error(response.statusText);
     } else {
-      // console.log('response: ', response)
-      // console.log('response.headers: ', response.headers)
+      console.log('response.headers: ', response.headers)
+      console.log('response.headers.Content-Type: ', response.headers.get('Content-Type'))
+      if (response.headers.get('Content-Type') === 'application/octet-stream;charset=utf-8') {
+        return await response.clone().blob();
+      }
+
       const { code, data, message } = await response.clone().json();
       if (code != 1000) {
         notification.error({