diff --git a/route/api/wristband.js b/route/api/wristband.js index 952dc53..41acfa6 100644 --- a/route/api/wristband.js +++ b/route/api/wristband.js @@ -131,8 +131,9 @@ router let query = "select w.`name`, w.`mac` as wristband, \ coalesce(l.`name`, l2.`name`) as locname, \ coalesce(case when tmp2.`wlocrtloc` = 'NG' then null else tmp2.`wlocrtloc` end, ll.`devid`) as locid, \ - ll.*\ - from ??.?? w\ + case when tmp2.`wlocrtloc` = 'NG' then 1 else 0 end as loss, \ + ll.* \ + from ??.?? w \ left join ??.?? tmp2 \ on tmp2.`wlocrtmac` = w.`mac` \ left join ??.?? ll \ diff --git a/src/components/AdminPage/Wristband/LocStatus/ListItem.js b/src/components/AdminPage/Wristband/LocStatus/ListItem.js index 5744dd9..57b4e83 100644 --- a/src/components/AdminPage/Wristband/LocStatus/ListItem.js +++ b/src/components/AdminPage/Wristband/LocStatus/ListItem.js @@ -5,7 +5,7 @@ import {convertTime, padding} from '../../../../tools'; const ListItem = ({i18n, data}) => { return ( - + {data.wristband} {data.name} {data.locname} diff --git a/src/components/AdminPage/Wristband/LocStatusWloc/index.js b/src/components/AdminPage/Wristband/LocStatusWloc/index.js index c7478c3..c08ccb3 100644 --- a/src/components/AdminPage/Wristband/LocStatusWloc/index.js +++ b/src/components/AdminPage/Wristband/LocStatusWloc/index.js @@ -94,7 +94,7 @@ class LocStatusWloc extends React.Component { { t.list ? t.list.map((tt, idx) => { - let isExpire = padding(tt.timestamp, 13, 1, '0') < (Date.now() - 60000) ? true : false; + let isExpire = tt.loss == 1 ? true : false; return ( { tt.name ? (