diff --git a/src/locales/en-US.js b/src/locales/en-US.js index cce61a5186e7b88c46d148d0e726dea221612429..19e02d701ed3f338dc4d80ecc188f1e8c8724a13 100644 --- a/src/locales/en-US.js +++ b/src/locales/en-US.js @@ -155,6 +155,22 @@ export default { 'app.forms.basic.title': 'Basic form', 'app.forms.basic.description': 'Form pages are used to collect or verify information to users, and basic forms are common in scenarios where there are fewer data items.', + 'app.monitor.trading-activity': 'Real-Time Trading Activity', + 'app.monitor.total-transactions-today': 'Total transactions today', + 'app.monitor.sales-target': 'Sales target completion rate', + 'app.monitor.remaining-time': 'Remaining time of activity', + 'app.monitor.total-transactions-per-second': 'Total transactions per second', + 'app.monitor.activity-forecast': 'Activity forecast', + 'app.monitor.efficiency': 'Efficiency', + 'app.monitor.ratio': 'Ratio', + 'app.monitor.proportion-per-category': 'Proportion Per Category', + 'app.monitor.fast-food': 'Fast food', + 'app.monitor.western-food': 'Western food', + 'app.monitor.hot-pot': 'Hot pot', + 'app.monitor.waiting-for-implementation': 'Waiting for implementation', + 'app.monitor.popular-searches': 'Popular Searches', + 'app.monitor.resource-surplus': 'Resource Surplus', + 'app.monitor.fund-surplus': 'Fund Surplus', 'app.settings.menuMap.basic': 'Basic Settings', 'app.settings.menuMap.security': 'Security Settings', 'app.settings.menuMap.binding': 'Account Binding', diff --git a/src/locales/zh-CN.js b/src/locales/zh-CN.js index 35219ba157f8607902326e8b17765b7e22044877..24b863ed9245534c689da2ff917f5077665cb79a 100644 --- a/src/locales/zh-CN.js +++ b/src/locales/zh-CN.js @@ -155,6 +155,22 @@ export default { 'app.forms.basic.title': '基础表单', 'app.forms.basic.description': '表单页用于向用户收集或验证信息,基础表单常见于数据项较少的表单场景。', + 'app.monitor.trading-activity': '活动实时交易情况', + 'app.monitor.total-transactions': '今日交易总额', + 'app.monitor.sales-target': '销售目标完成率', + 'app.monitor.remaining-time': '活动剩余时间', + 'app.monitor.total-transactions-per-second': '每秒交易总额', + 'app.monitor.activity-forecast': '活动情况预测', + 'app.monitor.efficiency': '券核效率', + 'app.monitor.ratio': '跳出率', + 'app.monitor.proportion-per-category': '各品类占比', + 'app.monitor.fast-food': '中式快餐', + 'app.monitor.western-food': '西餐', + 'app.monitor.hot-pot': '火锅', + 'app.monitor.waiting-for-implementation': 'Waiting for implementation', + 'app.monitor.popular-searches': '热门搜索', + 'app.monitor.resource-surplus': '资源剩余', + 'app.monitor.fund-surplus': '补贴资金剩余', 'app.settings.menuMap.basic': '基本设置', 'app.settings.menuMap.security': '安全设置', 'app.settings.menuMap.binding': '账号绑定', diff --git a/src/pages/Dashboard/Monitor.js b/src/pages/Dashboard/Monitor.js index 0c475db35feccaf089807cadffbf2315d429eadb..17f4f31651d30b494bf8dc7be08623a5821d88bc 100644 --- a/src/pages/Dashboard/Monitor.js +++ b/src/pages/Dashboard/Monitor.js @@ -1,5 +1,6 @@ import React, { PureComponent } from 'react'; import { connect } from 'dva'; +import { formatMessage, FormattedMessage } from 'umi/locale'; import { Row, Col, Card, Tooltip } from 'antd'; import { Pie, WaterWave, Gauge, TagCloud } from '@/components/Charts'; import NumberInfo from '@/components/NumberInfo'; @@ -42,31 +43,72 @@ class Monitor extends PureComponent { - + + } + bordered={false} + > + } suffix="元" total={numeral(124543233).format('0,0')} /> - + + } + total="92%" + /> - } /> + + } + total={} + /> + } suffix="元" total={numeral(234).format('0,0')} />
- + + } + > map - + + } + style={{ marginBottom: 24 }} + bordered={false} + > } style={{ marginBottom: 24 }} bodyStyle={{ textAlign: 'center' }} bordered={false} > - + - + + } + bordered={false} + className={styles.pieCard} + > + } total="28%" height={128} lineWidth={2} @@ -108,7 +174,12 @@ class Monitor extends PureComponent { animate={false} color="#5DDECF" percent={22} - subTitle="西餐" + subTitle={ + + } total="22%" height={128} lineWidth={2} @@ -119,7 +190,9 @@ class Monitor extends PureComponent { animate={false} color="#2FC25B" percent={32} - subTitle="火锅" + subTitle={ + + } total="32%" height={128} lineWidth={2} @@ -130,7 +203,12 @@ class Monitor extends PureComponent { + } loading={loading} bordered={false} bodyStyle={{ overflow: 'hidden' }} @@ -140,11 +218,22 @@ class Monitor extends PureComponent { + } bodyStyle={{ textAlign: 'center', fontSize: 0 }} bordered={false} > - + + } + percent={34} + />