return csv string
This commit is contained in:
Vendored
+1
-1
@@ -18,7 +18,7 @@
|
|||||||
"MONGOHOST": "192.168.178.190",
|
"MONGOHOST": "192.168.178.190",
|
||||||
"MONGOAUTH": "true",
|
"MONGOAUTH": "true",
|
||||||
"MONGOUSRP": "admin:mongo4noise",
|
"MONGOUSRP": "admin:mongo4noise",
|
||||||
"DBASE": "influx"
|
// "DBASE": "influx"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -6,7 +6,7 @@ const router = express.Router();
|
|||||||
/* GET home page. */
|
/* GET home page. */
|
||||||
|
|
||||||
router.get('/', function(req, res, next) {
|
router.get('/', function(req, res, next) {
|
||||||
res.status(200).json({message: trans('NOTHIMG')})
|
res.status(200).json({message: trans('NOTHING')})
|
||||||
});
|
});
|
||||||
|
|
||||||
export default router
|
export default router
|
||||||
|
|||||||
+22
-18
@@ -36,24 +36,28 @@ export const getNoiseData = async (params, possibles, props) => {
|
|||||||
opts.start = start
|
opts.start = start
|
||||||
opts.stop = stop
|
opts.stop = stop
|
||||||
let erg = await x.func(opts) // get the data
|
let erg = await x.func(opts) // get the data
|
||||||
ret = {
|
if (opts.csv === true) {
|
||||||
err: erg.err,
|
ret = erg
|
||||||
options: {
|
} else {
|
||||||
sid: opts.sensorid,
|
ret = {
|
||||||
indoor: props.location[0].indoor,
|
err: erg.err,
|
||||||
span: opts.span,
|
options: {
|
||||||
start: DateTime.fromISO(opts.start.slice(7)).toUTC().toISO(),
|
sid: opts.sensorid,
|
||||||
data: opts.data,
|
indoor: props.location[0].indoor,
|
||||||
peak: opts.peak,
|
span: opts.span,
|
||||||
count: erg.values.length,
|
start: DateTime.fromISO(opts.start.slice(7)).toUTC().toISO(),
|
||||||
},
|
data: opts.data,
|
||||||
values: erg.values,
|
peak: opts.peak,
|
||||||
}
|
count: erg.values.length,
|
||||||
if (!x.peak) {
|
},
|
||||||
delete ret.options.peak
|
values: erg.values,
|
||||||
}
|
}
|
||||||
if(ret.values.length === 0) {
|
if (!x.peak) {
|
||||||
ret.err = trans('NODATA')
|
delete ret.options.peak
|
||||||
|
}
|
||||||
|
if(ret.values.length === 0) {
|
||||||
|
ret.err = trans('NODATA')
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return ret
|
return ret
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user