From b3f9604d1fffe289d9c5166f645a51a03607f8f7 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Mon, 3 Feb 2020 21:22:09 +0800
Subject: [PATCH] update

Former-commit-id: a6c4d73bab4992dcc5550d1ae551e186c214402c
---
 projects/WebApp/wwwroot/css/app.css           |   6 +-
 .../wwwroot/pages/iot/device/camera.html      |  28 ++-
 .../WebApp/wwwroot/pages/iot/device/ir.html   | 181 ++++++++++--------
 projects/WebApp/wwwroot/pages/iot/node.html   |   6 +
 4 files changed, 131 insertions(+), 90 deletions(-)

diff --git a/projects/WebApp/wwwroot/css/app.css b/projects/WebApp/wwwroot/css/app.css
index 30e967b2..42d923ab 100644
--- a/projects/WebApp/wwwroot/css/app.css
+++ b/projects/WebApp/wwwroot/css/app.css
@@ -767,14 +767,14 @@ img {
 
 .ir table {
     border-collapse: separate;
-    margin: 5px auto;
-    padding: 5px;
+    margin: 8px auto;
+    padding: 4px;
     border: 2px solid #ddd;
     border-radius: 15px;
 }
 
     .ir table td {
-        padding: 2px;
+        padding: 1px;
         text-align: center;
     }
 
diff --git a/projects/WebApp/wwwroot/pages/iot/device/camera.html b/projects/WebApp/wwwroot/pages/iot/device/camera.html
index beebb1bb..3d73eead 100644
--- a/projects/WebApp/wwwroot/pages/iot/device/camera.html
+++ b/projects/WebApp/wwwroot/pages/iot/device/camera.html
@@ -1,5 +1,5 @@
 <template>
-    <div class="card" style="box-sizing:border-box;height:510px;margin:10px;">
+    <div class="card" style="box-sizing:border-box;height:450px;margin:10px;">
         <div class="card-header">
             {{device.displayName}}
         </div>
@@ -8,8 +8,30 @@
                 <video :class="device.number" v-if="flvjs.isSupported()"></video>
                 <canvas :class="device.number" v-else></canvas>
             </div>
-            <div v-if="ptz" :class="'row ptz '+ device.number" style="width:320px;height:100px;margin:0 auto;" >
-                ptz
+            <div v-if="ptz" :class="'row ptz '+ device.number" style="width:320px;height:140px;margin:0 auto;" >
+                <table class="ptz" style="width:100%;height:100%;">
+                    <tr>
+                        <td></td>
+                        <td></td>
+                        <td><img v-onclick="execApi(device.number,'/Camera/Up')" src="/IoTCenter/images/up.png" /></td>
+                        <td></td>
+                        <td></td>
+                    </tr>
+                    <tr>
+                        <td><img v-onclick="execApi(device.number,'/Camera/Zoomin')" src="/IoTCenter/images/zoomin.png" /></td>
+                        <td><img v-onclick="execApi(device.number,'/Camera/Left')"   src="/IoTCenter/images/left.png" /></td>
+                        <td><img v-onclick="execApi(device.number,'/Camera/Stop')"   src="/IoTCenter/images/stop.png" /></td>
+                        <td><img v-onclick="execApi(device.number,'/Camera/Right')"  src="/IoTCenter/images/right.png" /></td>
+                        <td><img v-onclick="execApi(device.number,'/Camera/Zoomout')" src="/IoTCenter/images/zoomout.png" /></td>
+                    </tr>
+                    <tr>
+                        <td></td>
+                        <td></td>
+                        <td><img v-onclick="execApi(device.number,'/Camera/Down')" src="/IoTCenter/images/down.png" /></td>
+                        <td></td>
+                        <td></td>
+                    </tr>
+                </table>
             </div>
         </div>
     </div>
diff --git a/projects/WebApp/wwwroot/pages/iot/device/ir.html b/projects/WebApp/wwwroot/pages/iot/device/ir.html
index c27ba215..0c0ca772 100644
--- a/projects/WebApp/wwwroot/pages/iot/device/ir.html
+++ b/projects/WebApp/wwwroot/pages/iot/device/ir.html
@@ -1,5 +1,5 @@
 <template>
-    <div class="card" style="box-sizing:border-box;height:600px;margin:10px;">
+    <div class="card" style="box-sizing:border-box;height:550px;margin:10px;">
         <div class="card-header">
             {{device.displayName}}
             <span class="float-right text-success" v-if="device.isOnline"><i class="ion ion-ios-wifi"></i></span>
@@ -26,41 +26,41 @@
                         <table>
                             <tr>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" :value="power.value" v-on:click="changePower($event)">电源</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" :value="power.value" v-on:click="changePower($event.target.value)">电源</button>
                                 </td>
                                 <td></td>
                                 <td>{{power.name}}</td>
                             </tr>
                             <tr>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" :value="pattern.value" v-on:click="changePattern($event)">模式</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" :value="pattern.value" v-on:click="changePattern($event.target.value)">模式</button>
                                 </td>
                                 <td></td>
                                 <td>{{pattern.name}}</td>
                             </tr>
                             <tr>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" :value="wind.value" v-on:click="changeWind($event)">风速</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" :value="wind.value" v-on:click="changeWind($event.target.value)">风速</button>
                                 </td>
                                 <td></td>
                                 <td>{{wind.name}}</td>
                             </tr>
                             <tr>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" :value="direction.value" v-on:click="changeDirection($event)">风向</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" :value="direction.value" v-on:click="changeDirection($event.target.value)">风向</button>
                                 </td>
                                 <td></td>
                                 <td>{{direction.name}}</td>
                             </tr>
                             <tr>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" :value="temperature.value" v-on:click="changeTemperature($event,-1)">-</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" :value="temperature.value" v-on:click="changeTemperature($event.target.value,-1)">-</button>
                                 </td>
                                 <td>
                                     {{temperature.name}}
                                 </td>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" :value="temperature.value" v-on:click="changeTemperature($event,1)">+</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" :value="temperature.value" v-on:click="changeTemperature($event.target.value,1)">+</button>
                                 </td>
                             </tr>
                         </table>
@@ -69,57 +69,57 @@
                         <table>
                             <tr>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="1" v-on:click="tv($event)">电源</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="1" v-on:click="send($event.target.value,2)">电源</button>
                                 </td>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="2" v-on:click="tv($event)">AV</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="2" v-on:click="send($event.target.value,2)">AV</button>
                                 </td>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="15" v-on:click="tv($event)">静音</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="15" v-on:click="send($event.target.value,2)">静音</button>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="1" v-on:click="tv($event)">1</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="1" v-on:click="send($event.target.value,2)">1</button>
                                 </td>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="2" v-on:click="tv($event)">2</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="2" v-on:click="send($event.target.value,2)">2</button>
                                 </td>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="3" v-on:click="tv($event)">3</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="3" v-on:click="send($event.target.value,2)">3</button>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="4" v-on:click="tv($event)">4</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="4" v-on:click="send($event.target.value,2)">4</button>
                                 </td>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="5" v-on:click="tv($event)">5</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="5" v-on:click="send($event.target.value,2)">5</button>
                                 </td>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="6" v-on:click="tv($event)">6</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="6" v-on:click="send($event.target.value,2)">6</button>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="7" v-on:click="tv($event)">7</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="7" v-on:click="send($event.target.value,2)">7</button>
                                 </td>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="8" v-on:click="tv($event)">8</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="8" v-on:click="send($event.target.value,2)">8</button>
                                 </td>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="9" v-on:click="tv($event)">9</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="9" v-on:click="send($event.target.value,2)">9</button>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="13" v-on:click="tv($event)">返回</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="13" v-on:click="send($event.target.value,2)">返回</button>
                                 </td>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="0" v-on:click="tv($event)">0</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="0" v-on:click="send($event.target.value,2)">0</button>
                                 </td>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="14" v-on:click="tv($event)">退出</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="14" v-on:click="send($event.target.value,2)">退出</button>
                                 </td>
 
                             </tr>
@@ -127,27 +127,27 @@
                                 <td>
                                 </td>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="19" v-on:click="tv($event)">上</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="19" v-on:click="send($event.target.value,2)">上</button>
                                 </td>
                                 <td>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="21" v-on:click="tv($event)">左</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="21" v-on:click="send($event.target.value,2)">左</button>
                                 </td>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="23" v-on:click="tv($event)">OK</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="23" v-on:click="send($event.target.value,2)">OK</button>
                                 </td>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="22" v-on:click="tv($event)">右</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="22" v-on:click="send($event.target.value,2)">右</button>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
                                 </td>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="8" v-on:click="tv($event)">下</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="8" v-on:click="send($event.target.value,2)">下</button>
                                 </td>
                                 <td>
                                 </td>
@@ -155,12 +155,12 @@
 
                             <tr>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="17" v-on:click="tv($event)">+</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="17" v-on:click="send($event.target.value,2)">+</button>
                                 </td>
                                 <td>
                                 </td>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="24" v-on:click="tv($event)">↑</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="24" v-on:click="send($event.target.value,2)">↑</button>
                                 </td>
                             </tr>
                             <tr>
@@ -168,7 +168,7 @@
                                     音量
                                 </td>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="16" v-on:click="tv($event)">菜单</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="16" v-on:click="send($event.target.value,2)">菜单</button>
                                 </td>
                                 <td>
                                     频道
@@ -176,23 +176,23 @@
                             </tr>
                             <tr>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="18" v-on:click="tv($event)">-</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="18" v-on:click="send($event.target.value,2)">-</button>
                                 </td>
                                 <td>
                                 </td>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="25" v-on:click="tv($event)">↓</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="25" v-on:click="send($event.target.value,2)">↓</button>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="26" v-on:click="tv($event)">快退</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="26" v-on:click="send($event.target.value,2)">快退</button>
                                 </td>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="28" v-on:click="tv($event)">播放</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="28" v-on:click="send($event.target.value,2)">播放</button>
                                 </td>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="28" v-on:click="tv($event)">快进</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="28" v-on:click="send($event.target.value,2)">快进</button>
                                 </td>
                             </tr>
                         </table>
@@ -201,82 +201,82 @@
                         <table>
                             <tr>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="1" v-on:click="tv($event)">电源</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="1" v-on:click="send($event.target.value,3)">电源</button>
                                 </td>
                                 <td></td>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="15" v-on:click="tv($event)">静音</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="15" v-on:click="send($event.target.value,3)">静音</button>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="1" v-on:click="tv($event)">1</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="1" v-on:click="send($event.target.value,3)">1</button>
                                 </td>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="2" v-on:click="tv($event)">2</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="2" v-on:click="send($event.target.value,3)">2</button>
                                 </td>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="3" v-on:click="tv($event)">3</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="3" v-on:click="send($event.target.value,3)">3</button>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="4" v-on:click="tv($event)">4</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="4" v-on:click="send($event.target.value,3)">4</button>
                                 </td>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="5" v-on:click="tv($event)">5</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="5" v-on:click="send($event.target.value,3)">5</button>
                                 </td>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="6" v-on:click="tv($event)">6</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="6" v-on:click="send($event.target.value,3)">6</button>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="7" v-on:click="tv($event)">7</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="7" v-on:click="send($event.target.value,3)">7</button>
                                 </td>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="8" v-on:click="tv($event)">8</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="8" v-on:click="send($event.target.value,3)">8</button>
                                 </td>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="9" v-on:click="tv($event)">9</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="9" v-on:click="send($event.target.value,3)">9</button>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="13" v-on:click="tv($event)">返回</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="13" v-on:click="send($event.target.value,3)">返回</button>
                                 </td>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="0" v-on:click="tv($event)">0</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="0" v-on:click="send($event.target.value,3)">0</button>
                                 </td>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="14" v-on:click="tv($event)">退出</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="14" v-on:click="send($event.target.value,3)">退出</button>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
                                 </td>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="19" v-on:click="tv($event)">上</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="19" v-on:click="send($event.target.value,3)">上</button>
                                 </td>
                                 <td>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="21" v-on:click="tv($event)">左</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="21" v-on:click="send($event.target.value,3)">左</button>
                                 </td>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="23" v-on:click="tv($event)">OK</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="23" v-on:click="send($event.target.value,3)">OK</button>
                                 </td>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="22" v-on:click="tv($event)">右</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="22" v-on:click="send($event.target.value,3)">右</button>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
                                 </td>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="8" v-on:click="tv($event)">下</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="8" v-on:click="send($event.target.value,3)">下</button>
                                 </td>
                                 <td>
                                 </td>
@@ -284,12 +284,12 @@
 
                             <tr>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="17" v-on:click="tv($event)">+</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="17" v-on:click="send($event.target.value,3)">+</button>
                                 </td>
                                 <td>
                                 </td>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="24" v-on:click="tv($event)">↑</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="24" v-on:click="send($event.target.value,3)">↑</button>
                                 </td>
                             </tr>
                             <tr>
@@ -297,7 +297,7 @@
                                     音量
                                 </td>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="16" v-on:click="tv($event)">菜单</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="16" v-on:click="send($event.target.value,3)">菜单</button>
                                 </td>
                                 <td>
                                     频道
@@ -305,29 +305,31 @@
                             </tr>
                             <tr>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="18" v-on:click="tv($event)">-</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="18" v-on:click="send($event.target.value,3)">-</button>
                                 </td>
                                 <td>
                                 </td>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="25" v-on:click="tv($event)">↓</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="25" v-on:click="send($event.target.value,3)">↓</button>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="26" v-on:click="tv($event)">快退</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="26" v-on:click="send($event.target.value,3)">快退</button>
                                 </td>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="28" v-on:click="tv($event)">播放</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="28" v-on:click="send($event.target.value,3)">播放</button>
                                 </td>
                                 <td>
-                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="28" v-on:click="tv($event)">快进</button>
+                                    <button type="button" class="weui-btn weui-btn_mini weui-btn_default" value="28" v-on:click="send($event.target.value,3)">快进</button>
                                 </td>
                             </tr>
                         </table>
                     </div>
                     <div class="weui-tab__content">
-                        <button type="button" class="weui-btn weui-btn_mini weui-btn_default m-2">btn</button>
+                        <div class="button-sp-area cell" style="width:100%;height:450px;overflow:auto;">
+                            <button v-for="button in getCustomButtons()" type="button" class="weui-btn weui-btn_mini weui-btn_default px-2 m-2" :value="button.value" v-on:click="send($event.target.value,5)">{{button.name}}</button>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -341,28 +343,30 @@
             weui.tab('.weui-tab');
         },
         methods: {
-            changePattern: function (e) {
-                this.change(e, 0, 480, 120);
+            changePattern: function (v) {
+                this.change(v, 0, 480, 120);
             },
-            changeDirection(e) {
-                this.change(e, 0, 60, 60);
+            changeDirection(v) {
+                this.change(v, 0, 60, 60);
             },
-            changeWind(e) {
-                this.change(e, 0, 45, 15);
+            changeWind(v) {
+                this.change(v, 0, 45, 15);
             },
-            changePower: function (e) {
-                var oldValue = parseInt(e.target.value);
+            changePower: function (v) {
+                var oldValue = parseInt(v);
                 if (oldValue === 1) {
                     getData(this.device, '按键').value = 3;
+                    this.send(3, 1);
                 }
                 else if (oldValue === 2) {
                     getData(this.device, '按键').value = 1;
+                    this.send(1, 1);
                 }
             },
-            changeTemperature: function (e, step) {
+            changeTemperature: function (v, step) {
+                var oldValue = parseInt(v);
                 var min = 1;
                 var max = 15;
-                var oldValue = parseInt(e.target.value);
                 var newValue = oldValue + step;
                 if (step > 0 && newValue > max) {
                     newValue = max;
@@ -370,18 +374,27 @@
                 else if (step < 0 && newValue < min) {
                     newValue = min;
                 }
-                getData(this.device, '按键').value = this.code - oldValue + newValue;
+                var newCode = this.code - oldValue + newValue;
+                getData(this.device, '按键').value = newCode;
+                this.send(newCode, 1);
             },
-            change: function (e, min, max, step) {
-                var oldValue = parseInt(e.target.value);
+            change: function (v, min, max, step) {
+                var oldValue = parseInt(v);
                 var newValue = oldValue + step;
                 if (newValue > max) {
                     newValue = min;
                 }
-                getData(this.device, '按键').value = this.code - oldValue + newValue;
+                var newCode = this.code - oldValue + newValue;
+                getData(this.device, '按键').value = newCode;
+                this.send(newCode, 1);
             },
-            tv: function (e) {
-                alert(e.target.value);
+            send: function (value, type) {
+                execApi(this.device.number, '/Ir/Send', 'type=' + type + '&code=' + value);
+            },
+            getCustomButtons: function () {
+                return Enumerable.from(JSON.parse(getDeviceDataValue(this.device, "指令")))
+                    .orderBy(function (o) { return o.order; })
+                    .toArray();
             }
         },
         computed: {
@@ -391,16 +404,16 @@
             pattern: function () {
                 var code = this.code;
                 var pattern = { name: '制冷', value: 0 };
-                if (code > 480+2) {
+                if (code > 480 + 2) {
                     pattern = { name: '通风', value: 480 };
                 }
-                else if (code > 360+2) {
+                else if (code > 360 + 2) {
                     pattern = { name: '抽湿', value: 360 };
                 }
-                else if (code > 240+2) {
+                else if (code > 240 + 2) {
                     pattern = { name: '制热', value: 240 };
                 }
-                else if (code > 120+2) {
+                else if (code > 120 + 2) {
                     pattern = { name: '自动', value: 120 };
                 }
                 return pattern;
@@ -439,7 +452,7 @@
                 var code = this.code - this.pattern.value - this.direction.value - this.wind.value - this.power.value;
                 var temperature = { name: '16℃', value: 1 };
                 if (code > 1) {
-                    temperature = { name: parseInt(code+15) + '℃', value: code };
+                    temperature = { name: parseInt(code + 15) + '℃', value: code };
                 }
                 return temperature;
             }
diff --git a/projects/WebApp/wwwroot/pages/iot/node.html b/projects/WebApp/wwwroot/pages/iot/node.html
index 0e287bc0..d70bd9b4 100644
--- a/projects/WebApp/wwwroot/pages/iot/node.html
+++ b/projects/WebApp/wwwroot/pages/iot/node.html
@@ -58,6 +58,12 @@
             <iot-ir v-bind:device="device"></iot-ir>
         </div>
     </div>
+    <!--红外转发器-->
+    <div class="row">
+        <div v-for="device in getDevices('摄像头')" class="col" style="min-width:320px;">
+            <iot-camera v-bind:device="device"></iot-camera>
+        </div>
+    </div>
     <!--test-->
     <!--<hr />
     <div class="row" v-if="node">