From de4c2a9700133527ca316a65aeb7271dd941b21b Mon Sep 17 00:00:00 2001
From: vijay-huang <vijay.huang@qq.com>
Date: Thu, 28 May 2020 12:00:01 +0800
Subject: [PATCH] =?UTF-8?q?#=E5=A2=9E=E5=8A=A0=E6=B8=A9=E5=BA=A6=E5=92=8C?=
 =?UTF-8?q?=E6=B9=BF=E5=BA=A6=E7=9A=84=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/counter/logs.vue | 12 ++++++++++++
 src/views/counter/map2.vue | 11 ++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/views/counter/logs.vue b/src/views/counter/logs.vue
index fd1df8f..5e2b328 100644
--- a/src/views/counter/logs.vue
+++ b/src/views/counter/logs.vue
@@ -34,6 +34,18 @@
         prop="energy"
         :label="$t('counter.energy')"
         min-width="100">
+      </el-table-column>
+       <el-table-column
+        sortable
+        prop="temperature"
+        :label="$t('counter.temperature')"
+        min-width="100">
+      </el-table-column>
+       <el-table-column
+        sortable
+        prop="humidity"
+        :label="$t('counter.humidity')"
+        min-width="100">
       </el-table-column>
       <el-table-column
         prop="coordinate"
diff --git a/src/views/counter/map2.vue b/src/views/counter/map2.vue
index 7e4cb41..ad49bde 100644
--- a/src/views/counter/map2.vue
+++ b/src/views/counter/map2.vue
@@ -135,8 +135,10 @@ export default {
       const content = []
       const curTime = moment().format('YYYY-MM-DD HH:mm:ss')
       content.push('<div class="count">' + item.count + '</div>')
-      content.push('<div class="time">时间：' + curTime + '</div>')
-      content.push('<div><span>信号：' + item.signal + '</span><span class="energy">电量：' + item.energy + '</span></div>')
+      content.push('<div class="time">Time: ' + curTime + '</div>')
+      content.push('<div><span>Signal: ' + item.signal + '</span><span class="energy">Energy: ' + item.energy + '</span></div>')
+      content.push('<div><span>TEMP: ' + '30.3℃' + '</span><span class="humidity">HUM: ' + '69%' + '</span></div>')
+
       // content.push('<div>区域：尖沙咀</div>\n')
       // if (drivingButton) {
       //   content.push('<button id="btn" class="btn">驾车规划</button>')
@@ -314,7 +316,10 @@ export default {
     margin: 0 0 .4rem 0;
   }
   .info-middle span.energy {
-    margin-left: 1.8rem;
+    margin-left: 2.4rem;
+  }
+  .info-middle span.humidity {
+    margin-left: 1.0rem;
   }
   div.info-bottom {
     height: 0px;