update

Former-commit-id: 696ec3f32820460dbe93e79224102a89661d19fc

projects/IoTCenter/Controllers/AppController.cs

@@ -224,13 +224,25 @@ namespace IoTCenter.Controllers
 
         public IActionResult AllSwitchOn(string connectionId, string[] nodes)
         {
-            this.Power(connectionId, nodes, "On", o => o.Name.Contains("开关"));
+            this.Power(connectionId, nodes, "On", o => o.Name.Contains("一路开关"));
             return Json(ApiResponse.AsyncSuccess());
         }
 
         public IActionResult AllSwitchOff(string connectionId, string[] nodes)
         {
-            this.Power(connectionId, nodes, "Off", o => o.Name.Contains("开关"));
+            this.Power(connectionId, nodes, "Off", o => o.Name.Contains("一路开关"));
+            return Json(ApiResponse.AsyncSuccess());
+        }
+
+        public IActionResult AllSwitch3On(string connectionId, string[] nodes)
+        {
+            this.Power(connectionId, nodes, "On", o => o.Name.Contains("三路开关"));
+            return Json(ApiResponse.AsyncSuccess());
+        }
+
+        public IActionResult AllSwitch3Off(string connectionId, string[] nodes)
+        {
+            this.Power(connectionId, nodes, "Off", o => o.Name.Contains("三路开关"));
             return Json(ApiResponse.AsyncSuccess());
         }
 

projects/IoTCenter/wwwroot/home.default.html

@@ -31,31 +31,41 @@
     </div>
 </div>
 <div class="row" v-if="ViewModel">
-    <div class="col-md-4">
+    <!--<div class="col-md-4">
         <select class="form-control select search">
             <option value="">选择教室</option>
             <option v-for="node in ViewModel.Nodes" value="node.Number">{{node.Name}}</option>
         </select>
-    </div>
+    </div>-->
-    <div class="col-md-2">
+    <div class="col-md-12">
-    </div>
+        <table class="table">
-    <div class="col-md-1">
+            <tr>
-        <button class="btn btn-block btn-primary ajax AllPowerOn">一键开</button>
+                <td>
-    </div>
+                    <button class="btn btn-olive btn-primary ajax AllPowerOn">一键开</button>
-    <div class="col-md-1">
+                </td>
-        <button class="btn btn-block btn-primary ajax AllPowerOff">一键关</button>
+                <td>
-    </div>
+                    <button class="btn btn-olive btn-primary ajax AllPowerOff">一键关</button>
-    <div class="col-md-1">
+                </td>
-        <button class="btn btn-block btn-primary ajax AllSwitchOn">开关开</button>
+                <td>
-    </div>
+                    <button class="btn btn-olive btn-primary ajax AllSwitchOn">一路开关开</button>
-    <div class="col-md-1">
+                </td>
-        <button class="btn btn-block btn-primary ajax AllSwitchOff">开关关</button>
+                <td>
-    </div>
+                    <button class="btn btn-olive btn-primary ajax AllSwitchOff">一路开关关</button>
-    <div class="col-md-1">
+                </td>
-        <button class="btn btn-block btn-primary ajax AllSocketOn">插座开</button>
+                <td>
-    </div>
+                    <button class="btn btn-olive btn-primary ajax AllSwitch3On">三路开关开</button>
-    <div class="col-md-1">
+                </td>
-        <button class="btn btn-block btn-primary ajax AllSocketOff">插座关</button>
+                <td>
+                    <button class="btn btn-olive btn-primary ajax AllSwitch3Off">三路开关关</button>
+                </td>
+                <td>
+                    <button class="btn btn-olive btn-primary ajax AllSocketOn">插座开</button>
+                </td>
+                <td>
+                    <button class="btn btn-olive btn-primary ajax AllSocketOff">插座关</button>
+                </td>
+            </tr>
+        </table>
     </div>
 </div>
 
@@ -212,6 +222,10 @@
             ajax('/App/AllSwitchOn', { nodes: data }, 'post');
         } else if ($(this).hasClass('AllSwitchOff')) {
             ajax('/App/AllSwitchOff', { nodes: data }, 'post');
+        } else if ($(this).hasClass('AllSwitch3On')) {
+            ajax('/App/AllSwitch3On', { nodes: data }, 'post');
+        } else if ($(this).hasClass('AllSwitch3Off')) {
+            ajax('/App/AllSwitch3Off', { nodes: data }, 'post');
         } else if ($(this).hasClass('AllSocketOn')) {
             ajax('/App/AllSocketOn', { nodes: data }, 'post');
         } else if ($(this).hasClass('AllSocketOff')) {

projects/IoTCenter/wwwroot/node.default.html

@@ -1,4 +1,6 @@
-<h2 class="page-header" v-if="ViewModel">{{ViewModel.Name}}</h2>
+<div v-if="ViewModel" class="callout callout-info">
+    <h4>{{ViewModel.Name}}</h4>
+</div>
 <hr />
 <div class="row" v-if="ViewModel">
     <div class="col-md-6">
@@ -208,8 +210,8 @@
         <div class="box box-solid btns">
             <div class="row">
                 <div class="col-md-4"><span style="display:inline-block;line-height:70px;">三路开关:</span></div>
-                <div class="col-md-4"><button class="btn btn-block btn-primary ajax NodeSwitchOn" :data-node-number="ViewModel.Number">一键开</button></div>
+                <div class="col-md-4"><button class="btn btn-block btn-primary ajax NodeSwitch3On" :data-node-number="ViewModel.Number">一键开</button></div>
-                <div class="col-md-4"><button class="btn btn-block btn-primary ajax NodeSwitchOff" :data-node-number="ViewModel.Number">一键关</button></div>
+                <div class="col-md-4"><button class="btn btn-block btn-primary ajax NodeSwitch3Off" :data-node-number="ViewModel.Number">一键关</button></div>
             </div>
             <hr style="margin: 0;" />
             <div class="row">
@@ -331,6 +333,7 @@
                 vm.ViewModel.Devices.push(newDevice);
             }
         });
+
     }
 </script>
 <script>