diff --git a/mock/dashboard.js b/mock/dashboard.js
index ed64c19..49ad9a8 100644
--- a/mock/dashboard.js
+++ b/mock/dashboard.js
@@ -13,6 +13,53 @@ let dataKey = mockStorge('Dashboard', Mock.mock({
'Electronics|300-550': 1
}
],
+ 'cpu':{
+ 'usage|50-600':1,
+ space:825,
+ 'cpu|40-90':1,
+ 'data|20':[
+ 'cpu|20-80':1
+ ],
+ },
+ 'browser':[
+ {
+ name:'Google Chrome',
+ percent:43.3,
+ status:1
+ },
+ {
+ name:'Mozilla Firefox',
+ percent:33.4,
+ status:2
+ },
+ {
+ name:'Apple Safari',
+ percent:34.6,
+ status:3
+ },
+ {
+ name:'Internet Explorer',
+ percent:12.3,
+ status:4
+ },
+ {
+ name:'Opera Mini',
+ percent:3.3,
+ status:1
+ },
+ {
+ name:'Chromium',
+ percent:2.53,
+ status:1
+ },
+ ],
+ user:{
+ name:'zuiidea',
+ email:'zuiiidea@.gmail.com',
+ sales:3241,
+ sold:3556,
+ avatar:'http://tva4.sinaimg.cn/crop.0.0.996.996.180/6ee6a3a3jw8f0ks5pk7btj20ro0rodi0.jpg'
+ },
'completed|12': [
{
'name|+1': 2008,
@@ -52,12 +99,12 @@ let dataKey = mockStorge('Dashboard', Mock.mock({
},
numbers: [
{
- icon: 'dot-chart',
+ icon: 'pay-circle-o',
color: color.green,
title: 'Online Review',
number: 2781
}, {
- icon: 'pay-circle-o',
+ icon: 'team',
color: color.blue,
title: 'New Customers',
number: 3241
@@ -67,7 +114,7 @@ let dataKey = mockStorge('Dashboard', Mock.mock({
title: 'Active Projects',
number: 253
}, {
- icon: 'paper-clip',
+ icon: 'shopping-cart',
color: color.red,
title: 'Referrals',
number: 4324
@@ -77,7 +124,6 @@ let dataKey = mockStorge('Dashboard', Mock.mock({
module.exports = {
'GET /api/dashboard' (req, res) {
- console.log(global[dataKey].recentSales);
res.json(global[dataKey])
}
}
diff --git a/src/components/dashboard/browser.js b/src/components/dashboard/browser.js
new file mode 100644
index 0000000..2f6ff90
--- /dev/null
+++ b/src/components/dashboard/browser.js
@@ -0,0 +1,41 @@
+import React, {PropTypes} from 'react'
+import {Icon,Table,Tag} from 'antd'
+import styles from './browser.less'
+import {classnames,color} from '../../utils'
+
+const status = {
+ 1:{
+ color:color.green
+ },
+ 2:{
+ color:color.red
+ },
+ 3:{
+ color:color.blue
+ },
+ 4:{
+ color:color.yellow
+ },
+}
+
+function Browser(props) {
+ const columns = [
+ {
+ title: 'name',
+ dataIndex: 'name',
+ className:styles.name,
+ }, {
+ title: 'percent',
+ dataIndex: 'percent',
+ className:styles.percent,
+ render:(text,it) =>