conversion

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/UserConversion.jsx

@@ -9,64 +9,58 @@ import { Table, Select, Row, Col, Menu, Dropdown, Button, Icon, message } from '
 
 import styles from '../styles.less'
 
-const UserSource = (props) => {
 
-  const [data, setData] = useState({ records: [] })
-  const [theStatis, settheStatis] = useState({ records: [] })
-  const [Current, setTheCurrent] = useState({ records: [] })
+const UserSource = props => {
 
+  const [theCurrent, setTheCurrent] = useState({ records: [] })
 
   useEffect(() => {
     UserConversionRate({ conversion: 'authorization_phone' })
   }, [])
 
-  function UserConversionRate(params) {
-    request({
-      ...apis.indexEcharts.userConversion,
-      params,
-    }).then((data) => {
-      console.log(data, "data")
-      setData(data)
-    })
+ function UserConversionRate(params) {
+      request({
+        ...apis.indexEcharts.userConversion,
+        params,
+      }).then(data => {
+        // console.log("data: ", data)
+        setDataset(data, params.conversion)
+      })
   }
 
-  function setDataset(data) {
-
-    const { pvNum, ...other } = data['data_count']
+ function setDataset(data, theStatis) {
+    const { pvNum, ...other } = data.data_count
 
     // 获取第一个值
     let num = 0
-    for (let v of Object.keys(other)) {
+    for (const v of Object.keys(other)) {
       num = other[v]
       break
     }
 
     if (pvNum < num) {
-      Current = []
+      setTheCurrent([])
     } else {
-      Current = [
-        { name: getStatisName(), value: num },
+      setTheCurrent([
+        { name: getStatisName(theStatis), value: num },
         { name: '其余', value: pvNum - num },
-      ]
+      ])
     }
-    console.log(Current, "Current")
-
-    // this.dataset[theStatis] = theCurrent
-
   }
-  function getStatisName() {
-    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
+
+  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 = {
@@ -77,17 +71,14 @@ const UserSource = (props) => {
       type: 'pie',
       name: '转化率',
       radius: ['34%', '52%'],
-      data: Current,
-    
-    }
+      data: theCurrent,
+      // data:[ { name: '授权手机', value: 6 },
+      // { name: '其余', value: 5 },]
+    },
   }
 
   function onChange(e) {
-    settheStatis(e)
-    UserConversionRate({ conversion: e }).then(res => {
-      console.log(data, "this")
-      setDataset(res)
-    })
+    UserConversionRate({ conversion: e })
   }
   const piestyles = {
     width: '100%',
@@ -97,7 +88,7 @@ const UserSource = (props) => {
   return (
     <>
       <div>
-        <p style={{ fontSize: '0.12rem', fontWeight: '600' }}>转化率</p>
+      <p style={{ fontSize: '0.12rem', fontWeight: '600' }}>转化率</p>
 
         <Select
           style={{ width: 200 }}
@@ -121,6 +112,6 @@ const UserSource = (props) => {
 
     </>
   )
-}
+ }
 
-export default UserSource;
+export default UserSource

src/pages/indexEcharts/userSource.jsx

@@ -35,7 +35,7 @@ const header = props => {
 
   const { RangePicker } = DatePicker;
 
-  function onChangetime (dates, dateStrings) {
+  function onChangetime(dates, dateStrings) {
 
     daterange[1] = dateStrings[1]
     daterange[0] = dateStrings[0]
@@ -56,13 +56,13 @@ const header = props => {
 
   }
 
-  function onChange (e) {
+  function onChange(e) {
 
     // console.log(`radio checked:${e.target.value}`);
 
   }
 
-  function datalist () {
+  function datalist() {
 
     setEndDate(daterange[1])
     setStartDate(daterange[0])
@@ -91,7 +91,7 @@ const header = props => {
 
   // }
 
-  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 +111,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)

src/utils/request.js

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