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 @@
数据统计:

- 10分钟 + 10分钟 1小时 1天 1周 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 @@