From 20ab89394f6f478f0bf2945fef81ec0f8f5fe590 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Sat, 20 Jul 2019 09:33:56 +0800
Subject: [PATCH] update

Former-commit-id: 4c4574688ef25a690dc64041ec7013d5fc74b1b2
---
 .../StreamingAssets/wwwroot/css/app.css       |  52 +++++++++++++++---
 .../Assets/StreamingAssets/wwwroot/index.html |  38 ++++++-------
 .../Assets/StreamingAssets/wwwroot/js/app.js  | Bin 55730 -> 55744 bytes
 3 files changed, 64 insertions(+), 26 deletions(-)

diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/css/app.css b/projects/IoTClient/Assets/StreamingAssets/wwwroot/css/app.css
index c68b722b..c1152a16 100644
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/css/app.css
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/css/app.css
@@ -64,14 +64,52 @@ img.shot.zoom {
 .device-desktop.with-modal-dialog .page-content {
     overflow: auto;
 }
-/*html5 input rang style*/
-input[type='range']{
+form{
     width:100%;
 }
-input[type='range']::-webkit-slider-thumb {
-    border: 15px solid #fff;
-    border-radius: 15px;
+label.button input {
+    display: none;
 }
-form{
+input[type=range].ajax{
     width:100%;
-}
\ No newline at end of file
+    height:34px;
+}
+input.ajax{
+    margin:5px 0;
+}
+form.device label{
+    display:inline-block;
+    height:34px;
+    line-height:34px;
+    vertical-align:middle;
+}
+/*html5 input rang style*/
+input[type=range] {
+    -webkit-appearance: none;
+}
+
+    input[type=range]::-webkit-slider-runnable-track {
+        width: 300px;
+        height: 5px;
+        background: #ddd;
+        border: none;
+        border-radius: 3px;
+    }
+
+    input[type=range]::-webkit-slider-thumb {
+        -webkit-appearance: none;
+        border: none;
+        height: 16px;
+        width: 16px;
+        border-radius: 50%;
+        background-color:Highlight;
+        margin-top: -5px;
+    }
+
+    input[type=range]:focus {
+        outline: none;
+    }
+
+        input[type=range]:focus::-webkit-slider-runnable-track {
+            background: #ccc;
+        }
diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/index.html b/projects/IoTClient/Assets/StreamingAssets/wwwroot/index.html
index 9e62527b..b71a2cda 100644
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/index.html
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/index.html
@@ -571,7 +571,7 @@
                                 <a class="button button-large button-raised button-fill" href="javascript: ;" v-on:click="call(device.GatewayNumber,device.Number,'/Ir/KeyCodeType1Off')" v-else>禁用空调</a>
                             </div>
                             <div class="row" v-if="getData(device,'空调')==='开'">
-                                <form class="KeyCodeType1" method="get" :action="vm.IoTServer+'/App/Exec'">
+                                <form class="device KeyCodeType1" method="get" :action="vm.IoTServer+'/App/Exec'">
                                     <input type="hidden" name="ConnectionId" :value="vm.ConnectionId" />
                                     <input type="hidden" name="Gateway" :value="device.GatewayNumber" />
                                     <input type="hidden" name="Number" :value="device.Number" />
@@ -582,21 +582,21 @@
                                         <div class="col-20">
                                             <label>电源：</label>
                                         </div>
-                                        <div class="col-80">
-                                            <label><input class="ajax" name="power" type="radio" value="2" v-model="getCode1(getValue(device,'按键')).power" />开</label>
-                                            <label><input class="ajax" name="power" type="radio" value="1" v-model="getCode1(getValue(device,'按键')).power" />关</label>
+                                        <div class="col-80 row">
+                                            <label class="button button-raised button-round"><input class="ajax" name="power" type="radio" value="2" v-model="getCode1(getValue(device,'按键')).power" />开</label>
+                                            <label class="button button-raised button-round"><input class="ajax" name="power" type="radio" value="1" v-model="getCode1(getValue(device,'按键')).power" />关</label>
                                         </div>
                                     </div>
                                     <div class="row">
                                         <div class="col-20">
                                             <label>模式：</label>
                                         </div>
-                                        <div class="col-80">
-                                            <label><input class="ajax" name="pattern" type="radio" v-model="getCode1(getValue(device,'按键')).pattern" value="0" />制冷</label>
-                                            <label><input class="ajax" name="pattern" type="radio" v-model="getCode1(getValue(device,'按键')).pattern" value="120" />自动</label>
-                                            <label><input class="ajax" name="pattern" type="radio" v-model="getCode1(getValue(device,'按键')).pattern" value="240" />制热</label>
-                                            <label><input class="ajax" name="pattern" type="radio" v-model="getCode1(getValue(device,'按键')).pattern" value="360" />抽湿</label>
-                                            <label><input class="ajax" name="pattern" type="radio" v-model="getCode1(getValue(device,'按键')).pattern" value="480" />送风</label>
+                                        <div class="col-80 row">
+                                            <label class="button button-raised button-round"><input class="ajax" name="pattern" type="radio" v-model="getCode1(getValue(device,'按键')).pattern" value="0" />制冷</label>
+                                            <label class="button button-raised button-round"><input class="ajax" name="pattern" type="radio" v-model="getCode1(getValue(device,'按键')).pattern" value="120" />自动</label>
+                                            <label class="button button-raised button-round"><input class="ajax" name="pattern" type="radio" v-model="getCode1(getValue(device,'按键')).pattern" value="240" />制热</label>
+                                            <label class="button button-raised button-round"><input class="ajax" name="pattern" type="radio" v-model="getCode1(getValue(device,'按键')).pattern" value="360" />抽湿</label>
+                                            <label class="button button-raised button-round"><input class="ajax" name="pattern" type="radio" v-model="getCode1(getValue(device,'按键')).pattern" value="480" />送风</label>
                                         </div>
                                     </div>
                                     <div class="row">
@@ -611,21 +611,21 @@
                                         <div class="col-20">
                                             <label>风向：</label>
                                         </div>
-                                        <div class="col-80">
-                                            <label><input name="direction" type="radio" v-model="getCode1(getValue(device,'按键')).direction" value="0" class="ajax" />任意</label>
-                                            <label><input name="direction" type="radio" v-model="getCode1(getValue(device,'按键')).direction" value="60" class="ajax" />手动</label>
-                                            <label><input name="direction" type="radio" v-model="getCode1(getValue(device,'按键')).direction" value="75" class="ajax" />自动</label>
+                                        <div class="col-80 row">
+                                            <label class="button button-raised button-round"><input name="direction" type="radio" v-model="getCode1(getValue(device,'按键')).direction" value="0" class="ajax" />任意</label>
+                                            <label class="button button-raised button-round"><input name="direction" type="radio" v-model="getCode1(getValue(device,'按键')).direction" value="60" class="ajax" />手动</label>
+                                            <label class="button button-raised button-round"><input name="direction" type="radio" v-model="getCode1(getValue(device,'按键')).direction" value="75" class="ajax" />自动</label>
                                         </div>
                                     </div>
                                     <div class="row">
                                         <div class="col-20">
                                             <label>风量：</label>
                                         </div>
-                                        <div class="col-80">
-                                            <label><input class="ajax" name="wind" type="radio" v-model="getCode1(getValue(device,'按键')).wind" value="0" />自动</label>
-                                            <label><input class="ajax" name="wind" type="radio" v-model="getCode1(getValue(device,'按键')).wind" value="15" />高</label>
-                                            <label><input class="ajax" name="wind" type="radio" v-model="getCode1(getValue(device,'按键')).wind" value="30" />中</label>
-                                            <label><input class="ajax" name="wind" type="radio" v-model="getCode1(getValue(device,'按键')).wind" value="45" />低</label>
+                                        <div class="col-80 row">
+                                            <label class="button button-raised button-round"><input class="ajax" name="wind" type="radio" v-model="getCode1(getValue(device,'按键')).wind" value="0" />自动</label>
+                                            <label class="button button-raised button-round"><input class="ajax" name="wind" type="radio" v-model="getCode1(getValue(device,'按键')).wind" value="15" />高</label>
+                                            <label class="button button-raised button-round"><input class="ajax" name="wind" type="radio" v-model="getCode1(getValue(device,'按键')).wind" value="30" />中</label>
+                                            <label class="button button-raised button-round"><input class="ajax" name="wind" type="radio" v-model="getCode1(getValue(device,'按键')).wind" value="45" />低</label>
                                         </div>
                                     </div>
                                 </form>
diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/app.js b/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/app.js
index 5b50c11d9c714bef998d4cc1b382133d9b91718f..03bc13098d6c4c3f887ebe10a3ef0d4b383defb3 100644
GIT binary patch
delta 63
zcmV-F0KosUvjf1h1F%4ZlYWgLlVF4-0Wp*Dhc&ahggyn6l8F+Nm~S4F5Qr89GypXK
VE0ZCHEt8&12$L|32D5OALQg<u7$X1x

delta 55
zcmV-70LcHqvjeiT1F%4ZlL&+;lW2q-lls>nlMsj&v$}*n1(TADIFrDJ1OqexHIrcv
NE0e%~3bT5OMo*lq7PbHY