diff --git a/src/components/Charts/MiniProgress/index.js b/src/components/Charts/MiniProgress/index.js index 16ca2b7b8e4bf50cc1711d9effbeab333015bbba..6e9840f9eb2f8585d9dce8cec5b22f1bae4ac8bc 100644 --- a/src/components/Charts/MiniProgress/index.js +++ b/src/components/Charts/MiniProgress/index.js @@ -1,6 +1,5 @@ import React from 'react'; import { Tooltip } from 'antd'; -import { formatMessage } from 'umi/locale'; import styles from './index.less'; @@ -10,28 +9,27 @@ const MiniProgress = ({ color = 'rgb(19, 194, 194)', strokeWidth, percent, -}) => ( -
- -
- - +}) => { + return ( +
+ +
+ + +
+
+
+
- -
-
-
-); + ); +}; export default MiniProgress; diff --git a/src/components/Charts/MiniProgress/index.less b/src/components/Charts/MiniProgress/index.less index 40ba70be6bd3d4fb2a52efc34582c6ad81346e37..e1e0b4fc5169615814efe60821f39dc3e1bc58b9 100644 --- a/src/components/Charts/MiniProgress/index.less +++ b/src/components/Charts/MiniProgress/index.less @@ -19,6 +19,8 @@ position: absolute; top: 0; bottom: 0; + z-index: 9; + width: 20px; span { position: absolute; top: 0; diff --git a/src/pages/Dashboard/IntroduceRow.js b/src/pages/Dashboard/IntroduceRow.js index 7262826facd502554097616192dc6af1a1df4514..e33a4001ce94e8030fbfa405ca2d590d2d895fa8 100644 --- a/src/pages/Dashboard/IntroduceRow.js +++ b/src/pages/Dashboard/IntroduceRow.js @@ -1,6 +1,6 @@ import React, { memo } from 'react'; import { Row, Col, Icon, Tooltip } from 'antd'; -import { FormattedMessage } from 'umi/locale'; +import { FormattedMessage, formatMessage } from 'umi/locale'; import styles from './Analysis.less'; import { ChartCard, MiniArea, MiniBar, MiniProgress, Field } from '@/components/Charts'; import Trend from '@/components/Trend'; @@ -135,7 +135,15 @@ const IntroduceRow = memo(({ loading, visitData }) => ( } contentHeight={46} > - +