From 86dfabb31fe97ee3fa27340dcc01739ad7d31757 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Sat, 21 Sep 2019 19:00:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=8A=82=E7=82=B9=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 609992ac434069267d21e54a241eda1a6bbfce78
---
 projects/IoTCenter/Views/Home/Node.cshtml    |  2 +
 projects/IoTCenter/wwwroot/node.default.html | 52 ++++++++++----------
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/projects/IoTCenter/Views/Home/Node.cshtml b/projects/IoTCenter/Views/Home/Node.cshtml
index 9c512072..b4b529e7 100644
--- a/projects/IoTCenter/Views/Home/Node.cshtml
+++ b/projects/IoTCenter/Views/Home/Node.cshtml
@@ -146,6 +146,8 @@
                             <i class="fa fa-bars"></i>
                         </button>
                     </div>
+                    <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
+                    </div>
                     <div class="navbar-custom-menu">
                         @if (User.Identity.IsAuthenticated)
                         {
diff --git a/projects/IoTCenter/wwwroot/node.default.html b/projects/IoTCenter/wwwroot/node.default.html
index 26be8f9f..26590393 100644
--- a/projects/IoTCenter/wwwroot/node.default.html
+++ b/projects/IoTCenter/wwwroot/node.default.html
@@ -50,31 +50,31 @@
     </div>
     <div class="col-md-6">
         <div class="row">
-            <div class="col-md-6">
-                <div class="row">
-                    <div class="box box-solid">
-                        <div class="col-md-4">
+            <div class="col-md-6  col-xs-6">
+                <div class="box box-solid">
+                    <div class="row">
+                        <div class="col-md-4 col-xs-4">
                             <img src="/images/temperature.png" style="width:48px;height:48px;margin:19px;" />
                         </div>
-                        <div class="col-md-4" style="height:86px;">
+                        <div class="col-md-4 col-xs-4" style="height:86px;">
                             <h3 style="line-height:86px;margin:0;">{{GetData('温湿度传感器',null,null,'温度','Description')}}</h3>
                         </div>
-                        <div class="col-md-4" style="height:86px;">
+                        <div class="col-md-4 col-xs-4" style="height:86px;">
                             <span style="display:inline-block;position:absolute;right:20px;bottom:5px;white-space: nowrap;">温度：{{GetData('温湿度传感器',null,null,'温度','Value')}}{{ GetData('温湿度传感器',null,null,'温度','Unit')}}</span>
                         </div>
                     </div>
                 </div>
             </div>
-            <div class="col-md-6">
+            <div class="col-md-6  col-xs-6">
                 <div class="box box-solid">
                     <div class="row">
-                        <div class="col-md-4">
+                        <div class="col-md-4 col-xs-4">
                             <img src="/images/humidity.png" style="width:48px;height:48px;margin:19px;" />
                         </div>
-                        <div class="col-md-4" style="height:86px;">
+                        <div class="col-md-4 col-xs-4" style="height:86px;">
                             <h3 style="line-height:86px;margin:0;">{{GetData('温湿度传感器',null,null,'湿度','Description')}}</h3>
                         </div>
-                        <div class="col-md-4" style="height:86px;">
+                        <div class="col-md-4 col-xs-4" style="height:86px;">
                             <span style="display:inline-block;position:absolute;right:20px;bottom:5px;white-space: nowrap;">湿度：{{GetData('温湿度传感器',null,null,'湿度','Value')}}{{ GetData('温湿度传感器',null,null,'温度','Unit')}}</span>
                         </div>
                     </div>
@@ -82,31 +82,31 @@
             </div>
         </div>
         <div class="row">
-            <div class="col-md-6">
+            <div class="col-md-6  col-xs-6">
                 <div class="box box-solid">
                     <div class="row">
-                        <div class="col-md-4">
+                        <div class="col-md-4 col-xs-4">
                             <img src="/images/light.png" style="width:48px;height:48px;margin:19px;" />
                         </div>
-                        <div class="col-md-4" style="height:86px;">
+                        <div class="col-md-4 col-xs-4" style="height:86px;">
                             <h3 style="line-height:86px;margin:0;">{{GetData('光强检测器',null,'前门','光照度','Description')}}</h3>
                         </div>
-                        <div class="col-md-4" style="height:86px;">
+                        <div class="col-md-4 col-xs-4" style="height:86px;">
                             <span style="display:inline-block;position:absolute;right:20px;bottom:5px;white-space: nowrap;">前门光照：{{GetData('光强检测器',null,'前门','光照度','Value')}}{{ GetData('光强检测器',null,'前门','光照度','Unit')}}</span>
                         </div>
                     </div>
                 </div>
             </div>
-            <div class="col-md-6">
+            <div class="col-md-6 col-xs-6">
                 <div class="box box-solid">
                     <div class="row">
-                        <div class="col-md-4">
+                        <div class="col-md-4 col-xs-4">
                             <img src="/images/light.png" style="width:48px;height:48px;margin:19px;" />
                         </div>
-                        <div class="col-md-4" style="height:86px;">
+                        <div class="col-md-4 col-xs-4" style="height:86px;">
                             <h3 style="line-height:86px;margin:0;">{{GetData('光强检测器',null,'后门','光照度','Description')}}</h3>
                         </div>
-                        <div class="col-md-4" style="height:86px;">
+                        <div class="col-md-4 col-xs-4" style="height:86px;">
                             <span style="display:inline-block;position:absolute;right:20px;bottom:5px;white-space: nowrap;">后门光照：{{GetData('光强检测器',null,'后门','光照度','Value') }}{{ GetData('光强检测器',null,'后门','光照度','Unit')}}</span>
                         </div>
                     </div>
@@ -114,31 +114,31 @@
             </div>
         </div>
         <div class="row">
-            <div class="col-md-6">
+            <div class="col-md-6 col-xs-6">
                 <div class="box box-solid">
                     <div class="row">
-                        <div class="col-md-4">
+                        <div class="col-md-4 col-xs-4">
                             <img src="/images/person.png" style="width:48px;height:48px;margin:19px;" />
                         </div>
-                        <div class="col-md-4" style="height:86px;">
+                        <div class="col-md-4 col-xs-4" style="height:86px;">
                             <img src="/images/warn.png" style="width:36px;height:36px;margin:32px 0 0 0;" v-if="GetData('红外感应器',null,'前门','状态','Value')==='警报'" />
                         </div>
-                        <div class="col-md-4" style="height:86px;">
+                        <div class="col-md-4 col-xs-4" style="height:86px;">
                             <span style="display:inline-block;position:absolute;right:20px;bottom:5px;white-space: nowrap;">前门人体：{{GetData('红外感应器',null,'前门','状态','Value') }}</span>
                         </div>
                     </div>
                 </div>
             </div>
-            <div class="col-md-6">
+            <div class="col-md-6 col-xs-6">
                 <div class="box box-solid">
                     <div class="row">
-                        <div class="col-md-4">
+                        <div class="col-md-4 col-xs-4">
                             <img src="/images/person.png" style="width:48px;height:48px;margin:19px;" />
                         </div>
-                        <div class="col-md-4" style="height:86px;">
+                        <div class="col-md-4 col-xs-4" style="height:86px;">
                             <img src="/images/warn.png" style="width:36px;height:36px;margin:32px 0 0 0;" v-if="GetData('红外感应器',null,'后门','状态','Value')==='警报'" />
                         </div>
-                        <div class="col-md-4" style="height:86px;">
+                        <div class="col-md-4 col-xs-4" style="height:86px;">
                             <span style="display:inline-block;position:absolute;right:20px;bottom:5px;white-space: nowrap;">后门人体：{{GetData('红外感应器',null,'后门','状态','Value') }}</span>
                         </div>
                     </div>