diff --git a/README.md b/README.md
index 15056ac..5ab2cb3 100644
--- a/README.md
+++ b/README.md
@@ -11,13 +11,17 @@
- 基于Antd UI 设计语言,提供后台管理系统常见使用场景
## To do list
-- [x] 登录示例
-- [x] 主布局示例
-- [x] 数据列表
-- [ ] 数据列表交互动效
-- [x] 表单相关
+- [x] 登录页面
- [x] dashbord页面
-- [ ] 可视化图表示例
+ - [x] 数字卡片
+ - [x] 实时天气卡片
+ - [x] 图表
+- [x] 用户列表页面
+ - [x] 增删改查
+ - [ ] 交互动效
+- [x] 扩展UI组件
+ - [x] Ico
+- [ ] 可视化图表
## 开发及构建
diff --git a/mock/dashboard.js b/mock/dashboard.js
index 49ad9a8..f6c5d3a 100644
--- a/mock/dashboard.js
+++ b/mock/dashboard.js
@@ -18,7 +18,9 @@ let dataKey = mockStorge('Dashboard', Mock.mock({
space:825,
'cpu|40-90':1,
'data|20':[
- 'cpu|20-80':1
+ {
+ 'cpu|20-80':1
+ }
],
},
'browser':[
diff --git a/src/assets/fonts/iconfont.eot b/src/assets/fonts/iconfont.eot
deleted file mode 100644
index eba8d29..0000000
Binary files a/src/assets/fonts/iconfont.eot and /dev/null differ
diff --git a/src/assets/fonts/iconfont.svg b/src/assets/fonts/iconfont.svg
deleted file mode 100644
index a9374de..0000000
--- a/src/assets/fonts/iconfont.svg
+++ /dev/null
@@ -1,732 +0,0 @@
-
-
-
diff --git a/src/assets/fonts/iconfont.ttf b/src/assets/fonts/iconfont.ttf
deleted file mode 100644
index 09255a1..0000000
Binary files a/src/assets/fonts/iconfont.ttf and /dev/null differ
diff --git a/src/assets/fonts/iconfont.woff b/src/assets/fonts/iconfont.woff
deleted file mode 100644
index 4191b87..0000000
Binary files a/src/assets/fonts/iconfont.woff and /dev/null differ
diff --git a/src/components/dashboard/cpu.js b/src/components/dashboard/cpu.js
index e69de29..b579715 100644
--- a/src/components/dashboard/cpu.js
+++ b/src/components/dashboard/cpu.js
@@ -0,0 +1,38 @@
+import React, {PropTypes} from 'react'
+import {Icon,Table,Tag} from 'antd'
+import styles from './cpu.less'
+import {classnames,color} from '../../utils'
+import {LineChart, Line, XAxis, YAxis, CartesianGrid, Tooltip, Legend, ResponsiveContainer} from 'recharts'
+
+function Cpu(props) {
+ return
+
+
+
usage
+
{props.usage}
+
+
+
space
+
{props.space}
+
+
+
+
+
+
+
+
+
+
+
+
+}
+
+Cpu.propTypes = {
+ props: PropTypes.object
+}
+
+export default Cpu
diff --git a/src/components/dashboard/cpu.less b/src/components/dashboard/cpu.less
index e69de29..dc0994e 100644
--- a/src/components/dashboard/cpu.less
+++ b/src/components/dashboard/cpu.less
@@ -0,0 +1,35 @@
+.cpu {
+ .number {
+ display: flex;
+ height: 64px;
+ justify-content: space-between;
+ margin-bottom: 32px;
+ .item {
+ text-align: center;
+ height: 64px;
+ width: 100%;
+ position: relative;
+ &+.item{
+ &::before{
+ content: '';
+ display: block;
+ width: 1px;
+ height: 40px;
+ position: absolute;
+ background: @border-color-base;
+ top: 12px;
+ }
+ }
+ p{
+ color: #757575;
+ &:first-child{
+ font-size: 16px;
+ }
+ &:last-child{
+ font-size: 20px;
+ font-weight: 700;
+ }
+ }
+ }
+ }
+}
diff --git a/src/models/dashboard.js b/src/models/dashboard.js
index d45c1e9..c0cfbd0 100644
--- a/src/models/dashboard.js
+++ b/src/models/dashboard.js
@@ -179,6 +179,7 @@ export default {
},
numbers:[],
recentSales:[],
+ comments:[],
completed:[],
browser:[],
cpu:{},
diff --git a/src/routes/dashboard.js b/src/routes/dashboard.js
index 3d0dcae..e24b09c 100644
--- a/src/routes/dashboard.js
+++ b/src/routes/dashboard.js
@@ -10,6 +10,7 @@ import RecentSales from '../components/dashboard/recentSales'
import Comments from '../components/dashboard/comments'
import Completed from '../components/dashboard/completed'
import Browser from '../components/dashboard/browser'
+import Cpu from '../components/dashboard/cpu'
import styles from './dashboard.less'
import {color} from '../utils'
@@ -82,7 +83,7 @@ function Dashboard({dashboard}) {
- {/* */}
+