|
@@ -379,6 +379,9 @@ export default {
|
|
|
var realtimecurves = [];
|
|
|
var wholecurves = [];
|
|
|
var now = new Date();
|
|
|
+ var logtime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss');
|
|
|
+ var shorttime = moment(new Date()).format('HH:mm:ss');
|
|
|
+ var longtime = moment(new Date()).format('MM-DD HH:mm:ss');
|
|
|
|
|
|
for (var i = 0; i < values.length; i++) {
|
|
|
switch (values[i].Name) {
|
|
@@ -408,13 +411,12 @@ export default {
|
|
|
sdscl = parseFloat(values[i].Value);
|
|
|
break;
|
|
|
case '当前温度值':
|
|
|
- // console.log("当前温度值", values[i].Value)
|
|
|
- realtimecurves.push({name: "温度实值-实时", subList: [{tagvalue: values[i].Value, transtime: moment(now).format('HH:mm:ss')}], type: "实时"})
|
|
|
- wholecurves.push({name: "温度实值-全程", subList: [{tagvalue: values[i].Value, transtime: moment(now).format('MM-DD HH:mm:ss')}], type: "全程"})
|
|
|
+ realtimecurves.push({name: "温度实值-实时", subList: [{logtime: logtime, tagvalue: values[i].Value, transtime: shorttime}], type: "实时"})
|
|
|
+ wholecurves.push({name: "温度实值-全程", subList: [{logtime: logtime, tagvalue: values[i].Value, transtime: longtime}], type: "全程"})
|
|
|
break;
|
|
|
case '当前湿度值':
|
|
|
- realtimecurves.push({name: "湿度实值-实时", subList: [{tagvalue: values[i].Value, transtime: moment(now).format('HH:mm:ss')}], type: "实时"})
|
|
|
- wholecurves.push({name: "湿度实值-全程", subList: [{tagvalue: values[i].Value, transtime: moment(now).format('MM-DD HH:mm:ss')}], type: "全程"})
|
|
|
+ realtimecurves.push({name: "湿度实值-实时", subList: [{logtime: logtime, tagvalue: values[i].Value, transtime: shorttime}], type: "实时"})
|
|
|
+ wholecurves.push({name: "湿度实值-全程", subList: [{logtime: logtime, tagvalue: values[i].Value, transtime: longtime}], type: "全程"})
|
|
|
break;
|
|
|
default:
|
|
|
break;
|