From 2b9f758e21b4825abaf7fd00eb031db1c806643b Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Fri, 1 Nov 2019 16:42:08 +0800
Subject: [PATCH] update

Former-commit-id: 44faa0b5380599a2b879d10b965bfb8192e0e553
---
 projects/IoTCenter/Views/Home/Node.cshtml | 115 +++++++++-------------
 projects/IoTCenter/iotcenter.db           | Bin 462848 -> 462848 bytes
 projects/IoTNode/iotnode.db               | Bin 499712 -> 499712 bytes
 3 files changed, 49 insertions(+), 66 deletions(-)

diff --git a/projects/IoTCenter/Views/Home/Node.cshtml b/projects/IoTCenter/Views/Home/Node.cshtml
index 7b68c6fd..d430684f 100644
--- a/projects/IoTCenter/Views/Home/Node.cshtml
+++ b/projects/IoTCenter/Views/Home/Node.cshtml
@@ -76,13 +76,6 @@
                 height: 53px;
             }
 
-        form .label1 {
-            display: inline-block;
-            padding-right: 5px;
-            line-height: 50px;
-            vertical-align: middle;
-        }
-
         .ir label input {
             display: none;
         }
@@ -143,7 +136,7 @@
         }
 
         .ir label {
-            margin: 5px 0;
+            margin-top: 5px;
         }
     </style>
     <template v-if="model">
@@ -159,6 +152,27 @@
                     </div>
                 </div>
             </div>
+            <!--批量操作-->
+            <div class="col-md-12" v-if="model.Scenes&&model.Scenes.length>0">
+                <div class="box box-solid">
+                    <div class="box-header with-border">
+                        <h3 class="box-title"><img src="/images/batch.png" />批量操作</h3>
+                        <div class="box-tools pull-right">
+                            <button class="btn btn-sm bg-olive ajax NodePowerOn" :data-node-number="model.Number">一键开</button>
+                            <button class="btn btn-sm bg-olive ajax NodePowerOff" :data-node-number="model.Number">一键关</button>
+                        </div>
+                    </div>
+                    <div class="box-body">
+                        <button class="btn bg-olive margin ajax SwitchOn">开灯</button>
+                        <button class="btn bg-olive margin ajax SwitchOff">关灯</button>
+                        <button class="btn bg-olive margin ajax SwitchOn">开关开</button>
+                        <button class="btn bg-olive margin ajax SwitchOff">开关关</button>
+                        <button class="btn bg-olive margin ajax SocketOn">插座开</button>
+                        <button class="btn bg-olive margin ajax SocketOff">插座关</button>
+                        <br />
+                    </div>
+                </div>
+            </div>
             <!--环境-->
             <!--温湿度传感器-->
             <template v-for="device in GetDevices('温湿度传感器')">
@@ -342,7 +356,7 @@
                                     <input type="hidden" name="Method" value="/ColorLight/SetColor" />
                                     <div class="row">
                                         <div class="col-md-2 col-xs-4">
-                                            <span class="label1">色调</span>
+                                            <label class="btn">色调</label>
                                         </div>
                                         <div class="col-md-10 col-xs-8">
                                             <input v-on:change="AjaxSubmit($event,device.Number,'色调')" type="range" min="0" step="1" max="255" name="Hue" class="hue" :value="GetDataValue(device.Number,'色调')" />
@@ -350,7 +364,7 @@
                                     </div>
                                     <div class="row">
                                         <div class="col-md-2 col-xs-4">
-                                            <span class="label1">饱和度</span>
+                                            <label class="btn">饱和度</label>
                                         </div>
                                         <div class="col-md-10 col-xs-8">
                                             <input v-on:change="AjaxSubmit($event,device.Number,'饱和度')" type="range" min="0" step="1" max="254" name="Saturation" class="saturation" :value="GetDataValue(device.Number,'饱和度')" />
@@ -362,7 +376,7 @@
                                     <input type="hidden" name="Method" value="/ColorLight/SetBrightness" />
                                     <div class="row">
                                         <div class="col-md-2 col-xs-4">
-                                            <span class="label1">亮度</span>
+                                            <label class="btn">亮度</label>
                                         </div>
                                         <div class="col-md-10 col-xs-8">
                                             <input v-on:change="AjaxSubmit($event,device.Number,'亮度')" type="range" min="0" step="1" max="254" name="Brightness" class="brightness" :value="GetDataValue(device.Number,'亮度')" />
@@ -394,47 +408,37 @@
                                         <input type="hidden" name="Type" value="1" />
                                         <input type="hidden" name="Code" :value="GetDataValue(device.Number,'按键')" />
                                         <div class="row">
-                                            <div class="col-md-2 col-xs-4"><lable style="line-height:40px;">电源</lable></div>
-                                            <div class="col-md-2 col-xs-8">
-                                                <div class="row" style="padding:5px 0">
-                                                    <label class="btn btn-sm bg-olive"><input v-on:click="SendCode1($event)" v-on:change="SendCode1($event)" name="power" type="radio" value="2" v-model="getCode1(GetDataValue(device.Number,'按键')).power" />开</label>
-                                                    <label class="btn btn-sm bg-olive"><input v-on:click="SendCode1($event)" v-on:change="SendCode1($event)" name="power" type="radio" value="1" v-model="getCode1(GetDataValue(device.Number,'按键')).power" />关</label>
-                                                </div>
-                                            </div>
-                                            <div class="col-md-2 col-xs-4"><lable style="line-height:40px;">模式</lable></div>
-                                            <div class="col-md-6 col-xs-8">
-                                                <div class="row" style="padding:5px 0">
-                                                    <label class="btn btn-sm bg-olive"><input v-on:click="SendCode1($event)" v-on:change="SendCode1($event)" name="pattern" type="radio" value="0" v-model="getCode1(GetDataValue(device.Number,'按键')).pattern" />制冷</label>
-                                                    <label class="btn btn-sm bg-olive"><input v-on:click="SendCode1($event)" v-on:change="SendCode1($event)" name="pattern" type="radio" value="120" v-model="getCode1(GetDataValue(device.Number,'按键')).pattern" />自动</label>
-                                                    <label class="btn btn-sm bg-olive"><input v-on:click="SendCode1($event)" v-on:change="SendCode1($event)" name="pattern" type="radio" value="240" v-model="getCode1(GetDataValue(device.Number,'按键')).pattern" />制热</label>
-                                                    <label class="btn btn-sm bg-olive"><input v-on:click="SendCode1($event)" v-on:change="SendCode1($event)" name="pattern" type="radio" value="360" v-model="getCode1(GetDataValue(device.Number,'按键')).pattern" />抽湿</label>
-                                                    <label class="btn btn-sm bg-olive"><input v-on:click="SendCode1($event)" v-on:change="SendCode1($event)" name="pattern" type="radio" value="480" v-model="getCode1(GetDataValue(device.Number,'按键')).pattern" />送风</label>
-                                                </div>
+                                            <div class="col-md-12">
+                                                <label class="btn">电源</label>
+                                                <label class="btn btn-sm bg-olive"><input v-on:click="SendCode1($event)" v-on:change="SendCode1($event)" name="power" type="radio" value="2" v-model="getCode1(GetDataValue(device.Number,'按键')).power" />开</label>
+                                                <label class="btn btn-sm bg-olive"><input v-on:click="SendCode1($event)" v-on:change="SendCode1($event)" name="power" type="radio" value="1" v-model="getCode1(GetDataValue(device.Number,'按键')).power" />关</label>
+                                                <label class="btn">模式</label>
+                                                <label class="btn btn-sm bg-olive"><input v-on:click="SendCode1($event)" v-on:change="SendCode1($event)" name="pattern" type="radio" value="0" v-model="getCode1(GetDataValue(device.Number,'按键')).pattern" />制冷</label>
+                                                <label class="btn btn-sm bg-olive"><input v-on:click="SendCode1($event)" v-on:change="SendCode1($event)" name="pattern" type="radio" value="120" v-model="getCode1(GetDataValue(device.Number,'按键')).pattern" />自动</label>
+                                                <label class="btn btn-sm bg-olive"><input v-on:click="SendCode1($event)" v-on:change="SendCode1($event)" name="pattern" type="radio" value="240" v-model="getCode1(GetDataValue(device.Number,'按键')).pattern" />制热</label>
+                                                <label class="btn btn-sm bg-olive"><input v-on:click="SendCode1($event)" v-on:change="SendCode1($event)" name="pattern" type="radio" value="360" v-model="getCode1(GetDataValue(device.Number,'按键')).pattern" />抽湿</label>
+                                                <label class="btn btn-sm bg-olive"><input v-on:click="SendCode1($event)" v-on:change="SendCode1($event)" name="pattern" type="radio" value="480" v-model="getCode1(GetDataValue(device.Number,'按键')).pattern" />送风</label>
                                             </div>
                                         </div>
                                         <div class="row">
-                                            <div class="col-md-2 col-xs-4"><span class="label1">温度</span></div>
-                                            <div class="col-md-10 col-xs-8">
+                                            <div class="col-md-2">
+                                                <span class="btn">温度</span>
+                                            </div>
+                                            <div class="col-md-10">
                                                 <input v-on:click="SendCode1($event)" v-on:change="SendCode1($event)" name="temperature" type="range" step="1" min="1" max="15" :value="getCode1(GetDataValue(device.Number,'按键')).temperature" />
                                             </div>
                                         </div>
                                         <div class="row">
-                                            <div class="col-md-2 col-xs-4"><lable style="line-height:40px;">风向</lable></div>
-                                            <div class="col-md-4 col-xs-8">
-                                                <div class="row" style="padding:5px 0">
-                                                    <label class="btn btn-sm bg-olive"><input v-on:click="SendCode1($event)" v-on:change="SendCode1($event)" name="direction" type="radio" value="0" v-model="getCode1(GetDataValue(device.Number,'按键')).direction" />任意</label>
-                                                    <label class="btn btn-sm bg-olive"><input v-on:click="SendCode1($event)" v-on:change="SendCode1($event)" name="direction" type="radio" value="60" v-model="getCode1(GetDataValue(device.Number,'按键')).direction" />手动</label>
-                                                    <label class="btn btn-sm bg-olive"><input v-on:click="SendCode1($event)" v-on:change="SendCode1($event)" name="direction" type="radio" value="75" v-model="getCode1(GetDataValue(device.Number,'按键')).direction" />自动</label>
-                                                </div>
-                                            </div>
-                                            <div class="col-md-2 col-xs-4"><lable style="line-height:40px;">风量</lable></div>
-                                            <div class="col-md-4 col-xs-8">
-                                                <div class="row" style="padding:5px 0">
-                                                    <label class="btn btn-sm bg-olive"><input v-on:click="SendCode1($event)" v-on:change="SendCode1($event)" name="wind" type="radio" value="0" v-model="getCode1(GetDataValue(device.Number,'按键')).wind" />自动</label>
-                                                    <label class="btn btn-sm bg-olive"><input v-on:click="SendCode1($event)" v-on:change="SendCode1($event)" name="wind" type="radio" value="15" v-model="getCode1(GetDataValue(device.Number,'按键')).wind" />高</label>
-                                                    <label class="btn btn-sm bg-olive"><input v-on:click="SendCode1($event)" v-on:change="SendCode1($event)" name="wind" type="radio" value="30" v-model="getCode1(GetDataValue(device.Number,'按键')).wind" />中</label>
-                                                    <label class="btn btn-sm bg-olive"><input v-on:click="SendCode1($event)" v-on:change="SendCode1($event)" name="wind" type="radio" value="45" v-model="getCode1(GetDataValue(device.Number,'按键')).wind" />低</label>
-                                                </div>
+                                            <div class="col-md-12">
+                                                <lable class="btn">风向</lable>
+                                                <label class="btn btn-sm bg-olive"><input v-on:click="SendCode1($event)" v-on:change="SendCode1($event)" name="direction" type="radio" value="0" v-model="getCode1(GetDataValue(device.Number,'按键')).direction" />任意</label>
+                                                <label class="btn btn-sm bg-olive"><input v-on:click="SendCode1($event)" v-on:change="SendCode1($event)" name="direction" type="radio" value="60" v-model="getCode1(GetDataValue(device.Number,'按键')).direction" />手动</label>
+                                                <label class="btn btn-sm bg-olive"><input v-on:click="SendCode1($event)" v-on:change="SendCode1($event)" name="direction" type="radio" value="75" v-model="getCode1(GetDataValue(device.Number,'按键')).direction" />自动</label>
+                                                <lable class="btn">风量</lable>
+                                                <label class="btn btn-sm bg-olive"><input v-on:click="SendCode1($event)" v-on:change="SendCode1($event)" name="wind" type="radio" value="0" v-model="getCode1(GetDataValue(device.Number,'按键')).wind" />自动</label>
+                                                <label class="btn btn-sm bg-olive"><input v-on:click="SendCode1($event)" v-on:change="SendCode1($event)" name="wind" type="radio" value="15" v-model="getCode1(GetDataValue(device.Number,'按键')).wind" />高</label>
+                                                <label class="btn btn-sm bg-olive"><input v-on:click="SendCode1($event)" v-on:change="SendCode1($event)" name="wind" type="radio" value="30" v-model="getCode1(GetDataValue(device.Number,'按键')).wind" />中</label>
+                                                <label class="btn btn-sm bg-olive"><input v-on:click="SendCode1($event)" v-on:change="SendCode1($event)" name="wind" type="radio" value="45" v-model="getCode1(GetDataValue(device.Number,'按键')).wind" />低</label>
                                             </div>
                                         </div>
                                     </form>
@@ -564,27 +568,6 @@
             </div>
         </div>
         <div class="row">
-            <!--批量操作-->
-            <div class="col-md-12" v-if="model.Scenes&&model.Scenes.length>0">
-                <div class="box box-solid">
-                    <div class="box-header with-border">
-                        <h3 class="box-title"><img src="/images/batch.png" />批量操作</h3>
-                        <div class="box-tools pull-right">
-                            <button class="btn btn-sm bg-olive ajax NodePowerOn" :data-node-number="model.Number">一键开</button>
-                            <button class="btn btn-sm bg-olive ajax NodePowerOff" :data-node-number="model.Number">一键关</button>
-                        </div>
-                    </div>
-                    <div class="box-body">
-                        <button class="btn bg-olive margin ajax SwitchOn">开灯</button>
-                        <button class="btn bg-olive margin ajax SwitchOff">关灯</button>
-                        <button class="btn bg-olive margin ajax SwitchOn">开关开</button>
-                        <button class="btn bg-olive margin ajax SwitchOff">开关关</button>
-                        <button class="btn bg-olive margin ajax SocketOn">插座开</button>
-                        <button class="btn bg-olive margin ajax SocketOff">插座关</button>
-                        <br />
-                    </div>
-                </div>
-            </div>
             <div class="col-md-3 col-xs-6 control" v-for="device in GetDevices('一路开关')" :data-device-number="device.Number">
                 <div class="box box-solid">
                     <div class="box-header with-border">
diff --git a/projects/IoTCenter/iotcenter.db b/projects/IoTCenter/iotcenter.db
index 4810ffc7df0904f0daaa1beb935957e64dc88912..626707f569f54aec4c02f65a250a538b2597bad5 100644
GIT binary patch
delta 161
zcmZozAkzRuEsQNpEzB(}Ev#GEv=ta<Z`V;^o6o^`dHNX*w)5;+hCHDR;{4MWYO)zH
z8clzvz-F?YU5oA4Rem-(22mD2A^vIns(f2nZMO=r*RZe{=^2?%pTNRi#B8KzIei5$
zyD1k?UA6<r5W(qx*w_u2jEtx2v$LB_U&YF9#cF7&XKpe5B`dor6WiD63T*6GSvZz5
MlyCpZ#?H<O030JKn*aa+

delta 167
zcmZozAkzRuEsQNpEzB(}Ev#GEv=ta<ZP!s?o6o^`Y5Exrw)1R;JfRHYg41^^uo*HM
zOn;}qX0n}Ki|yA{epV|6Q5HV|{%QQGd|TPRZWUm!VPP@RGqjjKfrY&Y$TBsazLJ;S
zgqKZ@p@2bFT#`{(n1f^bDpqzYRwDyFGt22OS=m+Kd_yA;-;{|xWx4_z`&E`42cFRF
JKiSyXIRO|mD@p(W

diff --git a/projects/IoTNode/iotnode.db b/projects/IoTNode/iotnode.db
index ea41d1686a0a47105c57bc0ad4d210e4463fe2f5..34ae7fe2d372a851a89dab36590517b4b0e2b38b 100644
GIT binary patch
delta 403
zcmZoTAlCpyEsQNpEzB(}Ev#GEqDvT!w#SsP{f}WXGT0t_k!=kJOInhF#dh9XY+q6p
znJgF-83P#kXYuRt9pQ^+TE%#T_cL!NuPo1I9xo;*#(?Qc4(#bHKxN0L_d2krfLQU<
zzdEo-a}+iT^Mo>}3r_#(z-}?U@)n!G^owU0Ri+<tWH0CE3T2Symu5_D6auP|7MwoO
zf!&D9$kHjXq$IVdk_)VI`zj~)C?>WfV*`t%#O++J?BBIK85n@>(O}@8%&*S3hfk4r
z0<R>`Y#w>;E^a=qD$f6$Q#h44HgY(#-(XK<`@mMosKLg^x|r30<q}Ia3k&mHW;3Sq
zOc_iJj58-I3f!AsQ^sDneQqJUCG&L4Que&**Gkxvr)QP3=S~+cW6zxawv64L#YoT6
za=Jk|yUFye1?<+WhL(Ef7Sksdu&Ycjn8n6BU9AwT#>jknW+70`)pGW1j_gKjps&OQ
mr+ZYe8!#CeZ?CRk7h~thYSaM<^G}~u&u#z=^)vPCCJF%XGITEh

delta 488
zcmZoTAlCpyEsQNpEzB(}Ev#GEqDvSPx5t#Q{f}WXGus|}k!=kJi>0Z7<#yg%Y+q6p
z8B-Y)89JHyXYuRt9pQ^+TE%#T_cL!NuPo1I9xsMYhL6*g9N5!YQW}MLruRCqr?3<>
z3iC|=>cAd7eS;&r$n*~m?ChM<{L+jJ3>=)H(*<X;t4zP^1QauHN-QZ!Evn?2o-l<?
zX8I9F_Hv%0PzHiZRk*okF%*X~sPn5cGHhSv#2&@OW^QC)nUcJn%a#4RRtW0~po_OM
z^H1Ve<=e$4&)df<&NGuomb-(ShpU3~FXtpq1&;L`4(wMM)fl$2y=ALm6J*a~xyEYA
zlF!1yypY+7=`vFe6AR;91_%I}cXj%gGIn!TBLh7%%jpK?KrehKW48wJ4UItj0u~cJ
zLyPH4%Gph}&n#rOWS;I&%AP#^QVDw=Cj)ybLuM$0BLDQ&rR=8cmQQxAd%A1c^n`0{
zs?+((*t4f=6tWjiuPkG?2O45(Jbh0Yy9pb}X4cT@i%Z#ar{5}P&*aEywB`wA5Eq{A
oUBPa^Y-nJ#y|#i~jGdDqyHN)uAvk?@J-Y#up~3bu_3S1J0N`bbg#Z8m