diff --git a/projects/IoT/IoT.Shared/Application/Models/EditDataModel.cs b/projects/IoT/IoT.Shared/Application/Models/EditDataModel.cs index 1513cb0a..0ad27c26 100644 --- a/projects/IoT/IoT.Shared/Application/Models/EditDataModel.cs +++ b/projects/IoT/IoT.Shared/Application/Models/EditDataModel.cs @@ -37,5 +37,9 @@ namespace Application.Models [HiddenInput(DisplayValue = false)] [ScaffoldColumn(true)] public string DeviceNumber { get; set; } + + [HiddenInput(DisplayValue = false)] + [ScaffoldColumn(true)] + public string NodeNumber { get; set; } } } \ No newline at end of file diff --git a/projects/IoTCenter/Areas/Admin/Controllers/IoT/DataController.cs b/projects/IoTCenter/Areas/Admin/Controllers/IoT/DataController.cs index 2ba747d0..c71092b5 100644 --- a/projects/IoTCenter/Areas/Admin/Controllers/IoT/DataController.cs +++ b/projects/IoTCenter/Areas/Admin/Controllers/IoT/DataController.cs @@ -30,7 +30,7 @@ namespace IoTCenter.Areas.Admin.Controllers public override IQueryable Include(IQueryable query) { - return query.Include(o => o.Device); + return query.Include(o => o.Device).ThenInclude(o => o.Node); } public override IQueryable Query(DataSearchModel model, IQueryable query) @@ -45,13 +45,14 @@ namespace IoTCenter.Areas.Admin.Controllers public override void ToModel(Data entity, EditDataModel model) { model.DeviceNumber = entity.Device.Number; + model.NodeNumber = entity.Device.Node.Number; } public override IActionResult Edit(EditDataModel model) { if (ModelState.IsValid) { - this._pageHubContext.Clients.Group(model.DeviceNumber).SendAsync(Methods.ServerToClient, Methods.EditDataRequest, model.ToJson(), null); + this._pageHubContext.Clients.Group(model.NodeNumber).SendAsync(Methods.ServerToClient, Methods.EditDataRequest, model.ToJson(), null); return RedirectTo(); } ModelState.AddModelError("", "服务器出现异常,请稍后重试"); diff --git a/projects/IoTCenter/Views/Home/Node.cshtml b/projects/IoTCenter/Views/Home/Node.cshtml index a6429775..6c51095e 100644 --- a/projects/IoTCenter/Views/Home/Node.cshtml +++ b/projects/IoTCenter/Views/Home/Node.cshtml @@ -62,6 +62,23 @@ position: absolute; right: 0; } + + .ptz { + width: 100%; + } + + .ptz td { + text-align: center; + padding: 11px 0; + } + + .btns { + padding: 0 18px; + } + + .btns .btn { + margin: 18px 0; + } @HtmlTitle | @cfg["name"] @@ -152,6 +169,7 @@ +