From a280e9f9a05d1b38112ac1f8a8a65c66e4466f94 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Thu, 16 Jan 2020 12:26:41 +0800
Subject: [PATCH] update

Former-commit-id: 888cb78a580d4ff6e38196108d57200d3a3af386
---
 projects/WebApp/wwwroot/pages/iot/node.html | 130 +++++++++++++++++---
 1 file changed, 113 insertions(+), 17 deletions(-)

diff --git a/projects/WebApp/wwwroot/pages/iot/node.html b/projects/WebApp/wwwroot/pages/iot/node.html
index a1c95cef..80ad506b 100644
--- a/projects/WebApp/wwwroot/pages/iot/node.html
+++ b/projects/WebApp/wwwroot/pages/iot/node.html
@@ -10,7 +10,7 @@
             <div class="card">
                 <div class="card-header">场景</div>
                 <div class="card-body">
-                    <button class="btn btn-success mr-1" v-for="scene in scenes" v-on:click="CallScene(scene.Id)">{{scene.name}}</button>
+                    <button class="btn btn-success mr-4" v-for="scene in scenes" v-on:click="CallScene(scene.Id)">{{scene.name}}</button>
                 </div>
             </div>
         </div>
@@ -18,8 +18,40 @@
     <div class="col-md-12 py-2">环境</div>
     <!--环境-->
     <div class="row">
+        <!--光强检测器-->
+        <div class="col-lg-3 col-md-4 col-sm-6" v-for="device in getDevices('光强检测器')">
+            <div class="card mb-4">
+                <div class="card-header">
+                    {{device.displayName}}
+                    <span class="float-right text-success" v-if="device.isOnline"><i class="ion ion-ios-wifi"></i></span>
+                    <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:100px;">
+                        <div class="col-md-6 col-sm-6 text-center">
+                            <img class="mh-100" src="/IoTCenter/images/light.png" style="width:48px;" />
+                        </div>
+                        <div class="col-md-6 col-sm-6">
+                            <div class="row" style="line-height:28px;">
+                                <span>
+                                    光照度：
+                                    <span class="text-success" style="font-size:28px;" v-if="getDeviceDataAttr(device.number,'光照度','description')==='适中'">
+                                        {{getDeviceDataAttr(device.number,'光照度','description')}}
+                                    </span>
+                                    <span v-else class="text-danger mx-2" style="font-size:28px;">
+                                        {{getDeviceDataAttr(device.number,'光照度','description')}}
+                                    </span>
+                                    {{getDeviceDataAttr(device.number,'光照度','value')}}{{ getDeviceDataAttr(device.number,'光照度','unit')}}
+                                </span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <!--温湿度传感器-->
         <div class="col-lg-3 col-md-4 col-sm-6" v-for="device in getDevices('温湿度传感器')">
-            <div class="card">
+            <div class="card mb-4">
                 <div class="card-header">
                     {{device.displayName}}
                     <span class="float-right text-success" v-if="device.isOnline"><i class="ion ion-ios-wifi"></i></span>
@@ -27,29 +59,93 @@
                 </div>
                 <div class="card-body">
                     <div class="row" style="height:100px;">
-                        <div class="col-md-4 text-center">
+                        <div class="col-md-6 col-sm-6 text-center">
                             <img class="mh-100" src="/IoTCenter/images/humiture.png" />
                         </div>
-                        <div class="col-md-8">
+                        <div class="col-md-6 col-sm-6">
                             <div class="row" style="height:50px;line-height:28px;">
-                                <span>温度：</span>
-                                <span class="text-success mx-2" style="font-size:28px;" v-if="getDeviceDataAttr(device.number,'温度','description')==='适中'">
-                                    {{getDeviceDataAttr(device.number,'温度','description')}}
-                                </span>
-                                <span v-else class="text-danger" style="font-size:28px;">
-                                    {{getDeviceDataAttr(device.number,'温度','description')}}
+                                <span>
+                                    温度：
+                                    <span class="text-success mx-2" style="font-size:28px;" v-if="getDeviceDataAttr(device.number,'温度','description')==='适中'">
+                                        {{getDeviceDataAttr(device.number,'温度','description')}}
+                                    </span>
+                                    <span v-else class="text-danger" style="font-size:28px;">
+                                        {{getDeviceDataAttr(device.number,'温度','description')}}
+                                    </span>
+                                    {{getDeviceDataAttr(device.number,'温度','value')}}{{ getDeviceDataAttr(device.number,'温度','unit')}}
                                 </span>
-                                <span>{{getDeviceDataAttr(device.number,'温度','value')}}{{ getDeviceDataAttr(device.number,'温度','unit')}}</span>
                             </div>
                             <div class="row" style="height:50px;line-height:28px;">
-                                <span>湿度：</span>
-                                <span class="text-success" style="font-size:28px;" v-if="getDeviceDataAttr(device.number,'湿度','description')==='适中'">
-                                    {{getDeviceDataAttr(device.number,'湿度','description')}}
+                                <span>
+                                    湿度：
+                                    <span class="text-success" style="font-size:28px;" v-if="getDeviceDataAttr(device.number,'湿度','description')==='适中'">
+                                        {{getDeviceDataAttr(device.number,'湿度','description')}}
+                                    </span>
+                                    <span v-else class="text-danger mx-2" style="font-size:28px;">
+                                        {{getDeviceDataAttr(device.number,'湿度','description')}}
+                                    </span>
+                                    {{getDeviceDataAttr(device.number,'湿度','value')}}{{ getDeviceDataAttr(device.number,'湿度','unit')}}
+                                </span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <!--烟雾报警器-->
+        <div class="col-lg-3 col-md-4 col-sm-6" v-for="device in getDevices('烟雾报警器')">
+            <div class="card mb-4">
+                <div class="card-header">
+                    {{device.displayName}}
+                    <span class="float-right text-success" v-if="device.isOnline"><i class="ion ion-ios-wifi"></i></span>
+                    <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:100px;">
+                        <div class="col-md-6 col-sm-6 text-center">
+                            <img class="mh-100" src="/IoTCenter/images/smoke.png" style="width:48px;" />
+                        </div>
+                        <div class="col-md-6 col-sm-6">
+                            <div class="row" style="line-height:28px;">
+                                <span>
+                                    状态：
+                                    <span class="text-success" style="font-size:28px;" v-if="getDeviceDataAttr(device.number,'状态','value')==='正常'">
+                                        {{getDeviceDataAttr(device.number,'状态','value')}}
+                                    </span>
+                                    <span v-else class="text-danger mx-2" style="font-size:28px;">
+                                        {{getDeviceDataAttr(device.number,'状态','value')}}
+                                    </span>
                                 </span>
-                                <span v-else class="text-danger mx-2" style="font-size:28px;">
-                                    {{getDeviceDataAttr(device.number,'湿度','description')}}
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <!--人体感应器-->
+        <div class="col-lg-3 col-md-4 col-sm-6" v-for="device in getDevices('人体感应器')">
+            <div class="card mb-4">
+                <div class="card-header">
+                    {{device.displayName}}
+                    <span class="float-right text-success" v-if="device.isOnline"><i class="ion ion-ios-wifi"></i></span>
+                    <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:100px;">
+                        <div class="col-md-6 col-sm-6 text-center">
+                            <img class="mh-100" src="/IoTCenter/images/person.png" style="width:48px;" />
+                        </div>
+                        <div class="col-md-6 col-sm-6">
+                            <div class="row" style="line-height:28px;">
+                                <span>
+                                    状态：
+                                    <span class="text-success" style="font-size:28px;" v-if="getDeviceDataAttr(device.number,'状态','value')==='正常'">
+                                        {{getDeviceDataAttr(device.number,'状态','value')}}
+                                    </span>
+                                    <span v-else class="text-danger mx-2" style="font-size:28px;">
+                                        {{getDeviceDataAttr(device.number,'状态','value')}}
+                                    </span>
                                 </span>
-                                <span>{{getDeviceDataAttr(device.number,'湿度','value')}}{{ getDeviceDataAttr(device.number,'湿度','unit')}}</span>
                             </div>
                         </div>
                     </div>