From 79f838e11e1acfc80c1fc5bc61fb60f79a82676f Mon Sep 17 00:00:00 2001
From: zhengpengju <zhengpengju4905@dingtalk.com>
Date: Mon, 27 Apr 2020 09:12:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8A=9F=E7=8E=87=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: a2f62aeb845e7788c62d461d470c1686cb293535
---
 projects/WebSPA/wwwroot/pages/iot/device/socket.html | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/projects/WebSPA/wwwroot/pages/iot/device/socket.html b/projects/WebSPA/wwwroot/pages/iot/device/socket.html
index 534f9df3..ab81c9c6 100644
--- a/projects/WebSPA/wwwroot/pages/iot/device/socket.html
+++ b/projects/WebSPA/wwwroot/pages/iot/device/socket.html
@@ -12,7 +12,8 @@
                 </div>
                 <div class="col-9 align-self-center">
                     <div class="row" style="line-height:28px;">
-                        <span class="badge badge-info" style="line-height:26px;" v-if="getDeviceDataValue(this.device, '电量')">{{electricity}} kW‧h</span>
+                        <span class="badge badge-info" style="line-height:26px; margin:0 10px 0 0" v-if="getDeviceDataValue(this.device, '电量')">{{electricity}} kW‧h</span>
+                        <span class="badge badge-info" style="line-height:26px; margin:0 10px 0 0" >{{power}} W</span>
                         <img style="height:32px;" v-if="getDeviceDataValue(device,'状态')==='开'" v-on:click="execApi(device.number,'/Socket/Off')" :src="config.apigateway+'/IoTCenter/images/on.png'" />
                         <img style="height:32px;" v-else="getDeviceDataValue(device,'状态')==='关'" v-on:click="execApi(device.number,'/Socket/On')" :src="config.apigateway+'/IoTCenter/images/off.png'" />
                     </div>
@@ -26,7 +27,12 @@
         props: ['device'],
         computed: {
             electricity: function () {
+                console.log('$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$-electricity');
                 return parseFloat(getDeviceDataValue(this.device, '电量')||0).toFixed(2);
+            },
+            power: function (){
+                console.log('$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$-power');
+                return parseFloat(getDeviceDataValue(this.device, '功率')||0).toFixed(2);
             }
         }
     });