diff --git a/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs b/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs index 7848ffa..6604f0a 100644 --- a/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs +++ b/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs @@ -38,7 +38,7 @@ namespace ZR.Admin.WebApi.Controllers.monitor [HttpGet("list")] public IActionResult OperList([FromQuery] SysOperLogDto sysOperLog) { - PagerInfo pagerInfo = new PagerInfo(sysOperLog.pageNum); + PagerInfo pagerInfo = new(sysOperLog.pageNum, sysOperLog.PageSize); var list = sysOperLogService.SelectOperLogList(sysOperLog, pagerInfo); diff --git a/ZR.Admin.WebApi/Hubs/MessageHub.cs b/ZR.Admin.WebApi/Hubs/MessageHub.cs index 5b680ec..64ef549 100644 --- a/ZR.Admin.WebApi/Hubs/MessageHub.cs +++ b/ZR.Admin.WebApi/Hubs/MessageHub.cs @@ -45,7 +45,7 @@ namespace ZR.Admin.WebApi.Hubs { clientUsers.Add(new OnlineUsers(Context.ConnectionId, name)); Console.WriteLine($"{DateTime.Now}:{name},{Context.ConnectionId}连接服务端success,当前已连接{clientUsers.Count}个"); - Clients.All.SendAsync("welcome", $"欢迎您:{name},当前时间:{DateTime.Now}"); + //Clients.All.SendAsync("welcome", $"欢迎您:{name},当前时间:{DateTime.Now}"); Clients.All.SendAsync(HubsConstant.MoreNotice, SendNotice()); } diff --git a/ZR.Model/System/Dto/SysOperLogDto.cs b/ZR.Model/System/Dto/SysOperLogDto.cs index 23bd3cb..586a420 100644 --- a/ZR.Model/System/Dto/SysOperLogDto.cs +++ b/ZR.Model/System/Dto/SysOperLogDto.cs @@ -11,6 +11,7 @@ namespace ZR.Model.System.Dto /// 页码 /// public int pageNum { get; set; } + public int PageSize { get; set; } /// /// 操作人员 /// diff --git a/ZR.Vue/src/views/system/user/profile/index.vue b/ZR.Vue/src/views/system/user/profile/index.vue index 3e4481e..5e88fed 100644 --- a/ZR.Vue/src/views/system/user/profile/index.vue +++ b/ZR.Vue/src/views/system/user/profile/index.vue @@ -43,9 +43,9 @@ -
+ @@ -53,6 +53,9 @@ + + + @@ -64,17 +67,19 @@ import userAvatar from "./userAvatar"; import userInfo from "./userInfo"; import resetPwd from "./resetPwd"; +import operLog from "./operLog.vue"; import { getUserProfile } from "@/api/system/user"; export default { name: "Profile", - components: { userAvatar, userInfo, resetPwd }, + components: { userAvatar, userInfo, resetPwd, operLog }, data() { return { user: {}, roles: [], - postGroup: '', + postGroup: "", activeTab: "userinfo", + activeName: "first", }; }, created() { @@ -89,6 +94,9 @@ export default { this.postGroup = response.data.postGroup; }); }, + handleTabClick(tab, event) { + console.log(tab, event); + }, }, }; diff --git a/ZR.Vue/src/views/system/user/profile/operLog.vue b/ZR.Vue/src/views/system/user/profile/operLog.vue new file mode 100644 index 0000000..1181d2d --- /dev/null +++ b/ZR.Vue/src/views/system/user/profile/operLog.vue @@ -0,0 +1,135 @@ + + + +