diff --git a/projects/IoT.Shared/Application/Models/EditLiveRecordModel.cs b/projects/IoT.Shared/Application/Models/EditLiveRecordModel.cs index 5e9f415f..b09cefec 100644 --- a/projects/IoT.Shared/Application/Models/EditLiveRecordModel.cs +++ b/projects/IoT.Shared/Application/Models/EditLiveRecordModel.cs @@ -9,17 +9,21 @@ namespace Application.Models { [Display(Name = "设备编号")] [ReadOnly(true)] + [Required(ErrorMessage = nameof(RequiredAttribute))] public string DeviceNumber { get; set; } [Display(Name = "设备名称")] [ReadOnly(true)] + [Required(ErrorMessage = nameof(RequiredAttribute))] public string DeviceName { get; set; } [Display(Name = "名称")] + [Required(ErrorMessage = nameof(RequiredAttribute))] public string Name { get; set; } [Display(Name = "文件")] [ReadOnly(true)] + [Required(ErrorMessage = nameof(RequiredAttribute))] public string Value { get; set; } } } \ No newline at end of file diff --git a/projects/IoTCenter/Areas/Admin/Controllers/LiveRecordController.cs b/projects/IoTCenter/Areas/Admin/Controllers/LiveRecordController.cs index 9e2ee04d..0469a9e8 100644 --- a/projects/IoTCenter/Areas/Admin/Controllers/LiveRecordController.cs +++ b/projects/IoTCenter/Areas/Admin/Controllers/LiveRecordController.cs @@ -26,10 +26,10 @@ namespace IoTCenter.Areas.Admin.Controllers { ViewData.SelectList(o => model.Query.DeviceNumber, () => this._ajax.GetCameraSelectList(model.Query.DeviceNumber)); return query - .WhereIf(!string.IsNullOrEmpty(model.Query.DeviceNumber), o => o.DeviceNumber == model.Query.DeviceNumber) + .WhereIf(!string.IsNullOrEmpty(model.Query.DeviceNumber), o => o.DeviceNumber.Contains(model.Query.DeviceNumber)) .WhereIf(!string.IsNullOrEmpty(model.Query.DeviceName), o => o.DeviceName.Contains(model.Query.DeviceName)) - .WhereIf(!string.IsNullOrEmpty(model.Query.Value), o => o.DeviceName.Contains(model.Query.Value)) - .WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.DeviceName.Contains(model.Query.Name)); + .WhereIf(!string.IsNullOrEmpty(model.Query.Value), o => o.Value.Contains(model.Query.Value)) + .WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name)); } } } \ No newline at end of file diff --git a/projects/Version.cs b/projects/Version.cs index 5136e058..dabb0ec9 100644 --- a/projects/Version.cs +++ b/projects/Version.cs @@ -1,4 +1,4 @@ using System.Reflection; [assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyInformationalVersion("1.0.0.0813d3")] \ No newline at end of file +[assembly: AssemblyInformationalVersion("1.0.0.0814d1")] \ No newline at end of file diff --git a/projects/WebMVC/wwwroot/components/shared/display.html b/projects/WebMVC/wwwroot/components/shared/display.html index f0b6f652..47373793 100644 --- a/projects/WebMVC/wwwroot/components/shared/display.html +++ b/projects/WebMVC/wwwroot/components/shared/display.html @@ -1,6 +1,7 @@