diff --git a/package.json b/package.json index 288fdbe..aed6a00 100644 --- a/package.json +++ b/package.json @@ -56,6 +56,7 @@ "@formily/antd": "^2.0.7", "@formily/core": "^2.0.7", "@formily/react": "^2.0.7", + "@metamask/detect-provider": "^1.2.0", "@umijs/route-utils": "^2.0.3", "ahooks": "^2.10.14", "antd": "^4.17.2", @@ -74,7 +75,8 @@ "react-dom": "^17.0.0", "react-helmet-async": "^1.0.4", "umi": "^3.5.0", - "umi-serve": "^1.9.10" + "umi-serve": "^1.9.10", + "web3": "^1.7.5" }, "devDependencies": { "@ant-design/pro-cli": "^2.0.2", diff --git a/src/pages/DataBoard/ActiveAnalysis/List/components/moreData.tsx b/src/pages/DataBoard/ActiveAnalysis/List/components/moreData.tsx index 33ff984..c02e3b7 100644 --- a/src/pages/DataBoard/ActiveAnalysis/List/components/moreData.tsx +++ b/src/pages/DataBoard/ActiveAnalysis/List/components/moreData.tsx @@ -1,6 +1,6 @@ import { Col, Row, Statistic } from 'antd'; import { ArrowDownOutlined, ArrowUpOutlined } from '@ant-design/icons'; -const moreData = (props: any, title: string, company = '人') => { +const MoreData = (props: any, title: string, company = '人') => { return (

{title}

@@ -42,4 +42,4 @@ const moreData = (props: any, title: string, company = '人') => {
); }; -export default moreData; +export default MoreData; diff --git a/src/pages/DataBoard/ActiveAnalysis/List/index.tsx b/src/pages/DataBoard/ActiveAnalysis/List/index.tsx index 652ad8e..648a64c 100644 --- a/src/pages/DataBoard/ActiveAnalysis/List/index.tsx +++ b/src/pages/DataBoard/ActiveAnalysis/List/index.tsx @@ -1,8 +1,13 @@ import React, { useRef, useState } from 'react'; -import echarts from 'echarts/lib/echarts'; // 引入 ECharts 主模块 -import { getDwuData } from '@/services/DataBorad'; -import moreData from '@/pages/DataBoard/ActiveAnalysis/List/components/moreData'; -import { getCoreData } from '@/services/DataBorad'; +import echarts from 'echarts/lib/echarts'; +import { + getActiveData, + getMonthUserData, + getOldUserData, + getTodayUserData, + getWeekUserData, +} from '@/services/DataBorad/activeanalysis'; +import MoreData from '@/pages/DataBoard/ActiveAnalysis/List/components/MoreData'; import ReactEcharts from 'echarts-for-react'; import { Card, Col, Row, Select } from 'antd'; const ActiveAnalysis: React.FC = () => { @@ -13,13 +18,13 @@ const ActiveAnalysis: React.FC = () => { return res.data; }; - const [data, setData] = useState(getData(getCoreData)); - const [oldUserData, setOldUserData] = useState(getData(getCoreData)); - const [weekData, setWeekData] = useState(getData(getCoreData)); - const [monthData, setMonthData] = useState(getData(getCoreData)); + const [data, setData] = useState(getData(getTodayUserData)); + const [oldUserData, setOldUserData] = useState(getData(getOldUserData)); + const [weekData, setWeekData] = useState(getData(getWeekUserData)); + const [monthData, setMonthData] = useState(getData(getMonthUserData)); const getOption = async (item = 'day') => { - const res = await getDwuData({ time_type: item }); + const res = await getActiveData({ time_type: item }); const xData: any = []; const seriesData: any = []; res.data.foreach((item: any) => { @@ -55,24 +60,22 @@ const ActiveAnalysis: React.FC = () => {
- {moreData(data, '今日活跃用户数')} + {MoreData(data, '今日活跃用户数')} - {moreData(oldUserData, '今日登录老用户数')} + {MoreData(oldUserData, '今日登录老用户数')} - {moreData(weekData, 'WAU(本周去重人数)')} + {MoreData(weekData, 'WAU(本周去重人数)')} - {moreData(monthData, 'MAU(本月去重人数)')} + {MoreData(monthData, 'MAU(本月去重人数)')}

DAU

-

今日人数

- {/*

{data}人

*/}