From a15166e652495352f59bc797b0ec178deba50748 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Wed, 30 Sep 2020 14:51:16 +0800
Subject: [PATCH] update

Former-commit-id: f0466ac5cd98f3a591d5b30758157b8b8f3706fa
Former-commit-id: c5f2e2ca62f703c69815945d309336e25a46c59b
---
 .../wwwroot/components/iot/curtain.html       |  2 +-
 .../WebMVC/wwwroot/components/iot/door.html   |  2 +-
 .../wwwroot/components/iot/gateway.html       |  2 +-
 .../wwwroot/components/iot/humiture.html      |  6 +++---
 .../WebMVC/wwwroot/components/iot/light.html  |  8 +++----
 .../WebMVC/wwwroot/components/iot/person.html |  6 +++---
 .../WebMVC/wwwroot/components/iot/smoke.html  |  6 +++---
 .../WebMVC/wwwroot/components/iot/socket.html | 21 ++++++++++++-------
 .../WebMVC/wwwroot/components/iot/switch.html |  2 +-
 .../wwwroot/components/iot/switch3.html       |  2 +-
 projects/WebMVC/wwwroot/css/site.css          |  3 +++
 projects/WebMVC/wwwroot/js/config.js          |  2 +-
 12 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/projects/WebMVC/wwwroot/components/iot/curtain.html b/projects/WebMVC/wwwroot/components/iot/curtain.html
index 9a5de303..7366089c 100644
--- a/projects/WebMVC/wwwroot/components/iot/curtain.html
+++ b/projects/WebMVC/wwwroot/components/iot/curtain.html
@@ -6,7 +6,7 @@
             <span class="float-right text-danger" v-else><i class="ion ion-ios-wifi"></i></span>
         </div>
         <div class="card-body">
-            <div class="row" style="height:100%;width:300px;margin: 0 auto;">
+            <div class="row" style="height:100%;width:250px;margin: 0 auto;">
                 <div class="col-4 align-self-center">
                     <img class="mh-100" :src="device.product.image" style="width:48px;" />
                 </div>
diff --git a/projects/WebMVC/wwwroot/components/iot/door.html b/projects/WebMVC/wwwroot/components/iot/door.html
index 0fc46f9e..16de0be7 100644
--- a/projects/WebMVC/wwwroot/components/iot/door.html
+++ b/projects/WebMVC/wwwroot/components/iot/door.html
@@ -6,7 +6,7 @@
             <span class="float-right text-danger" v-else><i class="ion ion-ios-wifi"></i></span>
         </div>
         <div class="card-body">
-            <div class="row" style="height:100%;width:300px;margin: 0 auto;">
+            <div class="row" style="height:100%;width:250px;margin: 0 auto;">
                 <div class="col-4 align-self-center">
                     <img class="mh-100" :src="device.product.image" style="width:48px;" />
                 </div>
diff --git a/projects/WebMVC/wwwroot/components/iot/gateway.html b/projects/WebMVC/wwwroot/components/iot/gateway.html
index f456c576..a578797c 100644
--- a/projects/WebMVC/wwwroot/components/iot/gateway.html
+++ b/projects/WebMVC/wwwroot/components/iot/gateway.html
@@ -4,7 +4,7 @@
             {{device.displayName}}
         </div>
         <div class="card-body">
-            <div class="row" style="height:100%;width:300px;margin: 0 auto;">
+            <div class="row" style="height:100%;width:250px;margin: 0 auto;">
                 <div class="col-4 align-self-center">
                     <img class="mh-100" :src="device.product.image" style="width:48px;" />
                 </div>
diff --git a/projects/WebMVC/wwwroot/components/iot/humiture.html b/projects/WebMVC/wwwroot/components/iot/humiture.html
index f981fcda..a7b51114 100644
--- a/projects/WebMVC/wwwroot/components/iot/humiture.html
+++ b/projects/WebMVC/wwwroot/components/iot/humiture.html
@@ -6,7 +6,7 @@
             <span class="float-right text-danger" v-else><i class="ion ion-ios-wifi"></i></span>
         </div>
         <div class="card-body">
-            <div class="row" style="height:100%;width:300px;margin: 0 auto;">
+            <div class="row" style="height:100%;width:250px;margin: 0 auto;">
                 <div class="col-3 align-self-center">
                     <img class="mh-100" :src="device.product.image" style="width:48px;" />
                 </div>
@@ -14,7 +14,7 @@
                     <div class="row" style="height:25px;line-height:25px;">
                         <span>
                             温度：
-                            <span class="text-success mx-2" style="font-size:20px;" v-if="getDeviceDataDescription(device,'温度')==='适中'">
+                            <span class="text-success" style="font-size:20px;" v-if="getDeviceDataDescription(device,'温度')==='适中'">
                                 {{getDeviceDataDescription(device,'温度')}}
                             </span>
                             <span v-else class="text-danger" style="font-size:20px;">
@@ -29,7 +29,7 @@
                             <span class="text-success" style="font-size:20px;" v-if="getDeviceDataDescription(device,'湿度')==='适中'">
                                 {{getDeviceDataDescription(device,'湿度')}}
                             </span>
-                            <span v-else class="text-danger mx-2" style="font-size:20px;">
+                            <span v-else class="text-danger" style="font-size:20px;">
                                 {{getDeviceDataDescription(device,'湿度')}}
                             </span>
                             {{getDeviceData(device,'湿度')}}
diff --git a/projects/WebMVC/wwwroot/components/iot/light.html b/projects/WebMVC/wwwroot/components/iot/light.html
index 5b00259a..770dbada 100644
--- a/projects/WebMVC/wwwroot/components/iot/light.html
+++ b/projects/WebMVC/wwwroot/components/iot/light.html
@@ -6,18 +6,18 @@
             <span class="float-right text-danger" v-else><i class="ion ion-ios-wifi"></i></span>
         </div>
         <div class="card-body">
-            <div class="row" style="height:100%;width:300px;margin: 0 auto;">
+            <div class="row" style="height:100%;width:250px;margin: 0 auto;">
                 <div class="col-3 align-self-center">
                     <img class="mh-100" :src="device.product.image" style="width:48px;" />
                 </div>
                 <div class="col-9 align-self-center">
                     <div class="row" style="line-height:28px;">
                         <span>
-                            光照度：
-                            <span class="text-success" style="font-size:28px;" v-if="getDeviceData(device,'状态')==='适中'">
+                            光强：
+                            <span class="text-success" style="font-size:20px;" v-if="getDeviceData(device,'状态')==='适中'">
                                 {{getDeviceDataDescription(device,'光照度')}}
                             </span>
-                            <span v-else class="text-danger mx-2" style="font-size:28px;">
+                            <span v-else class="text-danger" style="font-size:20px;">
                                 {{getDeviceDataDescription(device,'光照度')}}
                             </span>
 							{{getDeviceData(device,'光照度')}}
diff --git a/projects/WebMVC/wwwroot/components/iot/person.html b/projects/WebMVC/wwwroot/components/iot/person.html
index 0efa19ea..8b0b82cf 100644
--- a/projects/WebMVC/wwwroot/components/iot/person.html
+++ b/projects/WebMVC/wwwroot/components/iot/person.html
@@ -6,7 +6,7 @@
             <span class="float-right text-danger" v-else><i class="ion ion-ios-wifi"></i></span>
         </div>
         <div class="card-body">
-            <div class="row" style="height:100%;width:300px;margin: 0 auto;">
+            <div class="row" style="height:100%;width:250px;margin: 0 auto;">
                 <div class="col-4 align-self-center">
                     <img class="mh-100" :src="device.product.image" style="width:48px;" />
                 </div>
@@ -14,10 +14,10 @@
                     <div class="row" style="line-height:28px;">
                         <span>
                             状态：
-                            <span class="text-success" style="font-size:28px;" v-if="getDeviceDataValue(device,'状态')==='正常'">
+                            <span class="text-success" style="font-size:20px;" v-if="getDeviceDataValue(device,'状态')==='正常'">
                                 {{getDeviceDataValue(device,'状态')}}
                             </span>
-                            <span v-else class="text-danger mx-2" style="font-size:28px;">
+                            <span v-else class="text-danger" style="font-size:20px;">
                                 {{getDeviceDataValue(device,'状态')}}
                             </span>
                         </span>
diff --git a/projects/WebMVC/wwwroot/components/iot/smoke.html b/projects/WebMVC/wwwroot/components/iot/smoke.html
index 0efa19ea..8b0b82cf 100644
--- a/projects/WebMVC/wwwroot/components/iot/smoke.html
+++ b/projects/WebMVC/wwwroot/components/iot/smoke.html
@@ -6,7 +6,7 @@
             <span class="float-right text-danger" v-else><i class="ion ion-ios-wifi"></i></span>
         </div>
         <div class="card-body">
-            <div class="row" style="height:100%;width:300px;margin: 0 auto;">
+            <div class="row" style="height:100%;width:250px;margin: 0 auto;">
                 <div class="col-4 align-self-center">
                     <img class="mh-100" :src="device.product.image" style="width:48px;" />
                 </div>
@@ -14,10 +14,10 @@
                     <div class="row" style="line-height:28px;">
                         <span>
                             状态：
-                            <span class="text-success" style="font-size:28px;" v-if="getDeviceDataValue(device,'状态')==='正常'">
+                            <span class="text-success" style="font-size:20px;" v-if="getDeviceDataValue(device,'状态')==='正常'">
                                 {{getDeviceDataValue(device,'状态')}}
                             </span>
-                            <span v-else class="text-danger mx-2" style="font-size:28px;">
+                            <span v-else class="text-danger" style="font-size:20px;">
                                 {{getDeviceDataValue(device,'状态')}}
                             </span>
                         </span>
diff --git a/projects/WebMVC/wwwroot/components/iot/socket.html b/projects/WebMVC/wwwroot/components/iot/socket.html
index f282db0c..a62bfe02 100644
--- a/projects/WebMVC/wwwroot/components/iot/socket.html
+++ b/projects/WebMVC/wwwroot/components/iot/socket.html
@@ -6,18 +6,25 @@
             <span class="float-right text-danger" v-else><i class="ion ion-ios-wifi"></i></span>
         </div>
         <div class="card-body">
-            <div class="row" style="height:100%;width:300px;margin: 0 auto;">
-                <div class="col-4 align-self-center">
+            <div class="row" style="height:100%;width:250px;margin: 0 auto;">
+                <div class="col-3 align-self-center">
                     <img class="mh-100" :src="device.product.image" style="width:48px;" />
                 </div>
-                <div class="col-8 align-self-center">
+                <div class="col-2 align-self-center">
                     <div class="row" style="line-height:28px;">
-                        <span class="badge badge-info" style="line-height:26px; margin-right: 10px;" v-if="isSmart">{{electricity}} kW‧h</span>
-                        <span class="badge badge-info" style="line-height:26px; margin-right: 10px;" v-if="isSmart">{{power}} W</span>
-                        <img class="pointer" v-if="getDeviceDataValue(device,'状态')==='开'" @click="execApi(device.number,'/Socket/Off')" src="images/on.svg" />
-                        <img class="pointer" v-else="getDeviceDataValue(device,'状态')==='关'" @click="execApi(device.number,'/Socket/On')" src="images/off.svg" />
+                        <img class="pointer" v-if="getDeviceDataValue(device,'状态')==='开'"
+                            @click="execApi(device.number,'/Socket/Off')" src="images/on.svg" />
+                        <img class="pointer" v-else="getDeviceDataValue(device,'状态')==='关'"
+                            @click="execApi(device.number,'/Socket/On')" src="images/off.svg" />
                     </div>
                 </div>
+                <div class="col-7 align-self-center">
+                    <div class="row" style="height: 25px; line-height: 25px;"><span
+                            style="line-height:26px; margin-right: 10px;" v-if="isSmart">{{electricity}} kW‧h</span>
+                    </div>
+                    <div class="row" style="height: 25px; line-height: 20px;"> <span
+                            style="line-height:26px; margin-right: 10px;" v-if="isSmart">{{power}} W</span></div>
+                </div>
             </div>
         </div>
     </div>
diff --git a/projects/WebMVC/wwwroot/components/iot/switch.html b/projects/WebMVC/wwwroot/components/iot/switch.html
index a0a351c4..4e8498a4 100644
--- a/projects/WebMVC/wwwroot/components/iot/switch.html
+++ b/projects/WebMVC/wwwroot/components/iot/switch.html
@@ -6,7 +6,7 @@
             <span class="float-right text-danger" v-else><i class="ion ion-ios-wifi"></i></span>
         </div>
         <div class="card-body">
-            <div class="row" style="height:100%;width:300px;margin: 0 auto;">
+            <div class="row" style="height:100%;width:250px;margin: 0 auto;">
                 <div class="col-4 align-self-center">
                     <img class="mh-100" :src="device.product.image" style="width:48px;" />
                 </div>
diff --git a/projects/WebMVC/wwwroot/components/iot/switch3.html b/projects/WebMVC/wwwroot/components/iot/switch3.html
index 5411c948..1800afe3 100644
--- a/projects/WebMVC/wwwroot/components/iot/switch3.html
+++ b/projects/WebMVC/wwwroot/components/iot/switch3.html
@@ -6,7 +6,7 @@
             <span class="float-right text-danger" v-else><i class="ion ion-ios-wifi"></i></span>
         </div>
         <div class="card-body">
-            <div class="row" style="height:100%;width:300px;margin: 0 auto;">
+            <div class="row" style="height:100%;width:250px;margin: 0 auto;">
                 <div class="col-4 align-self-center">
                     <img class="mh-100" :src="device.product.image" style="width:48px;" />
                 </div>
diff --git a/projects/WebMVC/wwwroot/css/site.css b/projects/WebMVC/wwwroot/css/site.css
index 1acbdf96..6d8da282 100644
--- a/projects/WebMVC/wwwroot/css/site.css
+++ b/projects/WebMVC/wwwroot/css/site.css
@@ -30,3 +30,6 @@ img.pointer {
     height: 32px;
     width: 32px;
 }
+th{
+    white-space: nowrap;
+}
\ No newline at end of file
diff --git a/projects/WebMVC/wwwroot/js/config.js b/projects/WebMVC/wwwroot/js/config.js
index 9b578e32..2b2830b4 100644
--- a/projects/WebMVC/wwwroot/js/config.js
+++ b/projects/WebMVC/wwwroot/js/config.js
@@ -1,5 +1,5 @@
 var config = {
-    version: '1.0.0.20092901',
+    version: '1.0.0.20093001',
     debug: window.location.search.indexOf('debug') > -1,
     baseUrl: window.location.protocol + '//' + window.location.host,
     uploadUrl: window.location.protocol + '//' + window.location.host + '/IoTCenter/File/Upload',