Commit ecdb062a by Chaiwith Santaweesuk

update

parent c84d5bb8
...@@ -162,6 +162,15 @@ class Home extends Component { ...@@ -162,6 +162,15 @@ class Home extends Component {
const { device, range, breakdown } = selectedFeed; const { device, range, breakdown } = selectedFeed;
this.getFeedData(device, range, breakdown); this.getFeedData(device, range, breakdown);
}; };
getMax(){
}
getMin(){
}
getAvg(){
}
render() { render() {
const { const {
...@@ -188,13 +197,12 @@ class Home extends Component { ...@@ -188,13 +197,12 @@ class Home extends Component {
{/* {Data.map((item, index) => ( {/* {Data.map((item, index) => (
<DataCard key={index} item={item} feedData={feedData} /> <DataCard key={index} item={item} feedData={feedData} />
))} */} ))} */}
<DataCard item={Data[0]} feedData={currentFeed} /> <DataCard item={Data[0]} feedData={currentFeed} total={}/>
<DataCard item={Data[1]} feedData={revenueFeed} total={revenueTotal} max={revenueMax} min={revenueMin} avg={revenueAvg}/>
<DataCard item={Data[1]} feedData={revenueFeed} /> <DataCard item={Data[2]} feedData={peopleFeed} total={peopleTotal} max={peopleMax} min={peopleMin} avg={peopleAvg}/>
<DataCard item={Data[2]} feedData={peopleFeed} /> <DataCard item={Data[3]} feedData={remoteFeed} total={remoteTotal} max={remoteMax} min={remoteMin} avg={remoteAvg}/>
<DataCard item={Data[3]} feedData={remoteFeed} /> <DataCard item={Data[5]} feedData={fingerPrintFeed} total={fingerPrintTotal} max={fingerPrintMax} min={fingerPrintMin} avg={fingerPrintAvg}/>
<DataCard item={Data[5]} feedData={fingerPrintFeed} /> <DataCard item={Data[4]} feedData={keycardFeed} total={keycardTotal} max={keycardMax} min={keycardMin} avg={keycardAvg}/>
<DataCard item={Data[4]} feedData={keycardFeed} />
</Row> </Row>
<Row> <Row>
<DataTable /> <DataTable />
......
...@@ -40,7 +40,7 @@ const DataCard = props => { ...@@ -40,7 +40,7 @@ const DataCard = props => {
xAxis: moment(value[0]).format('D/M/YY h:mm:ss a'), xAxis: moment(value[0]).format('D/M/YY h:mm:ss a'),
yAxis: value[1], yAxis: value[1],
})); }));
// console.log(dataObj); console.log(dataObj);
} }
return ( return (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment