1.修复当前节点控制面板页显示其他节点设备问题。

2.修复设备详情页显示最新推送消息的设备数据问题。
3.修复校端首页图表不现实的问题。

projects/IoT/IoT.Shared/Views/Device/Details.cshtml

@@ -123,7 +123,7 @@
                             <div class="block-title">数据统计:</div>
                             <div class="block">
                                 <p class="segmented segmented-raised">
-                                    <a href="@Url.Action()" class="link external button button-fill @GetClass("10m")">10分钟</a>
+                                    <a href="@Url.Action()" class="link external button @GetClass("10m")">10分钟</a>
                                     <a href="@Url.Action(null,new {time="1h" })" class="link external button @GetClass("1h")">1小时</a>
                                     <a href="@Url.Action(null,new {time="1d" })" class="link external button @GetClass("1d")">1天</a>
                                     <a href="@Url.Action(null,new {time="1w" })" class="link external button @GetClass("1w")">1周</a>

projects/IoT/IoT.Shared/wwwroot/js/iot.js

@@ -333,67 +333,81 @@ connection.on('ApiResult', function (result) {
 connection.on("UpdateDevice", function (message) {
     var device = JSON.parse(message);
     if (isList) {
-        var update = false;
-        for (var i = 0; i < vm.model.Devices.length; i++) {
-            if (vm.model.Devices[i].Number == device.Number) {
-                update = true;
-                break;
+        if (device.NodeId === vm.model.Id) {
+            var update = false;
+            for (var i = 0; i < vm.model.Devices.length; i++) {
+                if (vm.model.Devices[i].Number == device.Number) {
+                    update = true;
+                    break;
+                }
+            }
+            if (update) {
+                vm.model.Devices.splice(i, 1, device);
+            }
+            else {
+                vm.model.Devices.push(device);
             }
-        }
-        if (update) {
-            vm.model.Devices.splice(i, 1, device);
-        }
-        else {
-            vm.model.Devices.push(device);
         }
     }
     else {
-        vm.model = device;
-        updateChart();
+        if (vm.model.Id === device.Id) {
+            vm.model = device;
+            updateChart();
+        }
     }
     console.log('update:' + device.DisplayName);
 });
 connection.on("DeleteDevice", function (message) {
     var number = message;
-    for (var i = 0; i < vm.model.Devices.length; i++) {
-        if (vm.model.Devices[i].Number == number) {
-            vm.model.Devices.splice(i, 1);
-            break;
+    if (isList) {
+        for (var i = 0; i < vm.model.Devices.length; i++) {
+            if (vm.model.Devices[i].Number == number) {
+                vm.model.Devices.splice(i, 1);
+                break;
+            }
         }
+        console.log('delete:' + device.DisplayName);
     }
-    console.log('delete:' + device.DisplayName);
 });
 connection.on("UpdateSence", function (message) {
     var sence = JSON.parse(message);
-    var update = false;
-    for (var i = 0; i < vm.model.Sences.length; i++) {
-        if (vm.model.Sences[i].Id == sence.Id) {
-            update = true;
-            break;
+    if (isList) {
+        if (vm.model.Id === sence.NodeId) {
+            var update = false;
+            for (var i = 0; i < vm.model.Sences.length; i++) {
+                if (vm.model.Sences[i].Id == sence.Id) {
+                    update = true;
+                    break;
+                }
+            }
+            if (update) {
+                vm.model.Sences.splice(i, 1, sence);
+            }
+            else {
+                vm.model.Sences.push(sence);
+            }
+            console.log('update:' + sence.DisplayName);
         }
     }
-    if (update) {
-        vm.model.Sences.splice(i, 1, sence);
-    }
-    else {
-        vm.model.Sences.push(sence);
-    }
-    console.log('update:' + sence.DisplayName);
 });
 connection.on("DeleteSence", function (message) {
     var id = message;
-    for (var i = 0; i < vm.model.Sences.length; i++) {
-        if (vm.model.Sences[i].Id == id) {
-            vm.model.Sences.splice(i, 1);
-            break;
+    if (isList) {
+        for (var i = 0; i < vm.model.Sences.length; i++) {
+            if (vm.model.Sences[i].Id == id) {
+                vm.model.Sences.splice(i, 1);
+                break;
+            }
         }
+        console.log('delete:' + sence.DisplayName);
     }
-    console.log('delete:' + sence.DisplayName);
 });
 connection.on("UpdateNode", function (message) {
-    var node = JSON.parse(message);
-    vm.model.Name = node.Name;
-    console.log('update node');
+    if (isList) {
+        var node = JSON.parse(message);
+        vm.model.Name = node.Name;
+        console.log('update node');
+    }
 });
 connection.onclose(function (err) {
     console.error(err);

projects/IoTCenter/Views/Home/Index.cshtml

@@ -203,7 +203,6 @@
     </script>
     <script>
         var app;
-        var toastCenter;
         var deviceTotalChart;
         var vm = new Vue({
             el: '#app',
@@ -227,11 +226,6 @@
                     Framework7.Class.use(plugin);
                 }
                 app = new Framework7();
-                toastCenter = app.toast.create({
-                    text: 'loading...',
-                    position: 'center',
-                    closeTimeout: 2000,
-                });
                 this.renderDeviceTotal(true);
             },
             updated: function () {