From 5ea08d91bbd64cbf11a621da1fcda4b3efb71ee0 Mon Sep 17 00:00:00 2001
From: chenghx <chenghx@nfex.com>
Date: 星期五, 20 七月 2018 17:36:46 +0800
Subject: [PATCH] mini chart 完善
---
src/components/dashboard/Dashboard.vue | 38 +++++++++++---------------------------
1 files changed, 11 insertions(+), 27 deletions(-)
diff --git a/src/components/dashboard/Dashboard.vue b/src/components/dashboard/Dashboard.vue
index ccdfa22..3f6adc3 100644
--- a/src/components/dashboard/Dashboard.vue
+++ b/src/components/dashboard/Dashboard.vue
@@ -2,7 +2,7 @@
<div>
<a-row style="margin: -12px">
<a-col :sm="24" :md="12" :xl="6" style="padding: 12px 12px 24px;">
- <chart-card title="鎬婚攢鍞">
+ <chart-card title="鎬婚攢鍞" total="锟� 189,345">
<a-tooltip title="鎸囨爣璇存槑" slot="action">
<a-icon type="info-circle-o" />
</a-tooltip>
@@ -22,52 +22,34 @@
</chart-card>
</a-col>
<a-col :sm="24" :md="12" :xl="6" style="padding: 12px 12px 24px;">
- <chart-card title="鎬婚攢鍞">
+ <chart-card title="鎬婚攢鍞" total="锟� 189,345">
<a-tooltip title="鎸囨爣璇存槑" slot="action">
<a-icon type="info-circle-o" />
</a-tooltip>
<div>
- <mini-chart />
+ <mini-area />
</div>
<div slot="footer">鏃ュ潎閿�鍞 <span>锟� 234.56</span></div>
</chart-card>
</a-col>
<a-col :sm="24" :md="12" :xl="6" style="padding: 12px 12px 24px;">
- <chart-card title="鎬婚攢鍞">
+ <chart-card title="鎬婚攢鍞" total="锟� 189,345">
<a-tooltip title="鎸囨爣璇存槑" slot="action">
<a-icon type="info-circle-o" />
</a-tooltip>
<div>
- <div style="display: inline-block; font-size: 14px; line-height: 22px; margin-right: 16px">
- 鍚屽懆姣�
- <span>12%</span>
- <span style="color: #f5222d; font-size: 12px"><a-icon type="caret-up" /></span>
- </div>
- <div style="display: inline-block; font-size: 14px; line-height: 22px;">
- 鏃ョ幆姣�
- <span>11%</span>
- <span style="color: #52c41a; font-size: 12px"><a-icon type="caret-down" /></span>
- </div>
+ <mini-bar />
</div>
<div slot="footer">鏃ュ潎閿�鍞 <span>锟� 234.56</span></div>
</chart-card>
</a-col>
<a-col :sm="24" :md="12" :xl="6" style="padding: 12px 12px 24px;">
- <chart-card title="鎬婚攢鍞">
+ <chart-card title="钀ラ攢娲诲姩璇存槑" total="73%">
<a-tooltip title="鎸囨爣璇存槑" slot="action">
<a-icon type="info-circle-o" />
</a-tooltip>
<div>
- <div style="display: inline-block; font-size: 14px; line-height: 22px; margin-right: 16px">
- 鍚屽懆姣�
- <span>12%</span>
- <span style="color: #f5222d; font-size: 12px"><a-icon type="caret-up" /></span>
- </div>
- <div style="display: inline-block; font-size: 14px; line-height: 22px;">
- 鏃ョ幆姣�
- <span>11%</span>
- <span style="color: #52c41a; font-size: 12px"><a-icon type="caret-down" /></span>
- </div>
+ <mini-progress target="90" percent="78" color="#13C2C2" height="8px"/>
</div>
<div slot="footer">鏃ュ潎閿�鍞 <span>锟� 234.56</span></div>
</chart-card>
@@ -83,10 +65,12 @@
import ChartCard from './ChartCard'
import ATooltip from 'vue-antd-ui/es/tooltip/Tooltip'
import AIcon from 'vue-antd-ui/es/icon/icon'
-import MiniChart from '../chart/MiniChart'
+import MiniArea from '../chart/MiniArea'
+import MiniBar from '../chart/MiniBar'
+import MiniProgress from '../chart/MiniProgress'
export default {
name: 'dashboard',
- components: {MiniChart, AIcon, ATooltip, ChartCard, ACard, ARow, ACol}
+ components: {MiniProgress, MiniBar, MiniArea, AIcon, ATooltip, ChartCard, ACard, ARow, ACol}
}
</script>
--
Gitblit v1.9.1