jcnet
/
webio-node
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix error

This commit is contained in:
Jay 2017-04-13 13:13:40 +08:00
parent e5bf72435c
commit efdc7e01c2
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/AdminPage/Wristband/LocStatus/index.js
View File

@ -89,6 +89,7 @@ class LocStatus extends React.Component{
render (){
let {i18n} = this.props;
console.log(this.state.list);
return (
<Container fluid>
<Segment className="clearfix">

17
src/tools/index.js
View File

@ -7,11 +7,12 @@
* @return {string}
*/
export const padding = (str, lng = 0, arrow = -1, txt = '0') => {
if(typeof str != 'string') str = str.toString();
if(typeof txt != 'string') txt = txt.toString();
if(!isFinite(lng) || lng <= 0) return str;
if(str.length < lng) return padding(arrow < 0 ? `${txt}${str}` : `${str}${txt}`, lng, arrow, txt);
return str;
if (!str) str = '';
if (typeof str != 'string') str = str.toString();
if (typeof txt != 'string') txt = txt.toString();
if (!isFinite(lng) || lng <= 0) return str;
if (str.length < lng) return padding(arrow < 0 ? `${txt}${str}` : `${str}${txt}`, lng, arrow, txt);
return str;
}
/**
@ -21,7 +22,7 @@ export const padding = (str, lng = 0, arrow = -1, txt = '0') => {
* @return {string}
*/
export const convertTime = (timestamp, showSec = false) => {
timestamp = padding(timestamp, 13, 1, '0');
let d = new Date(parseInt(timestamp));
return `${d.getFullYear()}-${padding(d.getMonth() + 1, 2)}-${padding(d.getDate(), 2)} ${padding(d.getHours(), 2)}:${padding(d.getMinutes(), 2)}${showSec ? `:${padding(d.getSeconds(), 2)}` : ''}`
timestamp = padding(timestamp, 13, 1, '0');
let d = new Date(parseInt(timestamp));
return `${d.getFullYear()}-${padding(d.getMonth() + 1, 2)}-${padding(d.getDate(), 2)} ${padding(d.getHours(), 2)}:${padding(d.getMinutes(), 2)}${showSec ? `:${padding(d.getSeconds(), 2)}` : ''}`
}