diff --git a/projects/Demo/Demo/wwwroot/css/app.css b/projects/Demo/Demo/wwwroot/css/app.css
index 083e9d00..e8086b56 100644
--- a/projects/Demo/Demo/wwwroot/css/app.css
+++ b/projects/Demo/Demo/wwwroot/css/app.css
@@ -22,5 +22,5 @@
 }
 .col{
     text-align:center;
-    padding: 3px;
+    padding-top: 5px;
 }
\ No newline at end of file
diff --git a/projects/Demo/Demo/wwwroot/index.html b/projects/Demo/Demo/wwwroot/index.html
index 3fa0fa55..58dcb988 100644
--- a/projects/Demo/Demo/wwwroot/index.html
+++ b/projects/Demo/Demo/wwwroot/index.html
@@ -161,7 +161,9 @@
                 <div class="block block-strong">
                     <div class="row">
                         <div class="col-33 tablet-20 desktop-10" v-for="device in getDevices('检测器','监测器')">
-                            <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                            <div class="row">
+                                <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                            </div>
                             <div class="row" v-if="device.Name==='温湿度检测器'">
                                 <div class="col">{{getData(device,"温度")}}</div>
                                 <div class="col">{{getData(device,"湿度")}}</div>
@@ -175,6 +177,9 @@
                             <div class="row" v-else-if="device.Name==='粉尘检测器'">
                                 <div class="col">{{getData(device,"粉尘")}}</div>
                             </div>
+                            <div class="row" v-else>
+                                <div class="col">未定义</div>
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -184,7 +189,9 @@
                 <div class="block block-strong">
                     <div class="row">
                         <div class="col-33 tablet-20 desktop-10" v-for="device in getDevices('感应器')">
-                            <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                            <div class="row">
+                                <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                            </div>
                             <div class="row">
                                 <div class="col">{{getData(device,"状态")}}</div>
                             </div>
@@ -197,7 +204,9 @@
                 <div class="block block-strong">
                     <div class="row">
                         <div class="col-33 tablet-20 desktop-10" v-for="device in getDevices('主机')">
-                            <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                            <div class="row">
+                                <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                            </div>
                             <div class="row">
                                 <div class="col">{{getData(device,"计算机名")}}</div>
                             </div>
@@ -210,7 +219,9 @@
                 <div class="block block-strong">
                     <div class="row">
                         <div class="col-33 tablet-20 desktop-10" v-for="device in getDevices('AP')">
-                            <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                            <div class="row">
+                                <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                            </div>
                             <div class="row">
                                 <div class="col">{{getData(device,"连接数")}}</div>
                             </div>
@@ -223,7 +234,9 @@
                 <div class="block block-strong">
                     <div class="row">
                         <div class="col-33 tablet-20 desktop-10" v-for="device in getDevices('一路可调窗帘')">
-                            <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                            <div class="row">
+                                <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                            </div>
                             <div class="row">
                                 <div class="col">{{getData(device,"状态")}}</div>
                             </div>
@@ -252,7 +265,9 @@
                 <div class="block block-strong">
                     <div class="row">
                         <div class="col-33 tablet-20 desktop-10" v-for="device in getDevices('计量开关')">
-                            <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                            <div class="row">
+                                <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                            </div>
                             <template v-if="device.Name==='计量开关'">
                                 <div class="row">
                                     <a class="button button-raised button-fill" href="javascript: ;" v-on:click="call(device.Id,'21on')" v-if="getData(device,'状态')==='关'">开</a>
@@ -278,7 +293,9 @@
                 <div class="block block-strong">
                     <div class="row">
                         <div class="col-33 tablet-20 desktop-10" v-for="device in getDevices('一路照明开关')">
-                            <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                            <div class="row">
+                                <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                            </div>
                             <template v-if="device.Name==='一路照明开关'">
                                 <div class="row">
                                     <a class="button button-raised button-fill" href="javascript: ;" v-on:click="call(device.Id,'21on')" v-if="getData(device,'状态')==='关'">开</a>
@@ -304,7 +321,9 @@
                 <div class="block block-strong">
                     <div class="row">
                         <div class="col-33 tablet-20 desktop-10" v-for="device in getDevices('二路灯开关')">
-                            <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                            <div class="row">
+                                <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                            </div>
                             <template v-else-if="device.Name==='二路灯开关'">
                                 <div class="row">
                                     <a class="button button-raised button-fill" href="javascript: ;" v-on:click="call(device.Id,'21on')">全开</a>
@@ -338,7 +357,9 @@
                 <div class="block block-strong">
                     <div class="row">
                         <div class="col-33 tablet-20 desktop-10" v-for="device in getDevices('三路照明开关')">
-                            <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                            <div class="row">
+                                <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                            </div>
                             <template v-if="device.Name==='三路照明开关'">
                                 <div class="row">
                                     <a class="button button-raised button-fill" href="javascript: ;" v-on:click="call(device.Id,'21on')">全开</a>
@@ -367,6 +388,176 @@
                     </div>
                 </div>
             </template>
+            <template v-if="getDevices('墙面插座').length">
+                <div class="block-title">墙面插座</div>
+                <div class="block block-strong">
+                    <div class="row">
+                        <div class="col-33 tablet-20 desktop-10" v-for="device in getDevices('墙面插座')">
+                            <div class="row">
+                                <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                            </div>
+                            <template v-if="device.Name==='墙面插座'">
+                                <div class="row">
+                                    <a class="button button-raised button-fill" href="javascript: ;" v-on:click="call(device.Id,'21on')" v-if="getData(device,'状态')==='关'">开</a>
+                                    <a class="button button-raised button-fill" href="javascript: ;" v-on:click="call(device.Id,'22off')" v-else>关</a>
+                                </div>
+                            </template>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-33 tablet-20 desktop-10"></div>
+                        <div class="col-33 tablet-20 desktop-10"></div>
+                        <div class="col-33 tablet-20 desktop-10">
+                            <div class="row">
+                                <a class="button button-raised button-fill" href="javascript: ;" v-on:click="callAll('墙面插座','21on')">全开</a>
+                                <a class="button button-raised button-fill" href="javascript: ;" v-on:click="callAll('墙面插座','22off')">全关</a>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </template>
+            <template v-if="getDevices('一路插座').length">
+                <div class="block-title">一路插座</div>
+                <div class="block block-strong">
+                    <div class="row">
+                        <div class="col-33 tablet-20 desktop-10" v-for="device in getDevices('一路插座')">
+                            <div class="row">
+                                <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                            </div>
+                            <template v-if="device.Name==='一路插座'">
+                                <div class="row">
+                                    <a class="button button-raised button-fill" href="javascript: ;" v-on:click="call(device.Id,'21on')" v-if="getData(device,'状态')==='关'">开</a>
+                                    <a class="button button-raised button-fill" href="javascript: ;" v-on:click="call(device.Id,'22off')" v-else>关</a>
+                                </div>
+                            </template>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-33 tablet-20 desktop-10"></div>
+                        <div class="col-33 tablet-20 desktop-10"></div>
+                        <div class="col-33 tablet-20 desktop-10">
+                            <div class="row">
+                                <a class="button button-raised button-fill" href="javascript: ;" v-on:click="callAll('一路插座','21on')">全开</a>
+                                <a class="button button-raised button-fill" href="javascript: ;" v-on:click="callAll('一路插座','22off')">全关</a>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </template>
+            <template v-if="getDevices('二路插座').length">
+                <div class="block-title">二路插座</div>
+                <div class="block block-strong">
+                    <div class="row">
+                        <div class="col-33 tablet-20 desktop-10" v-for="device in getDevices('二路插座')">
+                            <div class="row">
+                                <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                            </div>
+                            <template v-if="device.Name==='二路插座'">
+                                <div class="row">
+                                    <a class="button button-raised button-fill" href="javascript: ;" v-on:click="call(device.Id,'21on')" v-if="getData(device,'状态')==='关'">开</a>
+                                    <a class="button button-raised button-fill" href="javascript: ;" v-on:click="call(device.Id,'22off')" v-else>关</a>
+                                </div>
+                            </template>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-33 tablet-20 desktop-10"></div>
+                        <div class="col-33 tablet-20 desktop-10"></div>
+                        <div class="col-33 tablet-20 desktop-10">
+                            <div class="row">
+                                <a class="button button-raised button-fill" href="javascript: ;" v-on:click="callAll('二路插座','21on')">全开</a>
+                                <a class="button button-raised button-fill" href="javascript: ;" v-on:click="callAll('二路插座','22off')">全关</a>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </template>
+            <template v-if="getDevices('密码门锁').length">
+                <div class="block-title">密码门锁</div>
+                <div class="block block-strong">
+                    <div class="row">
+                        <div class="col-33 tablet-20 desktop-10" v-for="device in getDevices('密码门锁')">
+                            <div class="row">
+                                <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                            </div>
+                            <template v-if="device.Name==='密码门锁'">
+                                <div class="row">
+                                    <a class="button button-raised button-fill" href="javascript: ;" v-on:click="call(device.Id,'21open')">开</a>
+                                </div>
+                            </template>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-33 tablet-20 desktop-10"></div>
+                        <div class="col-33 tablet-20 desktop-10"></div>
+                        <div class="col-33 tablet-20 desktop-10">
+                            <div class="row">
+                                <a class="button button-raised button-fill" href="javascript: ;" v-on:click="callAll('密码门锁','21open')">全开</a>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </template>
+            <template v-if="getDevices('红外转发器').length">
+                <div class="block-title">红外转发器</div>
+                <div class="block block-strong">
+                    <div class="row">
+                        <div class="col" v-for="device in getDevices('红外转发器')">
+                            <div class="row">
+                                <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                            </div>
+                            <div class="row">
+                                <template v-for="data in _.orderBy(device.Data,['DisplayOrder','Name'])">
+                                    <template v-if="data.Key==='code[]'">
+                                        <a v-for="key in JSON.parse(data.Value)" class="button button-raised button-fill" href="javascript: ;" v-on:click="call(device.Id,'22call','code='+key.value)">{{key.text}}</a>
+                                    </template>
+                                </template>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </template>
+            <template v-if="getDevices('串口控制器').length">
+                <div class="block-title">串口控制器</div>
+                <div class="block block-strong">
+                    <div class="row">
+                        <div class="col" v-for="device in getDevices('串口控制器')">
+                            <div class="row">
+                                <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                            </div>
+                            <div class="row">
+                                <template v-for="data in _.orderBy(device.Data,['DisplayOrder','Name'])">
+                                    <template v-if="data.Key==='code[]'">
+                                        <div class="col" v-for="(value, key, index) in _.chain(JSON.parse(data.Value)).groupBy(o => o.text.split('-')[0]).value()">
+                                            <div>{{key}}</div>
+                                            <div class="row">
+                                                <a v-for="btn in value" class="button button-raised button-fill" href="javascript: ;" v-on:click="call(device.Id,'send','code='+btn.value)">
+                                                    {{btn.text.indexOf('-')>0?btn.text.split('-')[1]:btn.text}}
+                                                </a>
+                                            </div>
+                                        </div>
+                                    </template>
+                                </template>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </template>
+            <template v-if="getDevices('摄像头').length">
+                <div class="block-title">摄像头</div>
+                <div class="block block-strong">
+                    <div class="row">
+                        <div class="col" v-for="device in getDevices('摄像头')">
+                            <div class="row">
+                                <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                            </div>
+                            <div class="row">
+                                <a class="button button-raised button-fill" href="javascript: ;" v-on:click="call(device.Id,'20shot')">截图</a>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </template>
         </f7-page>
     </template>
     <script src="lib/mobile.detect/mobile-detect.min.js"></script>