From 6c06b7867b00f62ffcabb6ef637a10debf67845e Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Fri, 22 Nov 2019 09:34:01 +0800
Subject: [PATCH] update

Former-commit-id: 84fb65af97d37bbcc00808b5ce59afd6d5601a18
---
 projects/IoTCenter/Views/Home/Device.cshtml   | 76 +++++++------------
 .../StreamingAssets/wwwroot/js/device.js      |  2 +-
 2 files changed, 27 insertions(+), 51 deletions(-)

diff --git a/projects/IoTCenter/Views/Home/Device.cshtml b/projects/IoTCenter/Views/Home/Device.cshtml
index d55359b3..5487b8a4 100644
--- a/projects/IoTCenter/Views/Home/Device.cshtml
+++ b/projects/IoTCenter/Views/Home/Device.cshtml
@@ -299,7 +299,7 @@
         <template v-else-if="model.Name==='红外转发器'">
             <div class="row">
                 <div class="col-md-12">
-                    <div class="card">
+                    <div class="card" style="min-height:176px;">
                         <div class="card-header" style="padding-bottom:0;">
                             <h3 class="card-title">
                                 <img src="/images/control.png" />
@@ -313,7 +313,7 @@
                             </ul>
                         </div>
                         <div class="card-body">
-                            <div class="tab-content" style="min-height:176px;">
+                            <div class="tab-content">
                                 <div class="tab-pane active" :id="'tab_1'+model.Number">
                                     <form class="ir type1" method="get" action="/App/ExecApi">
                                         <input type="hidden" name="Number" :value="model.Number" />
@@ -331,18 +331,6 @@
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="pattern" type="radio" value="240" v-model="getCode1(GetDataValue('按键')).pattern" />制热</label>
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="pattern" type="radio" value="360" v-model="getCode1(GetDataValue('按键')).pattern" />抽湿</label>
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="pattern" type="radio" value="480" v-model="getCode1(GetDataValue('按键')).pattern" />送风</label>
-                                            </div>
-                                        </div>
-                                        <div class="row">
-                                            <div class="col-md-2">
-                                                <span class="btn">温度</span>
-                                            </div>
-                                            <div class="col-md-10">
-                                                <input v-on:click="SendCode1($event)" name="temperature" type="range" step="1" min="1" max="15" :value="getCode1(GetDataValue('按键')).temperature" />
-                                            </div>
-                                        </div>
-                                        <div class="row">
-                                            <div class="col-md-12">
                                                 <lable class="btn">风向</lable>
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="direction" type="radio" value="0" v-model="getCode1(GetDataValue('按键')).direction" />任意</label>
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="direction" type="radio" value="60" v-model="getCode1(GetDataValue('按键')).direction" />手动</label>
@@ -354,6 +342,14 @@
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="wind" type="radio" value="45" v-model="getCode1(GetDataValue('按键')).wind" />低</label>
                                             </div>
                                         </div>
+                                        <div class="row">
+                                            <div class="col-md-3">
+                                                <span class="btn">温度:{{getCode1(GetDataValue('按键')).temperature+15}}℃</span>
+                                            </div>
+                                            <div class="col-md-9">
+                                                <input v-on:click="SendCode1($event)" name="temperature" type="range" step="1" min="1" max="15" :value="getCode1(GetDataValue('按键')).temperature" />
+                                            </div>
+                                        </div>
                                     </form>
                                 </div>
                                 <div class="tab-pane" :id="'tab_2'+model.Number">
@@ -375,10 +371,6 @@
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="Code" type="radio" value="10" />8</label>
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="Code" type="radio" value="11" />9</label>
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="Code" type="radio" value="12" />0</label>
-                                            </div>
-                                        </div>
-                                        <div class="row">
-                                            <div class="col-md-12 col-xs-12">
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="Code" type="radio" value="13" />返回</label>
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="Code" type="radio" value="14" />退出</label>
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="Code" type="radio" value="15" />静音</label>
@@ -389,20 +381,12 @@
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="Code" type="radio" value="20" />下</label>
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="Code" type="radio" value="21" />左</label>
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="Code" type="radio" value="22" />右</label>
-                                            </div>
-                                        </div>
-                                        <div class="row">
-                                            <div class="col-md-12 col-xs-12">
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="Code" type="radio" value="26" />快退</label>
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="Code" type="radio" value="27" />播放</label>
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="Code" type="radio" value="28" />快进</label>
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="Code" type="radio" value="29" />录像</label>
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="Code" type="radio" value="30" />暂停</label>
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="Code" type="radio" value="31" />停止</label>
-                                            </div>
-                                        </div>
-                                        <div class="row">
-                                            <div class="col-md-12 col-xs-12">
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="Code" type="radio" value="23" />OK</label>
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="Code" type="radio" value="24" />ch+</label>
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="Code" type="radio" value="25" />ch-</label>
@@ -433,10 +417,6 @@
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="Code" type="radio" value="10" />8</label>
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="Code" type="radio" value="11" />9</label>
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="Code" type="radio" value="12" />0</label>
-                                            </div>
-                                        </div>
-                                        <div class="row">
-                                            <div class="col-md-12 col-xs-12">
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="Code" type="radio" value="13" />CLEAR</label>
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="Code" type="radio" value="14" />退出</label>
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="Code" type="radio" value="15" />静音</label>
@@ -447,20 +427,12 @@
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="Code" type="radio" value="20" />下</label>
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="Code" type="radio" value="21" />左</label>
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="Code" type="radio" value="22" />右</label>
-                                            </div>
-                                        </div>
-                                        <div class="row">
-                                            <div class="col-md-12 col-xs-12">
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="Code" type="radio" value="26" />鼠标L</label>
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="Code" type="radio" value="27" />节能</label>
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="Code" type="radio" value="28" />鼠标R</label>
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="Code" type="radio" value="29" />局部放大+</label>
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="Code" type="radio" value="30" />局部放大-</label>
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="Code" type="radio" value="31" />冻结</label>
-                                            </div>
-                                        </div>
-                                        <div class="row">
-                                            <div class="col-md-12 col-xs-12">
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="Code" type="radio" value="23" />ENTER</label>
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="Code" type="radio" value="24" />page+</label>
                                                 <label class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="Code" type="radio" value="25" />page-</label>
@@ -479,7 +451,7 @@
                                         <input type="hidden" name="Type" value="5" />
                                         <div class="row">
                                             <div class="col-md-12 col-xs-12">
-                                                <label v-for="btn in GetButtons()" class="btn btn-sm btn-success"><input v-on:click="SendCode1($event)" name="Code" type="radio" :value="btn.Value" />{{btn.Key}}</label>
+                                                <label class="btn btn-sm btn-success" v-for="btn in GetButtons()"><input v-on:click="SendCode1($event)" name="Code" type="radio" :value="btn.Value" />{{btn.Key}}</label>
                                             </div>
                                         </div>
                                     </form>
@@ -494,21 +466,25 @@
                     <div class="card">
                         <div class="card-header">
                             <h3 class="card-title">自定义指令</h3>
+                            <div class="card-tools">
+                                <button class="btn btn-sm btn-success" v-on:click="AddButton()">添加</button>
+                                <button class="btn btn-sm btn-success" v-on:click="SaveButtons()">保存</button>
+                            </div>
                         </div>
-                        <div class="card-body">
-                            <div id="irbuttons">
-                                <div class="row button" v-for="btn in GetButtons()">
-                                    <label>按键名称：</label>
-                                    <input type="text" name="key" :value="btn.Key" v-on:change="UpdateButton($event,btn.key)" />
-                                    <label>按键编码：</label>
-                                    <input type="text" name="value" :value="btn.Value" v-on:change="UpdateButton($event,btn,key)" />
+                        <div class="card-body" id="irbuttons" v-if="GetButtons().length">
+                            <div class="row form-group irbtn" v-for="btn in GetButtons()">
+                                <label class="col-md-2 col-form-label">按键名称：</label>
+                                <div class="col-md-3">
+                                    <input class="form-control" type="text" name="key" :value="btn.Key" />
+                                </div>
+                                <label class="col-md-2 col-form-label">按键编码：</label>
+                                <div class="col-md-3">
+                                    <input class="form-control" type="text" name="value" :value="btn.Value" />
+                                </div>
+                                <div class="col-md-2">
                                     <button class="btn btn-sm btn-success" v-on:click="Study(btn.Value)">学习</button>
                                     <button class="btn btn-sm btn-success" v-on:click="RemoveButton(btn.Key)">移除</button>
                                 </div>
-                                <div class="row">
-                                    <button class="btn btn-sm btn-success" v-on:click="AddButton()">添加</button>
-                                    <button class="btn btn-sm btn-success" v-on:click="SaveButtons()">保存</button>
-                                </div>
                             </div>
                         </div>
                     </div>
diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/device.js b/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/device.js
index 7cefa513..61b4191a 100644
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/device.js
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/device.js
@@ -102,7 +102,7 @@ methods = {
     },
     SaveButtons() {
         var buttons = [];
-        $('#irbuttons').find('.button').each(function () {
+        $('#irbuttons').find('.irbtn').each(function () {
             buttons.push({
                 Key: $(this).find("input[name='key']").val(),
                 Value: $(this).find("input[name='value']").val()