From 85a3581922cfff0691ed555b8611adbf863de307 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Fri, 1 Nov 2019 15:13:07 +0800
Subject: [PATCH] update

Former-commit-id: 14e367febee79a61cc463f44276585ca3e28eca2
---
 projects/IoTCenter/Views/Home/Node.cshtml |  55 +++++++++++-----------
 projects/IoTCenter/iotcenter.db           | Bin 462848 -> 462848 bytes
 projects/IoTNode/iotnode.db               | Bin 499712 -> 499712 bytes
 3 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/projects/IoTCenter/Views/Home/Node.cshtml b/projects/IoTCenter/Views/Home/Node.cshtml
index 7e4ccc03..7b68c6fd 100644
--- a/projects/IoTCenter/Views/Home/Node.cshtml
+++ b/projects/IoTCenter/Views/Home/Node.cshtml
@@ -109,32 +109,33 @@
 
         input[type='range'] {
             -webkit-appearance: none;
+            background: cadetblue;
             display: inline-block;
             width: 100%;
             height: 15px;
             margin: 10px 0;
         }
 
-        .hue {
-            background: -webkit-linear-gradient(left, #F00 0%, #FF0 16.66%, #0F0 33.33%, #0FF 50%,#00F 66.66%, #F0F 83.33%, #F00 100%);
-        }
+            input[type='range'].hue {
+                background: -webkit-linear-gradient(left, #F00 0%, #FF0 16.66%, #0F0 33.33%, #0FF 50%,#00F 66.66%, #F0F 83.33%, #F00 100%);
+            }
 
-        .saturation {
-            background: -webkit-linear-gradient(left, #fff 0%, green 100%);
-        }
+            input[type='range'].saturation {
+                background: -webkit-linear-gradient(left, #fff 0%, green 100%);
+            }
 
-        .brightness {
-            background: -webkit-linear-gradient(left, #000 0%, #fff 100%);
-        }
+            input[type='range'].brightness {
+                background: -webkit-linear-gradient(left, #000 0%, #fff 100%);
+            }
 
-        input[type='range']::-webkit-slider-thumb {
-            -webkit-appearance: none;
-            background-color: transparent;
-            height: 30px;
-            width: 30px;
-            border: 15px solid rgba(230,230,230,0.8);
-            border-radius: 50%;
-        }
+            input[type='range']::-webkit-slider-thumb {
+                -webkit-appearance: none;
+                background-color: transparent;
+                height: 30px;
+                width: 30px;
+                border: 15px solid rgba(230,230,230,0.8);
+                border-radius: 50%;
+            }
 
         canvas {
             width: 100%;
@@ -352,7 +353,7 @@
                                             <span class="label1">饱和度</span>
                                         </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="Saturation" class="saturation" :value="GetDataValue(device.Number,'饱和度')" />
+                                            <input v-on:change="AjaxSubmit($event,device.Number,'饱和度')" type="range" min="0" step="1" max="254" name="Saturation" class="saturation" :value="GetDataValue(device.Number,'饱和度')" />
                                         </div>
                                     </div>
                                 </form>
@@ -364,7 +365,7 @@
                                             <span class="label1">亮度</span>
                                         </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="Brightness" class="brightness" :value="GetDataValue(device.Number,'亮度')" />
+                                            <input v-on:change="AjaxSubmit($event,device.Number,'亮度')" type="range" min="0" step="1" max="254" name="Brightness" class="brightness" :value="GetDataValue(device.Number,'亮度')" />
                                         </div>
                                     </div>
                                 </form>
@@ -380,13 +381,13 @@
                         <div class="nav-tabs-custom">
                             <ul class="nav nav-tabs">
                                 <li class="header"><img src="/images/control.png" style="height:32px;margin-right:10px;" />{{device.DisplayName||device.Name}}</li>
-                                <li class="active"><a href="#tab_1" data-toggle="tab">空调</a></li>
-                                <li><a href="#tab_2" data-toggle="tab">电视</a></li>
-                                <li><a href="#tab_3" data-toggle="tab">图影仪</a></li>
-                                <li><a href="#tab_4" data-toggle="tab">自定义</a></li>
+                                <li class="active"><a :href="'#tab_1'+device.Number" data-toggle="tab">空调</a></li>
+                                <li><a :href="'#tab_2'+device.Number" data-toggle="tab">电视</a></li>
+                                <li><a :href="'#tab_3'+device.Number" data-toggle="tab">图影仪</a></li>
+                                <li><a :href="'#tab_4'+device.Number" data-toggle="tab">自定义</a></li>
                             </ul>
                             <div class="tab-content" style="min-height:176px;">
-                                <div class="tab-pane active" id="tab_1">
+                                <div class="tab-pane active" :id="'tab_1'+device.Number">
                                     <form class="device ir type1" method="get" action="/App/ExecApi">
                                         <input type="hidden" name="Number" :value="device.Number" />
                                         <input type="hidden" name="Method" value="/Ir/Send" />
@@ -438,7 +439,7 @@
                                         </div>
                                     </form>
                                 </div>
-                                <div class="tab-pane" id="tab_2">
+                                <div class="tab-pane" :id="'tab_2'+device.Number">
                                     <form class="device ir type2" method="get" action="/App/ExecApi">
                                         <input type="hidden" name="Number" :value="device.Number" />
                                         <input type="hidden" name="Method" value="/Ir/Send" />
@@ -496,7 +497,7 @@
                                         </div>
                                     </form>
                                 </div>
-                                <div class="tab-pane" id="tab_3">
+                                <div class="tab-pane" :id="'tab_3'+device.Number">
                                     <form class="device ir type3" method="get" action="/App/ExecApi">
                                         <input type="hidden" name="Number" :value="device.Number" />
                                         <input type="hidden" name="Method" value="/Ir/Send" />
@@ -554,7 +555,7 @@
                                         </div>
                                     </form>
                                 </div>
-                                <div class="tab-pane" id="tab_4">
+                                <div class="tab-pane" :id="'tab_4'+device.Number">
                                 </div>
                             </div>
                         </div>
diff --git a/projects/IoTCenter/iotcenter.db b/projects/IoTCenter/iotcenter.db
index 18eb81e7cfcb3624255c83b245016de0e3551dd9..4810ffc7df0904f0daaa1beb935957e64dc88912 100644
GIT binary patch
delta 305
zcmZozAkzRuEsQNpEzB(}Ev#GEv=ta<ZP!s?o6o^`Y5ExrwsY*+hCHDR;)2r`XtEhH
z8cctuz-F?YU5oAaRRt>sQ5HV|{%QQGd|TPR^4?|fV_n5^giVRhn`1ZIWcHk`O6*xI
zEGBw}7SkuNuonSYrpD7(^0J%ovdJ+NFvyBaG71ZGa7?#iWw&NA&@;1~UdhU?0^=GQ
zfw;yjY;5c)(-qj*ZCDL0L244&*o~&|U}ZOBG@AaNm0f%KS2lKYW<vv`>H6&K7OWf$
z%A%6fcW|)VG8q|8|IWd#Km8Uv`#CAGY)_y+6ous(85lS?LS2B|40o`|^k1Cprp$(>
k7Sj#5*mbt6akA?&v0Mcz1xsx2;by<d%xE?}jh}rM0JA+xrT_o{

delta 301
zcmZozAkzRuEsQNpEzB(}Ev#GEv=ta<Zr4#@o6o^`arzkzwsUNTJfRHY!qXROvKca&
zm`#7Dz-F?YU5oAaRfV+-qAY$w{L}bV`L?os<-N<|$7;oLgiVRhn|lxI4vrmLmDsab
zSd8_IOs7v^VJ~7a)iX7lzLJ;SWcn&rc54<xJ!9kPFIm}*dF0sS7`Pe41?3rq6Q@sR
zV>e?on|_LoU7HOICQVmhW4B>7GSD-$n4ZYSZp4<tkj$VgIz5zy-JBUH3Nl@RDKB^W
zS2m!4nSt4KeRg&WmQuJHV?D47Os3ytXFo3>ob3tplA^FYBLf2mN2ts69CmhFCKH3{
jtJ&H0x2tio>oPIsOyAGJZn3?GoBbv;qv`ZCe)d@aK%7bg

diff --git a/projects/IoTNode/iotnode.db b/projects/IoTNode/iotnode.db
index d58deb36874b36af4c1fcea591bcb5316cce35a0..ea41d1686a0a47105c57bc0ad4d210e4463fe2f5 100644
GIT binary patch
delta 407
zcmZoTAlCpyEsQNpEzB(}Ev#GEqDq(y61T^cuub9MwMb2|GynpZ#F9j#>58h%D%%xn
z*{niX%*+f7w#Q#&TgAa<X=-4ZWVoIG7Teb>4s#;|%amjT^X)vY>|eDwSywP9GHhk$
zpERATfL%$GVJq8Pwi-4;_AHibtd=bKEF8=WnXQ;EGvzR`FwSLw0HB_$(=*E1Ed&kp
z%q*Yn-2ZgfGLaw;)hB!VraNjei%(A}XSV^$85&{8sZ3WZWVdHA(KEEzo>|DA%RJqs
zl--=sXnIX4yY}>JCG2+GMusn!ZhSha2WaT@gllZ7oDA%#44I(}iu}{pm$I9(TRz#f
z4kkBUu#9~ftDz;(8PoTau@?XhHZ`7ZP|j|`2XZQFXhx$G4^XQxNUIr#sRgp$tL5yA
znGFq$rdL<6KjSsCG<iN{>&y0jk?imcNI*`iWdF~~$&lTs12jWiaQe)8c0)#k?Pu!Q
GO%wpl_k_#<

delta 318
zcmZoTAlCpyEsQNpEzB(}Ev#GEqDq)7jkd>>uub9MHA+meGynpZ#F9j#>58h%D%%xn
z*{niXOj8Yvw#Q#&TgAbamTX{|YP6mI7Teb>4ntD|OH)$=i|stF>|eDw85kH88Pyp0
zCr;-oU{{i3Phoq@R>LO9x}4R8<r+&q3kUN;W-F%4OgT&}jB_U|3f!5lR>*G8VytIm
zx;?XyJ(qd9WhuKIlZnCf%2IZ{>DNlw%^A(6^Odq|bEG#q@q{uc3Qpfp%5KVPX#8Z?
zy6N?$>>ASr%h;E(8X4#rT1?+l#$Lc;s%L68-JqP^Wct<ub{iH$J!9kP6ARc?rWed&
z<DGuBoP9B~nSt5#>I(K}yrz~W&!=pC+1@Xb9i9R4@1#oh|EwH2jXFTv#D%BNs%JN3
NGBMkJrk>qI0RT|DUlafU