diff --git a/ZR.Admin.WebApi/Controllers/System/SysNoticeController.cs b/ZR.Admin.WebApi/Controllers/System/SysNoticeController.cs index cad4ab6..65e5462 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysNoticeController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysNoticeController.cs @@ -32,6 +32,22 @@ namespace ZR.Admin.WebApi.Controllers.System _SysNoticeService = SysNoticeService; } + /// + /// 查询通知公告表列表 + /// + /// + [HttpGet("queryNotice")] + public IActionResult QueryNotice([FromQuery] SysNoticeQueryDto parm) + { + //开始拼装查询条件 + var predicate = Expressionable.Create(); + + //搜索条件查询语法参考Sqlsugar + predicate = predicate.And(m => m.Status == "0"); + var response = _SysNoticeService.GetPages(predicate.ToExpression(), parm); + return SUCCESS(response); + } + /// /// 查询通知公告表列表 /// @@ -47,6 +63,7 @@ namespace ZR.Admin.WebApi.Controllers.System predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.NoticeTitle), m => m.NoticeTitle.Contains(parm.NoticeTitle)); predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.NoticeType), m => m.NoticeType == parm.NoticeType); predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.CreateBy), m => m.Create_by.Contains(parm.CreateBy) || m.Update_by.Contains(parm.CreateBy)); + predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.Status), m => m.Status == parm.Status); var response = _SysNoticeService.GetPages(predicate.ToExpression(), parm); return SUCCESS(response); } diff --git a/ZR.Model/System/Dto/SysNoticeDto.cs b/ZR.Model/System/Dto/SysNoticeDto.cs index 7ceb563..6c89ef2 100644 --- a/ZR.Model/System/Dto/SysNoticeDto.cs +++ b/ZR.Model/System/Dto/SysNoticeDto.cs @@ -28,5 +28,6 @@ namespace ZR.Model.Dto public string NoticeTitle { get; set; } public string NoticeType { get; set; } public string CreateBy { get; set; } + public string Status { get; set; } } } diff --git a/ZR.Vue/src/api/system/notice.js b/ZR.Vue/src/api/system/notice.js index c274ea5..cc6f68c 100644 --- a/ZR.Vue/src/api/system/notice.js +++ b/ZR.Vue/src/api/system/notice.js @@ -1,5 +1,14 @@ import request from '@/utils/request' +// 导航栏查询公告列表 +export function queryNotice(query) { + return request({ + url: '/system/notice/queryNotice', + method: 'get', + params: query + }) +} + // 查询公告列表 export function listNotice(query) { return request({ diff --git a/ZR.Vue/src/components/Notice/Index.vue b/ZR.Vue/src/components/Notice/Index.vue new file mode 100644 index 0000000..ab5e6fe --- /dev/null +++ b/ZR.Vue/src/components/Notice/Index.vue @@ -0,0 +1,123 @@ + + + + + diff --git a/ZR.Vue/src/layout/components/Navbar.vue b/ZR.Vue/src/layout/components/Navbar.vue index af1596f..ce990fb 100644 --- a/ZR.Vue/src/layout/components/Navbar.vue +++ b/ZR.Vue/src/layout/components/Navbar.vue @@ -4,8 +4,8 @@ - - + +
+ +
+ + + + + + +
@@ -46,13 +55,14 @@