暂存

config/routes.js

@@ -28,6 +28,30 @@ export default [
             name: '首页',
             component: './Welcome',
           },
+          {
+            path: '/indexEcharts',
+            name: '图表管理',
+            component: '../layouts/BlankLayout',
+            hideInMenu: true,
+            routes: [
+              {
+                path: '/indexEcharts/userSource',
+                name: '用户来源',
+                component: './indexEcharts/userSource',
+              },
+              {
+                path: '/indexEcharts/newUsers',
+                name: '新增用户',
+                component: './indexEcharts/newUsers',
+              },
+
+              {
+                path: '/indexEcharts/userBehavior',
+                name: '用户行为',
+                component: './indexEcharts/userBehavior',
+              },
+            ],
+          },
           {
             path: '/building',
             name: '项目管理',

src/pages/indexEcharts/components/NewUsers.jsx

@@ -92,7 +92,7 @@ const NewUsers = (props) => {
     <>
       <div>
         <div >
-          <p onClick={()=>router.push('/indexEcharts/newUsers')}><span style={{borderBottom:'1px solid #f02d40',fontSize:'0.12rem',fontWeight:'600'}}>新增用户</span> <span style={{fontSize:'0.09rem',color:'#888',marginLeft:'0.06rem'}}>最近七天</span></p>
+          <p onClick={()=>router.push('/indexEcharts/newUsers')}><span style={{borderBottom:'1px solid #f02d40',fontSize:'0.12rem',fontWeight:'600'}}>新增用户</span> {!props.BuildSelectHide && <span style={{ fontSize: '0.09rem', color: '#888', marginLeft: '0.06rem' }}>最近七天</span>}</p>
        </div>
         <EChart options={options} style={piestyles} onClick={()=>router.push('/indexEcharts/newUsers')} />
       </div>

src/pages/indexEcharts/components/UserBehavior.jsx

@@ -121,7 +121,7 @@ const UserBehavior = (props) => {
         {/* onSuccess={(e) => onTabledatas(e)} */}
         <p onClick={() => router.push('/indexEcharts/userBehavior')}>
           <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>}
+          {!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))}></BuildSelect>}

src/pages/indexEcharts/components/UserConversion.jsx

@@ -19,11 +19,11 @@ const UserSource = props => {
   }, [])
 
  function UserConversionRate(params) {
+   
       request({
         ...apis.indexEcharts.userConversion,
         params,
       }).then(data => {
-        // console.log("data: ", data)
         setDataset(data, params.conversion)
       })
   }
@@ -72,8 +72,6 @@ const UserSource = props => {
       name: '转化率',
       radius: ['34%', '52%'],
       data: theCurrent,
-      // data:[ { name: '授权手机', value: 6 },
-      // { name: '其余', value: 5 },]
     },
   }
 

src/pages/indexEcharts/components/UserSource.jsx

@@ -28,6 +28,7 @@ const UserSource = (props) => {
       params,
     }).then((data) => {
       setData(data)
+      console.log(data,"datadatadatadatavvvdatadatav")
       props.onSuccess(data)
     })
   }
@@ -103,7 +104,7 @@ const UserSource = (props) => {
   return (
     <>
       <div>
-      <p onClick={()=>router.push('/indexEcharts/userSource')}><span style={{borderBottom:'1px solid #f02d40',color:'#333',fontSize:'0.12rem',fontWeight:'600'}}>用户来源</span> <span style={{fontSize:'0.09rem',color:'#888',marginLeft:'0.06rem'}}>最近七天</span></p>
+      <p onClick={()=>router.push('/indexEcharts/userSource')}><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>
 
         <EChart onClick={() => router.push('/indexEcharts/userSource')} options={baroptions} style={barstyle} />
 

src/pages/indexEcharts/newUsers.jsx

@@ -102,7 +102,7 @@ const header = props => {
         搜索
           </Button>
       <div>
-        <NewUsers endDate={endDate} startDate={startDate}  dataZoom={true} ></NewUsers>
+        <NewUsers BuildSelectHide={true} endDate={endDate} startDate={startDate}  dataZoom={true} ></NewUsers>
         {/* */}
       </div>
     </div>

src/pages/indexEcharts/userBehavior.jsx

@@ -103,7 +103,7 @@ const header = props => {
       padding: '32PX 28px',
       boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)',
       borderRadius: '12px',
-      minHeight: '1000vh'
+      minHeight: '60vh'
     }}>
     <div>
     <Radio.Group buttonStyle="solid" defaultValue="a">
@@ -126,17 +126,17 @@ const header = props => {
      
       <div style={{ display: 'flex', margin: '24px 0' }}>
       <BuildSelect slot='action' onChange={(e => handleBuildingChange(e))}></BuildSelect>
-        <Select placeholder="所有事件组" style={{ width: '14%',minWidth:'160px',marginRight:'2%' }} onChange={handleChange}>
+        <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',marginRight:'2%' }} onChange={handleChange}>
+        <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' }} onChange={handleChange}>
+        <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>

src/pages/indexEcharts/userSource.jsx

@@ -4,7 +4,6 @@ import UserSource from './components/UserSource.jsx';
 import UserSourcepie from './components/UserSourcepie.jsx';
 // import XForm, { FieldTypes } from '../../components/XForm';
 import moment from 'moment';
-
 import EChart from '../../components/EchartsTest/EChart';
 import request from '../../utils/request';
 import apis from '../../services/apis';
@@ -21,13 +20,11 @@ const header = props => {
 
   const [tableData, setTableData] = useState([])
   const [userType, setuserType] = useState([])
-
   const [endDate, setEndDate] = useState({})
   const [startDate, setStartDate] = useState({})
   let daterange = []
 
   useEffect(() => {
-
     setEndDate(new Date())
     setStartDate(moment().subtract(7, 'day').toDate())
     setuserType('all')
@@ -35,7 +32,7 @@ const header = props => {
 
   const { RangePicker } = DatePicker;
 
-  function onChangetime (dates, dateStrings) {
+  function onChangetime(dates, dateStrings) {
 
     daterange[1] = dateStrings[1]
     daterange[0] = dateStrings[0]
@@ -50,19 +47,12 @@ const header = props => {
 
   const getDataOf = (days) => () => {
 
-
     setEndDate(new Date())
     setStartDate(moment().subtract(days, 'day').toDate())
 
   }
 
-  function onChange (e) {
-
-    // console.log(`radio checked:${e.target.value}`);
-
-  }
-
-  function datalist () {
+  function datalist() {
 
     setEndDate(daterange[1])
     setStartDate(daterange[0])
@@ -70,28 +60,10 @@ const header = props => {
   }
 
 
-
-  // const userType = 'all'
   let tableTitle = ['日期']
-  // const dataset = data || {}
-
-  // function tableData () {
-
-  //   const data = (dataset.data || []).reduce((acc, item, index) => {
-  //     const { date, fromName, count, registered } = item
-  //     const num = userType === 'registered' ? registered : count
-
-  //     tableTitle = tableTitle.indexOf(fromName) > -1 ? tableTitle : tableTitle.concat(fromName) // eslint-disable-line
-  //     acc[date] = { ...acc[date], [`${fromName}`]: !num ? 0 : num }
-
-  //     return acc
-  //   }, {})
-
-  //   return Object.keys(data).map(x => ({ label: x, ...data[x] }))
 
-  // }
 
-  function onTabledatas (e) {
+  function onTabledatas(e) {
     const data = (e.data || []).reduce((acc, item, index) => {
       const { date, fromName, count, registered } = item
       const num = userType === 'registered' ? registered : count
@@ -111,47 +83,34 @@ const header = props => {
       title: '日期',
       dataIndex: 'label',
       key: 'label',
-      width: '20%',
+      width:'20%'
     },
+    {
+      title: '名片分享',
+      dataIndex: '名片分享',
+      key: '名片分享',
+    },
+    {
+      title: '生成海报',
+      dataIndex: '生成海报',
+      key: '生成海报',
+    },
+    {
+      title: '小程序搜索',
+      dataIndex: '小程序搜索',
+      key: '小程序搜索',
+    },
+    {
+      title: '好友分享',
+      dataIndex: '好友分享',
+      key: '好友分享',
 
-    // {
-    //   title: '名片分享',
-    //   dataIndex: '名片分享',
-    //   key: '名片分享',
-    //   width: '16%'
-
-    // },
-    // {
-    //   title: '好友分享',
-    //   dataIndex: '好友分享',
-    //   key: '好友分享',
-    //   width: '16%'
-    // },
-    // {
-    //   title: '小程序搜索',
-    //   dataIndex: '小程序搜索',
-    //   key: '小程序搜索',
-    //   width: '16%'
-    // },
-    // {
-    //   title: '线下扫码',
-    //   dataIndex: '线下扫码',
-    //   key: '线下扫码',
-    //   width: '16%'
-    // },
-    // {
-    //   title: '群分享',
-    //   dataIndex: '群分享',
-    //   key: '群分享',
-    //   width: '16%'
-    // },
-
-
+    },
 
 
   ]
 
-  function handleSelectChange (e) {
+  function handleSelectChange(e) {
 
     console.log(e)
     setuserType(e)
@@ -159,7 +118,6 @@ const header = props => {
 
 
 
-
   return (<>
     <div style={{
       backgroundColor: '#fff',
@@ -191,16 +149,14 @@ const header = props => {
           <div style={{
             width: '1060px',
             height: '560px',
-
             paddingTop: '40px',
             marginRight: ' 40px',
           }}>
-            <UserSource endDate={endDate} startDate={startDate} onSuccess={(e) => onTabledatas(e)}></UserSource>
+            <UserSource BuildSelectHide={true} endDate={endDate} startDate={startDate} onSuccess={(e) => onTabledatas(e)}></UserSource>
           </div>
           <div style={{
             width: '509px',
             height: '600px',
-
             paddingTop: '40px',
 
           }}>
@@ -212,7 +168,7 @@ const header = props => {
           <Option value='registered'>注册用户</Option>
         </Select>
 
-        <Table dataSource={tableData} columns={columns} pagination={false} scroll={{ y: 500 }}></Table>
+        <Table style={{marginTop:'20px'}} dataSource={tableData} columns={columns} pagination={false} scroll={{ y: 500 }}></Table>
       </div>
     </div>
   </>

src/utils/request.js

@@ -76,9 +76,8 @@ 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.blob(): ', response.blob())
+      // console.log('response: ', response)
+      // console.log('response.headers: ', response.headers)
       const { code, data, message } = await response.clone().json();
       if (code != 1000) {
         notification.error({