From 75fbff989186169cdf23d8b2ffe60b968884d31b Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Sat, 13 Apr 2019 11:52:45 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=BD=93=E5=89=8D=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E6=8E=A7=E5=88=B6=E9=9D=A2=E6=9D=BF=E9=A1=B5=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=85=B6=E4=BB=96=E8=8A=82=E7=82=B9=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82=202.=E4=BF=AE=E5=A4=8D=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E8=AF=A6=E6=83=85=E9=A1=B5=E6=98=BE=E7=A4=BA=E6=9C=80?=
 =?UTF-8?q?=E6=96=B0=E6=8E=A8=E9=80=81=E6=B6=88=E6=81=AF=E7=9A=84=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=E3=80=82=203.?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A0=A1=E7=AB=AF=E9=A6=96=E9=A1=B5=E5=9B=BE?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=8D=E7=8E=B0=E5=AE=9E=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IoT.Shared/Views/Device/Details.cshtml    |  2 +-
 projects/IoT/IoT.Shared/wwwroot/js/iot.js     | 90 +++++++++++--------
 projects/IoTCenter/Views/Home/Index.cshtml    |  6 --
 3 files changed, 53 insertions(+), 45 deletions(-)

diff --git a/projects/IoT/IoT.Shared/Views/Device/Details.cshtml b/projects/IoT/IoT.Shared/Views/Device/Details.cshtml
index f634e455..17a8faf2 100644
--- a/projects/IoT/IoT.Shared/Views/Device/Details.cshtml
+++ b/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>
diff --git a/projects/IoT/IoT.Shared/wwwroot/js/iot.js b/projects/IoT/IoT.Shared/wwwroot/js/iot.js
index 066467bd..381adb20 100644
--- a/projects/IoT/IoT.Shared/wwwroot/js/iot.js
+++ b/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);
diff --git a/projects/IoTCenter/Views/Home/Index.cshtml b/projects/IoTCenter/Views/Home/Index.cshtml
index 5a2e9125..d0adee7f 100644
--- a/projects/IoTCenter/Views/Home/Index.cshtml
+++ b/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 () {