From ce2e0ac3b0422d15fe31b832f2c9d70da424aa3f Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Thu, 31 Oct 2019 14:55:03 +0800
Subject: [PATCH] update

Former-commit-id: 315aa4734f793c161f881bc92383b9fddd13cddd
---
 projects/IoTCenter/Views/Home/Node.cshtml     |  24 +--
 projects/IoTCenter/iotcenter.db               | Bin 462848 -> 462848 bytes
 .../StreamingAssets/wwwroot/js/node.js.meta   |   7 +
 .../Assets/StreamingAssets/wwwroot/node.html  | 172 +++++++++++++-----
 projects/IoTNode/iotnode.db                   | Bin 499712 -> 499712 bytes
 5 files changed, 135 insertions(+), 68 deletions(-)
 create mode 100644 projects/IoTClient/Assets/StreamingAssets/wwwroot/js/node.js.meta

diff --git a/projects/IoTCenter/Views/Home/Node.cshtml b/projects/IoTCenter/Views/Home/Node.cshtml
index 6a6e9261..2ea0d90d 100644
--- a/projects/IoTCenter/Views/Home/Node.cshtml
+++ b/projects/IoTCenter/Views/Home/Node.cshtml
@@ -161,6 +161,7 @@
                 </div>
             </div>
             <!--环境-->
+            <!--温湿度传感器-->
             <template v-for="device in GetDevices('温湿度传感器')">
                 <div class="col-md-3  col-xs-6">
                     <div class="box box-solid">
@@ -197,7 +198,8 @@
                     </div>
                 </div>
             </template>
-            <template v-for="device in GetDevices('光强检测器')">
+            <!--粉尘检测器-->
+            <template v-for="device in GetDevices('粉尘检测器')">
                 <div class="col-md-3  col-xs-6">
                     <div class="box box-solid">
                         <div class="row">
@@ -215,24 +217,8 @@
                         </div>
                     </div>
                 </div>
-                <div class="col-md-3  col-xs-6">
-                    <div class="box box-solid">
-                        <div class="row">
-                            <div class="col-md-4 col-xs-4" style="text-align:center;">
-                                <img src="/images/pm25.png" style="max-width:48px;margin-top:19px;" />
-                            </div>
-                            <div class="col-md-8 col-xs-8" style="height:100px;">
-                                <h3 style="line-height:100px;margin:0;" :class="GetDeviceDataValue(device.Number,'PM10','Description')==='污染'?'danger':'normal'">
-                                    {{GetDeviceDataValue(device.Number,'PM10','Description')}}
-                                </h3>
-                            </div>
-                        </div>
-                        <div class="row">
-                            <span style="display:inline-block;position:absolute;right:20px;bottom:5px;white-space: nowrap;">PM10：{{GetDeviceDataValue(device.Number,'PM10','Value')}}{{ GetDeviceDataValue(device.Number,'PM10','Unit')}}</span>
-                        </div>
-                    </div>
-                </div>
             </template>
+            <!--光强检测器-->
             <div class="col-md-3  col-xs-6" v-for="device in GetDevices('光强检测器')" :data-device-number="device.Number">
                 <div class="box box-solid">
                     <div class="row">
@@ -250,6 +236,7 @@
                     </div>
                 </div>
             </div>
+            <!--红外感应器-->
             <div class="col-md-3 col-xs-6" v-for="device in GetDevices('红外感应器')" :data-device-number="device.Number">
                 <div class="box box-solid">
                     <div class="row">
@@ -266,6 +253,7 @@
                     </div>
                 </div>
             </div>
+            <!--烟雾感应器-->
             <div class="col-md-3 col-xs-6" v-for="device in GetDevices('烟雾传感器')" :data-device-number="device.Number">
                 <div class="box box-solid">
                     <div class="row">
diff --git a/projects/IoTCenter/iotcenter.db b/projects/IoTCenter/iotcenter.db
index 4e0b571a3349d24d783c67be367ef35f95abebe4..6961d24eabd0b71240f840db921b9ef270faf6c7 100644
GIT binary patch
delta 169
zcmZozAkzRuEsQNpEzB(}Ev#GE7!}w!PB6$a_DpA2U{hw|oHboXfvtlDD0XA|4h1%2
zCPS0$Zxz_?vNJJUntn!u?HqfyAx|iSxZw2N3Ty^UhNjcsDX^JrXV+pAy2i-1Rf_!t
zD~pMqvDx%ztn9f=hDOsv+1Lx1P4$eYpI~FR;N{G50P4<j1roC2)A`uhO_)vejJCV5
TvnR5#80#4uZ(qsF9?k>+n;R?a

delta 229
zcmZozAkzRuEsQNpEzB(}Ev#GE7!}wUl^A3hwoGSNU{huS(mD!k9qc)VJfRHY!qXRO
zvKcU$7;S&6z;>6NiP3)g84b2`9t^sol8g)t92}v>7AB5PuBJx1hDK)2x+aEhmbw-e
z29CPUE=EokriN}tuEr+L`8oMTA*s0qsYQt;rA4VGrUoW2IyXJrv2uE$CY$PZb}crc
zYmDq$rPxofvY6_b8&7}6%AU()W->jLjlF=`T+eX&2{v{MKCT=Gpri6~U4f*m=yYCo
bb`vHuz3ndS?1^kFCVEDO+gI|khcf{H^fo(*

diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/node.js.meta b/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/node.js.meta
new file mode 100644
index 00000000..8e667c80
--- /dev/null
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/node.js.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 86212a52db4fe8149a82b643fc08c9b1
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/node.html b/projects/IoTClient/Assets/StreamingAssets/wwwroot/node.html
index 313c2111..ab74cc66 100644
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/node.html
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/node.html
@@ -22,12 +22,131 @@
     <div id="app">
         <f7-app :params="$root.f7params">
             <f7-view main>
-                <f7-page page-content="false">
+                <f7-page>
                     <f7-navbar :title="model?model.Name:'节点'">
                         <a href="nodes.html" slot="nav-left" class="link external"><i class="icon icon-back"></i></a>
                     </f7-navbar>
-                    <div class="page-content" id="template">
+                    <div id="template">
                         <template v-if="model">
+                            <!--场景-->
+                            <div class="card">
+                                <div class="card-header">场景</div>
+                                <div class="card-content card-content-padding">
+                                    <div class="row">
+                                        <button class="col button button-large button-raised" v-for="scene in model.Scenes" :data-scene-id="scene.Id">{{scene.Name}}</button>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--环境-->
+                            <div class="row">
+                                <!--温湿度传感器-->
+                                <template class="row" v-for="device in GetDevices('温湿度传感器')">
+                                    <div class="col-50">
+                                        <div class="card">
+                                            <div class="card-content card-content-padding">
+                                                <div class="row">
+                                                    <div class="col-40" style="text-align:center;">
+                                                        <img :src="iotCenter+'/images/temperature.png'" style="max-width:48px;margin-top:19px;" />
+                                                    </div>
+                                                    <div class="col-60" style="height:100px;">
+                                                        <h3 style="line-height:100px;margin:0;" :class="GetDeviceDataValue(device.Number,'温度','Description')==='适中'?'normal':'danger'">
+                                                            {{GetDeviceDataValue(device.Number,'温度','Description')}}
+                                                        </h3>
+                                                    </div>
+                                                    <span style="display:inline-block;position:absolute;right:20px;bottom:5px;white-space: nowrap;">温度：{{GetDeviceDataValue(device.Number,'温度','Value')}}{{ GetDeviceDataValue(device.Number,'温度','Unit')}}</span>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="col-50">
+                                        <div class="card">
+                                            <div class="card-content card-content-padding">
+                                                <div class="row">
+                                                    <div class="col-40" style="text-align:center;">
+                                                        <img :src="iotCenter+'/images/humidity.png'" style="max-width:48px;margin-top:19px;" />
+                                                    </div>
+                                                    <div class="col-60" style="height:100px;">
+                                                        <h3 style="line-height:100px;margin:0;" :class="GetDeviceDataValue(device.Number,'湿度','Description')==='适中'?'normal':'danger'">
+                                                            {{GetDeviceDataValue(device.Number,'湿度','Description')}}
+                                                        </h3>
+                                                    </div>
+                                                    <span style="display:inline-block;position:absolute;right:20px;bottom:5px;white-space: nowrap;">湿度：{{GetDeviceDataValue(device.Number,'湿度','Value')}}{{ GetDeviceDataValue(device.Number,'温度','Unit')}}</span>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </template>
+                                <!--粉尘检测器-->
+                                <div class="col-50" v-for="device in GetDevices('粉尘检测器')">
+                                    <div class="card">
+                                        <div class="card-content card-content-padding">
+                                            <div class="row">
+                                                <div class="col-40" style="text-align:center;">
+                                                    <img :src="iotCenter+'/images/pm25.png'" style="max-width:48px;margin-top:19px;" />
+                                                </div>
+                                                <div class="col-60" style="height:100px;">
+                                                    <h3 style="line-height:100px;margin:0;" :class="GetDeviceDataValue(device.Number,'PM2.5','Description')==='污染'?'danger':'normal'">
+                                                        {{GetDeviceDataValue(device.Number,'PM2.5','Description')}}
+                                                    </h3>
+                                                </div>
+                                                <span style="display:inline-block;position:absolute;right:20px;bottom:5px;white-space: nowrap;">PM2.5：{{GetDeviceDataValue(device.Number,'PM2.5','Value')}}{{ GetDeviceDataValue(device.Number,'PM2.5','Unit')}}</span>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <!--光强检测器-->
+                                <div class="col-50" v-for="device in GetDevices('光强检测器')">
+                                    <div class="card">
+                                        <div class="card-content card-content-padding">
+                                            <div class="row">
+                                                <div class="col-40" style="text-align:center;">
+                                                    <img :src="iotCenter+'/images/light.png'" style="max-width:48px;margin-top:19px;" />
+                                                </div>
+                                                <div class="col-60" style="height:100px;">
+                                                    <h3 style="line-height:100px;margin:0;" :class="GetDeviceDataValue(device.Number,'光照度','Description')==='适中'?'normal':'danger'">
+                                                        {{GetDeviceDataValue(device.Number,'光照度','Description')}}
+                                                    </h3>
+                                                </div>
+                                                <span style="display:inline-block;position:absolute;right:20px;bottom:5px;white-space: nowrap;">光照 {{GetDeviceDataValue(device.Number,'光照度','Value')}}{{ GetDeviceDataValue(device.Number,'光照度','Unit')}}</span>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <!--红外感应器-->
+                                <div class="col-50" v-for="device in GetDevices('红外感应器')">
+                                    <div class="card">
+                                        <div class="card-content card-content-padding">
+                                            <div class="row">
+                                                <div class="col-40" style="text-align:center;">
+                                                    <img :src="iotCenter+'/images/person.png'" style="max-width:48px;margin-top:19px;" />
+                                                </div>
+                                                <div class="col-60" style="height:100px;">
+                                                    <img :src="iotCenter+'/images/warn.png'" style="width:36px;height:36px;margin:32px 0 0 0;" v-if="GetDeviceDataValue(device.Number,'状态','Value')==='警报'" />
+                                                    <h3 style="line-height:100px;margin:0;" class="normal" v-else>正常</h3>
+                                                </div>
+                                                <span style="display:inline-block;position:absolute;right:20px;bottom:5px;white-space: nowrap;">红外 {{GetDeviceDataValue(device.Number,'状态','Value') }}</span>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <!--烟雾感应器-->
+                                <div class="col-50" v-for="device in GetDevices('烟雾传感器')">
+                                    <div class="card">
+                                        <div class="card-content card-content-padding">
+                                            <div class="row">
+                                                <div class="col-40" style="text-align:center;">
+                                                    <img :src="iotCenter+'/images/smoke.png'" style="max-width:48px;margin-top:19px;" />
+                                                </div>
+                                                <div class="col-60" style="height:100px;">
+                                                    <img :src="iotCenter+'/images/warn.png'" style="width:36px;height:36px;margin:32px 0 0 0;" v-if="GetDeviceDataValue(device.Number,'状态','Value')==='警报'" />
+                                                    <h3 style="line-height:100px;margin:0;" class="normal" v-else>正常</h3>
+                                                </div>
+                                                <span style="display:inline-block;position:absolute;right:20px;bottom:5px;white-space: nowrap;">烟雾 {{GetDeviceDataValue(device.Number,'状态','Value') }}</span>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
                             <template v-if="HasDevices('摄像头')">
                                 <div class="card">
                                     <div class="card-header">
@@ -38,7 +157,7 @@
                                         </div>
                                     </div>
                                     <div class="card-content">
-                                        <div style="width:100%;height:186px;margin:0;padding:0;background:#000;text-align:center;">
+                                        <div style="width:100%;height:30vw;margin:0;padding:0;background:#000;text-align:center;">
                                             <video id="liveVideo" class="video" controls autoplay muted style="width:100%;max-width:100%;height:100%;" v-on:volumechange="VolumeChange($event)"></video>
                                         </div>
                                     </div>
@@ -72,53 +191,6 @@
                                     </div>
                                 </div>
                             </template>
-                            <template v-for="device in GetDevices('色暖灯')">
-                                <div class="row">
-                                    <div class="col-md-12">
-                                        <div class="box box-solid btns">
-                                            <div class="box-header with-border">
-                                                <h3 class="box-title">
-                                                    <img :src="server+'/IoTCenter/images/light2.png'" style="height:16px;margin-right:10px;" />{{device.DisplayName||device.Name}}<span :style="{
-                                                                                                                                                                      display:'inline-block',
-                                                                                                                                                                      color:'#eee',
-                                                                                                                                                                      backgroundColor:getLightColor(GetDataValue(device.Number,'色调'),GetDataValue(device.Number,'饱和度'),GetDataValue(device.Number,'亮度'))}">{{getLightColor(GetDataValue(device.Number,'色调'),GetDataValue(device.Number,'饱和度'),GetDataValue(device.Number,'亮度'))}}</span>
-                                                </h3>
-                                                <div class="box-tools pull-right">
-                                                    <img v-if="GetDataValue(device.Number,'状态')=='开'" @click="CallApi(device.Number,'/WarmLight/Off')" :src="server+'/IoTCenter/images/on.png'" />
-                                                    <img v-if="GetDataValue(device.Number,'状态')=='关'" @click="CallApi(device.Number,'/WarmLight/On')" :src="server+'/IoTCenter/images/off.png'" />
-                                                </div>
-                                            </div>
-                                            <div class="box-body" style="height:178px;">
-                                                <form method="get" action="/App/ExecApi">
-                                                    <input type="hidden" name="Number" :value="device.Number" />
-                                                    <input type="hidden" name="Method" value="/WarmLight/SetBrightness" />
-                                                    <div class="row">
-                                                        <div class="col-md-2 col-xs-4">
-                                                            <span class="label1">亮度</span>
-                                                        </div>
-                                                        <div class="col-md-10 col-xs-8">
-                                                            <input @change="AjaxSubmit($event,device.Number,'亮度')" type="range" min="0" step="1" max="255" name="Brightness" :value="GetDataValue(device.Number,'亮度')" />
-                                                        </div>
-                                                    </div>
-                                                </form>
-                                                <form method="get" action="/App/ExecApi">
-                                                    <input type="hidden" name="Number" :value="device.Number" />
-                                                    <input type="hidden" name="Method" value="/WarmLight/SetColor" />
-                                                    <input type="hidden" name="Saturation" :value="GetDataValue(device.Number,'饱和度')" />
-                                                    <div class="row">
-                                                        <div class="col-md-2 col-xs-4">
-                                                            <span class="label1">色调</span>
-                                                        </div>
-                                                        <div class="col-md-10 col-xs-8">
-                                                            <input @change="AjaxSubmit($event,device.Number,'色调')" type="range" min="0" step="1" max="255" name="Hue" :value="GetDataValue(device.Number,'色调')" />
-                                                        </div>
-                                                    </div>
-                                                </form>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </template>
                         </template>
                     </div>
                 </f7-page>
diff --git a/projects/IoTNode/iotnode.db b/projects/IoTNode/iotnode.db
index 9cacac9f59e68ad378f09cd222daacc9bd794ec9..58dd46b1916534ac815baa5c36dfe61fda08fa64 100644
GIT binary patch
delta 215
zcmZoTAlCpyEsQNpEzB(}Ev#GEqDoi{(hLl?$Ca@CjbSlQ1~TI>vaRA^voJBRG&kMO
ze~ayF7KdSqfn}<(f#r4{SN5-3oQz5giVPds_$N*0DqvS-p2V<mx={gp9VcU6qXSPU
zgRJ=Ug@x=U%qDt9)2|n@8*wl&FcgF`D2q<lEMzwa3Y$+)DP-51u2{%!&tjryYzE?*
zZ09UumtkcxG@7nn&R)oDs%JcXHju$$tY>VzU7&)!k)4wvyHN*dzPRA@nf2@jOopc0
K&(yP<C;$L&`a4+w

delta 253
zcmZoTAlCpyEsQNpEzB(}Ev#GEqDoj2Qw$8Z$Ca@CjbSmdFfiI4f01n!2b+PZL1IeE
zcK%yzU$Z#OO${t9%?%Q_^SH8q)#7AeU{GXKWaFPWovVOdm06K-=5(V1_PU7y9K1}N
z44I*<n;B9<8H9zW?=EH6<1{igdC|G)#fIkT3D?+EIZ7Jsc|sYK#iwf(vYWG*>X{o)
zzgoy{BEXQ_=m3<E6_sQZ7Utjxoz8fMO@-T|G&eIPv!v3<OmF&!0(PVAoJH(1tW0Jm
z)78t_3z^OJ45!ZqGFVLXj10F6RIoR)bL2GY0L>8>o<6Id-GJG|$a4FcdUg{903uvS
AKL7v#