新增用户折线图

src/pages/Welcome.jsx

@@ -64,7 +64,7 @@ const welcome = (props) => {
             boxShadow: '0px  0.106rem 14px -15px rgba(107,130,230,1)',
             borderRadius: '12px', width: '32%',
           }}>
-            <span style={{ fontSize: '24px', color: '#fff', borderBottom: '1px solid #fff', margin: '30px 0', cursor: 'pointer' }}>最近7天新增 </span>
+            <span style={{ fontSize: '24px', color: '#fff', borderBottom: '1px solid #fff', margin: '30px 0', cursor: 'pointer' }}>今日新增用户 </span>
             <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy', lineHeight: '100px' }}>{data.selectRecentlyCount || '0'}</span>
           </div>
         }

src/pages/indexEcharts/components/IntentionalCustomers.jsx

@@ -88,12 +88,38 @@ const UserBehavior = (props) => {
     IntentionUsers({  pageNum: 1, pageSize: 5, buildingId: e })
     setBuildingId(e)
   }
+
+  //意向客户导出
+  function exportIntentionUsers () {
+    request({
+      ...apis.indexEcharts.exportIntentionUsers,
+      params: { buildingId }
+    }).then((data) => {
+      if (!data) {
+        return
+      }
+      const url = window.URL.createObjectURL(new Blob([data]))
+      const link = document.createElement('a')
+      link.style.display = 'none'
+      link.href = url
+      link.setAttribute('download', '意向客户.xlsx')
+      document.body.append(link)
+      link.click()
+    })
+  }
+
   return (
     <>
       <div>
       <p style={{fontSize:'0.12rem',fontWeight:'600'}}>意向客户</p>
-
-        <BuildSelect slot='action' onChange={(e => handleBuildingChange(e))} value={buildingId}></BuildSelect>
+        <Row>
+          <Col span={22}>
+            <BuildSelect slot='action' onChange={(e => handleBuildingChange(e))} value={buildingId}></BuildSelect>
+          </Col>
+          <Col span={2}>
+            <Button type="primary" onClick={exportIntentionUsers}>导出</Button>
+          </Col>
+        </Row>
 
         <Table rowKey="IntentionalCustomers" dataSource={data.records} columns={columns} style={{marginTop:'15px'}} pagination={{ total: data.total, defaultPageSize: 5, onChange: e => onChange(e) }} scroll={{ y: 500 }} />
 

src/pages/indexEcharts/components/NewUsers.jsx

@@ -24,7 +24,7 @@ const NewUsers = (props) => {
 
   function NewsUserCount (params) {
     request({
-      ...apis.indexEcharts.newUser,
+      ...apis.indexEcharts.changeNewUser,
       params,
     }).then((data) => {
       setData(data)
@@ -43,7 +43,7 @@ const NewUsers = (props) => {
       end: 100
     },
   ] : undefined 
-  const dataset = (data.selectNewsUserCount) || []
+  const dataset = data || []
   const options = {
 
    
@@ -74,7 +74,7 @@ const NewUsers = (props) => {
         }
       ],
       dataset: {
-        dimensions: ['date', 'userCount', 'authorizationCount'],
+        dimensions: ['createTime', 'fromNum', 'registeredNum'],
         source: dataset
       }
  

src/pages/indexEcharts/newUsers.jsx

@@ -16,20 +16,28 @@ import apis from '../../services/apis';
 //   return { startDate, endDate }
 // }
 
+let columns = [
+  {
+    title: '日期',
+    dataIndex: 'createTime',
+    key: 'createTime',
+  },
+]
 
 const header = props => {
 
-  const [tableData, setTableData] = useState({ records: [] })
-
+  const [tableData, setTableData] = useState([])
   const [endDate, setEndDate] = useState({})
+  const [data, setDate] = useState({})
   const [startDate, setStartDate] = useState({})
   let daterange= []
 
   useEffect(() => {
 
     setEndDate(new Date())
-    setStartDate(moment().subtract(7, 'day').toDate())
-
+    setStartDate(new Date())
+    // setStartDate(moment().subtract(7, 'day').toDate())
+    userResource({startDate: new Date(), endDate: new Date()})
   }, [])
 
   const { RangePicker } = DatePicker;
@@ -52,7 +60,7 @@ const header = props => {
  
     setEndDate(new Date())
     setStartDate(moment().subtract(days, 'day').toDate())
-
+    userResource({startDate: moment().subtract(days, 'day').toDate(), endDate: new Date()})
   }
 
   function onChange (e) {
@@ -64,15 +72,53 @@ const header = props => {
 
     setEndDate(daterange[1])
     setStartDate(daterange[0])
+    userResource({startDate: daterange[0], endDate: daterange[1]})
 
   }
 
- 
-  function handleSelectChange (e) {
+  function userResource(params) {
+    request({
+      ...apis.indexEcharts.selectPersonFrom,
+      params,
+    }).then((data) => {
+      setDate(data);
+      onTabledatas(data,"all")
+    })
+  }
 
-    console.log(e)
+  const onTabledatas = (e,changeType) => {
+    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 = changeType === 'registered' ? registeredNum : fromNum
+      acc[createTime] = { ...acc[createTime], ...item, [`${sceneType}`]: !num ? 0 : num }
+      return acc
+    }, {})
+
+    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
+    },[])
+
+    setTableData(tableData)
 
   }
+ 
+  function handleSelectChange (e) {
+    onTabledatas(data,e)
+  }
 
   const { Column, ColumnGroup } = Table;
 
@@ -84,7 +130,8 @@ const header = props => {
       borderRadius: '12px',
       minHeight: '60vh'
     }}>
-      <Radio.Group onChange={onChange} buttonStyle="solid" defaultValue="a"  style={{marginBottom:'20px'}}>
+      <Radio.Group onChange={onChange} buttonStyle="solid" defaultValue="c"  style={{marginBottom:'20px'}}>
+        <Radio.Button value="c" onClick={getDataOf(0)}>今日</Radio.Button>
         <Radio.Button value="a" onClick={getDataOf(7)}>最近7天</Radio.Button>
         <Radio.Button value="b" onClick={getDataOf(30)}>最近1月</Radio.Button>
       </Radio.Group>
@@ -105,6 +152,12 @@ const header = props => {
       <div>
         <NewUsers BuildSelectHide={true} endDate={endDate} startDate={startDate}  dataZoom={true} ></NewUsers>
         {/* */}
+        <Select style={{ width: '180px' }} placeholder="所有用户" onChange={(e) => handleSelectChange(e)}>
+          <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>
   </>

src/services/apis.js

@@ -399,6 +399,11 @@ export default {
       url: `${prefix}/selectNewsUserCount`,
       action: 'selectNewsUserCount',
     },
+    changeNewUser: {
+      method: 'GET',
+      url: `${prefix}/changeNewsUserCount`,
+      action: 'selectNewsUserCount',
+    },
     userConversion: {
       method: 'GET',
       url: `${prefix}/selectConversion`,
@@ -419,8 +424,11 @@ export default {
       url: `${prefix}/listNoticeByCondition`,
       action: 'listNoticeByCondition',
     },
-
-
+    exportIntentionUsers: {
+      method: 'GET',
+      url: `${prefix}/exportIntentionUser`,
+      action: 'exportIntentionUser',
+    },
   },
   activity: {
     list: {