From 8d11b3142471207c1dfbe7fb5fc39791551a370a Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Thu, 22 Dec 2016 09:35:28 +0800
Subject: [PATCH] 环境数云服务端代码优化与整理
---
method.js | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/method.js b/method.js
index 4a95bb5..a085477 100644
--- a/method.js
+++ b/method.js
@@ -167,6 +167,8 @@
var ddv = this.toDec(fields[62]) * 256 + this.toDec(fields[63]);
var mcu = this.toDec(fields[64]) + this.toDec(fields[65]) / 100;
+ var current = moment();
+
queue.pushToScreen({
mac: mac,
location: {
@@ -174,16 +176,15 @@
lng: 120.988327
},
data: {
- x1: x1, //PM2.5
- x2: x9, //������
- x3: x11, //������
- x4: x10, //������
- x5: x14, //������������
- x6: x12 //������
- }
+ x1: x1, //PM2.5 - (������:ppm)
+ x2: x3, //PM2.5 - 0.1���0.3um���
+ x3: x9, //������
+ x4: x11, //������
+ x5: x10, //������
+ x6: x14 //������������
+ },
+ time: current.valueOf()
});
-
- var current = moment();
var rank = 0;
if(s > 0) {
--
Gitblit v1.8.0