fix bug

Former-commit-id: 6f7343fec16afc83fa291fde32422fb7d43e37d6

projects/WebSPA/wwwroot/js/app.js

@@ -172,6 +172,10 @@ var onReturnBack = function (){
     }
 }
 
+window.addEventListener("popstate", function(e) {
+    $('.weui-header a.weui-header-left')[0].click();
+}, false);
+
 // indexedDB兼容
 var indexedDB = window.indexedDB || window.webkitindexedDB || window.msIndexedDB || mozIndexedDB || null;
 

projects/WebSPA/wwwroot/js/util.js

@@ -76,6 +76,20 @@ function execScene(id) {
         });
 }
 
+function nodePower(number, command) {
+    var loading = weui.loading('提交中...');
+    axios.post('/IoTCenter/api/v1/node/power'+command, '"' + number + '"', { headers: { 'Content-Type': 'application/json;charset=UTF-8' } })
+        .then(function (response) {
+            console.log(response);
+        })
+        .catch(function (error) {
+            console.log(error);
+        })
+        .finally(function () {
+            loading.hide();
+        });
+}
+
 /**
  * 格式化时间
  * @param {*} value 

projects/WebSPA/wwwroot/pages/iot/node.html

@@ -79,7 +79,7 @@
                 <iot-ir v-bind:device="device"></iot-ir>
             </div>
             <!--串口控制器-->
-            <div v-for="device in getDevices('串口控制器')" class="col" style="min-width:320px;">
+            <div v-if="getShowFlag('串口控制器')" v-for="device in getDevices('串口控制器')" class="col" style="min-width:320px;">
                 <iot-serial-port v-bind:device="device"></iot-serial-port>
             </div>
         </div>

projects/WebSPA/wwwroot/pages/iot/node.js

@@ -28,6 +28,12 @@
                         getDevices: function (name) {
                             return Enumerable.from(this.node.devices).where(function (o) { return o.name === name; }).toArray();
                         },
+                        getShowFlag:function (name){
+                            arr = Enumerable.from(this.node.devices).where(function (o) { return o.name === name; }).toArray();
+                            console.log('arrarrarrarr', arr)
+                            console.log('arrarrarrarr', JSON.parse(arr[0].data[0].value)[0].name)
+                            return JSON.parse(arr[0].data[0].value)[0].name !== '测试' ? true : false;
+                        },
                         getDeviceDataAttr: function (number, name, attr) {
                             var device = Enumerable.from(this.node.devices).where(function (o) { return o.number === number; }).firstOrDefault();
                             var data = Enumerable.from(device.data).where(o => o.name === name).firstOrDefault();

projects/WebSPA/wwwroot/pages/iot/nodes.html

@@ -1,18 +1,22 @@
-<div class="page js_show">
+<div class="weui-tab">
+    <div class="weui-tab__panel bg-white" style="display: block;">
         <div class="weui-header">
             <router-link to="/" class="weui-header-left">
                 <i class="ion ion-ios-arrow-back"></i>
             </router-link>
             <h1 class="weui-header-title">智慧教室</h1>
+            <div class="weui-header-right" style="display: none;"><a class="ion ion-ios-more"></a></div>
         </div>
         <div class="main">
-        <div class="row p-1">
+            <div class="row weui-cells_checkbox p-1">
                 <div class="col-md-2 col-sm-3 col-4 p-1" v-for="node in nodes" >
                     <div class="card">                    
-                    <div class="card-header">
-                        <input type="checkbox" name="numbers[]" class="item" value="{{node.number}}">
+                        <div class="card-header" style="padding: 0">
+                            <label class="weui-check__label" style="display: block; padding: .75rem 1.25rem; margin:0">
+                                <input type="checkbox" name="numbers[]" class="weui-check item" :value="node.number"><i class="weui-icon-checked"></i>
                                 <span class="float-right text-success" v-if="node.isOnline"><i class="ion ion-ios-wifi"></i></span>
                                 <span class="float-right text-danger" v-else><i class="ion ion-ios-wifi"></i></span>
+                            </label>
                         </div>
                         <router-link :to="{path:'/pages/iot/node',query:{number:node.number}}">
                             <div class="weui-grid__icon">
@@ -25,3 +29,22 @@
             </div>
         </div>
     </div>
+    <div class="weui-tabbar">
+        <a href="javascript:;" v-on:click="selectAll();" class="weui-tabbar__item">
+            <i class="ion ion-md-checkmark weui-tabbar__icon"></i>
+            <p class="weui-tabbar__label">全部选取</p>
+        </a>
+        <a href="javascript:;" v-on:click="resetAll()"  class="weui-tabbar__item">
+            <i class="ion ion-md-radio-button-off weui-tabbar__icon"></i>
+            <p class="weui-tabbar__label">取消选取</p>
+        </a>
+        <a href="javascript:;" v-on:click="setPower('On')"  class="weui-tabbar__item">
+            <i class="ion ion-ios-flash weui-tabbar__icon"></i>
+            <p class="weui-tabbar__label">批量开启</p>
+        </a>
+        <a href="javascript:;" v-on:click="setPower('Off')"  class="weui-tabbar__item">
+            <i class="ion ion-ios-flash-off weui-tabbar__icon"></i>
+            <p class="weui-tabbar__label">批量关闭</p>
+        </a>
+    </div>
+</div>

projects/WebSPA/wwwroot/pages/iot/nodes.js

@@ -25,6 +25,26 @@
                         store.commit('setNodes', []);
                     },
                     methods: {
+                        selectAll:function(){
+                            $("input[type='checkbox']").each(function(idx,el){
+                                el.checked = true
+                            })
+                        },
+                        resetAll:function(){
+                            $("input[type='checkbox']").each(function(idx,el){
+                                el.checked = false
+                            })
+                        },
+                        setPower:function(method){
+                            var els = $('.item:checked');
+                            if (els.length) {
+                                els.each(function(idx, el){
+                                    nodePower(el.value, method);
+                                })
+                            } else {
+                                weui.topTips('没有选择任何项', { duration: 3000 });
+                            }
+                        }
                     },
                     computed: {
                         nodes: function () {