diff --git a/src/pages/dashboard/analysis/components/IntroduceRow.tsx b/src/pages/dashboard/analysis/components/IntroduceRow.tsx index 3aa77e64..5a070e77 100644 --- a/src/pages/dashboard/analysis/components/IntroduceRow.tsx +++ b/src/pages/dashboard/analysis/components/IntroduceRow.tsx @@ -1,5 +1,5 @@ import { InfoCircleOutlined } from '@ant-design/icons'; -import { Tiny } from '@ant-design/plots'; +import { Area, Column } from '@ant-design/plots'; import { Col, Progress, Row, Tooltip } from 'antd'; import numeral from 'numeral'; import type { DataItem } from '../data.d'; @@ -65,18 +65,19 @@ const IntroduceRow = ({ loading, visitData }: { loading: boolean; visitData: Dat footer={} contentHeight={46} > - @@ -94,9 +95,10 @@ const IntroduceRow = ({ loading, visitData }: { loading: boolean; visitData: Dat footer={} contentHeight={46} > - a.count - b.count, - className: styles.alignRight, }, { title: '周涨幅', @@ -112,14 +111,14 @@ const TopSearch = ({ status="up" subTotal={17.1} /> - - diff --git a/src/pages/dashboard/monitor/components/ActiveChart/index.tsx b/src/pages/dashboard/monitor/components/ActiveChart/index.tsx index edd5d426..2e0b1ffa 100644 --- a/src/pages/dashboard/monitor/components/ActiveChart/index.tsx +++ b/src/pages/dashboard/monitor/components/ActiveChart/index.tsx @@ -1,4 +1,4 @@ -import { Tiny } from '@ant-design/plots'; +import { Area } from '@ant-design/plots'; import { Statistic } from 'antd'; import { useEffect, useRef, useState } from 'react'; import useStyles from './index.style'; @@ -48,13 +48,14 @@ const ActiveChart = () => { marginTop: 32, }} > - {activeData && ( diff --git a/src/pages/dashboard/monitor/index.tsx b/src/pages/dashboard/monitor/index.tsx index 0b77c612..e41d470c 100644 --- a/src/pages/dashboard/monitor/index.tsx +++ b/src/pages/dashboard/monitor/index.tsx @@ -1,30 +1,17 @@ -import { Gauge, Liquid, Tiny, WordCloud } from '@ant-design/plots'; +import { Gauge, Liquid, WordCloud } from '@ant-design/plots'; import { GridContent } from '@ant-design/pro-components'; import { useRequest } from '@umijs/max'; -import { Card, Col, Row, Statistic } from 'antd'; +import { Card, Col, Progress, Row, Statistic } from 'antd'; import numeral from 'numeral'; import type { FC } from 'react'; import ActiveChart from './components/ActiveChart'; import Map from './components/Map'; import { queryTags } from './service'; import useStyles from './style.style'; + const { Countdown } = Statistic; const deadline = Date.now() + 1000 * 60 * 60 * 24 * 2 + 1000 * 30; // Moment is also OK -const getAnnotations = (value: number) => [ - { - type: 'text', - style: { - text: `${value * 100}%`, - x: '50%', - y: '50%', - textAlign: 'center', - fontSize: 16, - fontStyle: 'bold', - }, - }, -]; - const Monitor: FC = () => { const { styles } = useStyles(); const { loading, data } = useRequest(queryTags); @@ -95,12 +82,15 @@ const Monitor: FC = () => { > `优`, }} @@ -123,35 +113,20 @@ const Monitor: FC = () => { marginBottom: 24, }} > - + - + - + - +