From 589cff6a569d31a841df08ab5e0e5fc3b50bdcbd Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Fri, 22 Nov 2019 10:36:33 +0800
Subject: [PATCH] update

Former-commit-id: e251758cabeeb728cfde00025d36bab0a80ed143
---
 projects/IoTCenter/Views/Home/Node.cshtml              |  2 +-
 .../Assets/StreamingAssets/wwwroot/js/node.js          |  3 ++-
 .../IoTClient/Assets/StreamingAssets/wwwroot/node.html | 10 ++++------
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/projects/IoTCenter/Views/Home/Node.cshtml b/projects/IoTCenter/Views/Home/Node.cshtml
index 817e1654..1c6b7805 100644
--- a/projects/IoTCenter/Views/Home/Node.cshtml
+++ b/projects/IoTCenter/Views/Home/Node.cshtml
@@ -519,7 +519,7 @@
                                     </div>
                                     <div class="tab-pane" :id="'tab_4'+device.Number">
                                         <form class="ir type3" method="get" action="/App/ExecApi">
-                                            <input type="hidden" name="Number" :value="model.Number" />
+                                            <input type="hidden" name="Number" :value="device.Number" />
                                             <input type="hidden" name="Method" value="/Ir/Send" />
                                             <input type="hidden" name="Type" value="5" />
                                             <div class="row">
diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/node.js b/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/node.js
index d17f2598..d49ef0b7 100644
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/node.js
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/node.js
@@ -96,8 +96,9 @@ methods = {
                     code += parseInt(list[name]);
                 }
             }
-            url = new URI(url).setQuery('Code', code).toString()+"&token=" + token + "&connectionId=" + connectionId;
+            url = new URI(url).setQuery('Code', code).toString();
         }
+        url +="&token=" + token + "&connectionId=" + connectionId;
         form.find('#Code').val(code);
         Vue.nextTick(function () {
             ajax(url, null, 'get');
diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/node.html b/projects/IoTClient/Assets/StreamingAssets/wwwroot/node.html
index d87c3068..9244cd0a 100644
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/node.html
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/node.html
@@ -365,7 +365,7 @@
                                                 </div>
                                                 <div class="row">
                                                     <div class="col-20 row">
-                                                        <label class="btn">温度</label>
+                                                        <label class="btn">温度:{{getCode1(GetDataValue(device.Number,'按键')).temperature+15}}℃</label>
                                                     </div>
                                                     <div class="col-80">
                                                         <input v-on:click="SendCode1($event)" name="temperature" type="range" step="1" min="1" max="15" :value="getCode1(GetDataValue(device.Number,'按键')).temperature" />
@@ -485,14 +485,12 @@
                                             </form>
                                         </f7-tab>
                                         <f7-tab class="block block-strong" :id="'tab_4'+device.Number">
-                                            <form class="ir type3" method="get" action="/App/ExecApi">
-                                                <input type="hidden" name="Number" :value="model.Number" />
+                                            <form class="device ir type4" method="get" action="/App/ExecApi">
+                                                <input type="hidden" name="Number" :value="device.Number" />
                                                 <input type="hidden" name="Method" value="/Ir/Send" />
                                                 <input type="hidden" name="Type" value="5" />
                                                 <div class="row">
-                                                    <div class="col-md-12 col-xs-12">
-                                                        <label class="button button-raised" v-for="btn in GetButtons(device.Number)"><input v-on:click="SendCode1($event)" name="Code" type="radio" :value="btn.Value" />{{btn.Name}}</label>
-                                                    </div>
+                                                    <label class="button button-raised" v-for="btn in GetButtons(device.Number)"><input v-on:click="SendCode1($event)" name="Code" type="radio" :value="btn.Value" />{{btn.Name}}</label>
                                                 </div>
                                             </form>
                                         </f7-tab>