From 6533cfe191d4ce2c90b910d60ee88ef02e942045 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Thu, 16 Jul 2020 14:15:13 +0800 Subject: [PATCH] update Former-commit-id: 60bd9cfb4a9f16ed77453f6dcdb00a43cddbee45 Former-commit-id: 83518a7eedf1d5048d06612386da0e94072b0865 --- projects/IoT.Shared/Areas/Admin/Controlls/DataController.cs | 2 +- projects/WebMVC/wwwroot/css/site.css | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/projects/IoT.Shared/Areas/Admin/Controlls/DataController.cs b/projects/IoT.Shared/Areas/Admin/Controlls/DataController.cs index c1c362ba..6fbc97c3 100644 --- a/projects/IoT.Shared/Areas/Admin/Controlls/DataController.cs +++ b/projects/IoT.Shared/Areas/Admin/Controlls/DataController.cs @@ -36,7 +36,7 @@ namespace IoT.Shared.Areas.Admin.Controlls public override IQueryable Query(PagedListModel model, IQueryable query) { - ViewData.SelectList(o => model.Query.NodeId.HasValue, () => this._ajax.GetNodeSelectList(model.Query.NodeId.Value)); + ViewData.SelectList(o => model.Query.NodeId, () => this._ajax.GetNodeSelectList(model.Query.NodeId)); ViewData.SelectList(o => model.Query.DeviceId, () => this._ajax.GetDeviceSelectList(model.Query.NodeId.Value, model.Query.DeviceId), model.Query.NodeId.HasValue); return query.WhereIf(model.Query.NodeId.HasValue, o => o.Device.NodeId == model.Query.NodeId.Value) .WhereIf(model.Query.DeviceId.HasValue, o => o.DeviceId == model.Query.DeviceId.Value) diff --git a/projects/WebMVC/wwwroot/css/site.css b/projects/WebMVC/wwwroot/css/site.css index d956c1e4..a3ec4900 100644 --- a/projects/WebMVC/wwwroot/css/site.css +++ b/projects/WebMVC/wwwroot/css/site.css @@ -11,3 +11,6 @@ background-color: #007bff; } +.nav-treeview .nav-item{ + padding-left:2em; +} \ No newline at end of file