GithubStar/ThingsGateway
1
0
Fork 0
mirror of https://github.com/ThingsGateway/ThingsGateway.git synced 2026-10-28 11:47:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

!2 添加系统首页rpc日志与后台日志简单查看

Browse Source 
Merge pull request !2 from lcj/master
This commit is contained in:
lcj
2023-03-12 09:15:53 +00:00
committed by Diego2098
parent 0ce21727f7
commit d9ded01ff5
14 changed files with 98 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ThingsGateway.Web.Core/ThingsGateway.Web.Core.csproj
+1 -1
View File
@@ -51,7 +51,7 @@
<ItemGroup>
<ProjectReference Include="..\ThingsGateway.Web.Page\ThingsGateway.Web.Page.csproj" />
<ProjectReference Include="..\ThingsGateway.Web.Rcl\ThingsGateway.Web.Rcl.csproj" />
</ItemGroup>
</Project>
src/ThingsGateway.Web.Page/ThingsGateway.Web.Page.csproj
+1 -1
View File
@@ -8,7 +8,7 @@
<ItemGroup>
<ProjectReference Include="..\ThingsGateway.Web.Foundation\ThingsGateway.Web.Foundation.csproj" />
<ProjectReference Include="..\ThingsGateway.Web.Rcl\ThingsGateway.Web.Rcl.csproj" />
<ProjectReference Include="..\ThingsGateway.Web.Rcl.Core\ThingsGateway.Web.Rcl.Core.csproj" />
</ItemGroup>
src/ThingsGateway.Web.Rcl.Core/GlobalUsings.cs
+2
View File
@@ -20,5 +20,7 @@ global using System.Diagnostics.CodeAnalysis;
global using System.Globalization;
global using System.Linq;
global using System.Threading.Tasks;
global using ThingsGateway.Web.Rcl.Core;
global using ThingsGateway.Application;
global using ThingsGateway.Core;
src/ThingsGateway.Web.Rcl/Shared/Auth/Login.razor → src/ThingsGateway.Web.Rcl.Core/Shared/Auth/Login.razor
View File
src/ThingsGateway.Web.Rcl/Shared/Auth/Login.razor.cs → src/ThingsGateway.Web.Rcl.Core/Shared/Auth/Login.razor.cs
View File
src/ThingsGateway.Web.Rcl/Shared/Auth/SignalR.razor → src/ThingsGateway.Web.Rcl.Core/Shared/Auth/SignalR.razor
View File
src/ThingsGateway.Web.Rcl/Shared/Auth/SignalR.razor.cs → src/ThingsGateway.Web.Rcl.Core/Shared/Auth/SignalR.razor.cs
+2
View File
@@ -2,6 +2,8 @@ using BlazorComponent;
using Microsoft.AspNetCore.SignalR.Client;
using System.Net.Http;
namespace ThingsGateway.Web.Rcl
{
public partial class SignalR
src/ThingsGateway.Web.Rcl/Shared/BaseLayout.razor → src/ThingsGateway.Web.Rcl.Core/Shared/BaseLayout.razor
View File
src/ThingsGateway.Web.Rcl/Shared/MainLayout.razor → src/ThingsGateway.Web.Rcl.Core/Shared/MainLayout.razor
View File
src/ThingsGateway.Web.Rcl/Shared/MainLayout.razor.cs → src/ThingsGateway.Web.Rcl.Core/Shared/MainLayout.razor.cs
View File
src/ThingsGateway.Web.Rcl.Core/ThingsGateway.Web.Rcl.Core.csproj
+1
View File
@@ -25,6 +25,7 @@
<ItemGroup>
<PackageReference Include="Masa.Blazor" Version="1.0.0-preview.8" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.3" />
</ItemGroup>
src/ThingsGateway.Web.Rcl.Core/_Imports.razor
+2
View File
@@ -2,3 +2,5 @@
@using Masa.Blazor
@using BlazorComponent
@using BlazorComponent.I18n;
@using ThingsGateway.Web.Rcl.Core;
@using ThingsGateway.Application;
src/ThingsGateway.Web.Rcl/Page/Index.razor
+88 -3
View File
@@ -34,8 +34,82 @@
</MRow>
</MCard>
@if (UserManager.SuperAdmin)
{
<MRow NoGutters>
<MCol Md=6 Cols="12">
<MCard MinHeight=400 Elevation="1" Class="ma-2">
<MCardSubtitle Class="text-subtitle-1">
@T("RPC日志")
</MCardSubtitle>
<MDivider></MDivider>
<MTimeline AlignTop Dense>
@foreach (var item in RpcLogs)
{
<MTimelineItem Color="primary"
Small>
<MRow Class="pt-1">
<MCol Cols="4">
<span class="text-caption">@item.LogTime</span>
</MCol>
<MCol Cols="8">
<div class="mt-1 px-2 d-flex align-center justify-space-between">
<span>@item.OperateObject.Substring(0,item.OperateObject.Length>100?100:item.OperateObject.Length)</span>
<span class="text-caption">@item.Description(a=>a.OperateObject)</span>
</div>
<div class="mt-1 px-2 d-flex align-center justify-space-between">
<span>@item.OperateSource.Substring(0,item.OperateSource.Length>100?100:item.OperateSource.Length)</span>
<span class="text-caption">@item.Description(a=>a.OperateSource)</span>
</div>
<div class="mt-1 px-2 d-flex align-center justify-space-between">
<span>@item.ParamJson.Substring(0,item.ParamJson.Length>100?100:item.ParamJson.Length)</span>
<span class="text-caption">@item.Description(a=>a.ParamJson)</span>
</div>
<div class="mt-1 px-2 d-flex align-center justify-space-between">
<span>@item.ResultJson.Substring(0,item.ResultJson.Length>100?100:item.ResultJson.Length)</span>
<span class="text-caption">@item.Description(a=>a.ResultJson)</span>
</div>
<MRow NoGutters >
</MCol>
</MRow>
</MTimelineItem>
}
</MTimeline>
</MCard>
</MCol>
<MCol Md=6 Cols="12">
<MCard MinHeight=400 Elevation="1" Class="ma-2">
<MCardSubtitle Class="text-subtitle-1">
@T("后台日志")
</MCardSubtitle>
<MDivider></MDivider>
<MTimeline AlignTop Dense>
@foreach (var item in RuntimeLogs)
{
<MTimelineItem Color="primary"
Small>
<MRow Class="pt-1">
<MCol Cols="4">
<span class="text-caption">@item.LogTime</span>
</MCol>
<MCol>
<div class="text-body-1">@item.LogSource.Substring(0,item.LogSource.Length>100?100:item.LogSource.Length)</div>
<div class="text-body-1">@item.LogMessage.Substring(0,item.LogMessage.Length>100?100:item.LogMessage.Length)</div>
</MCol>
</MRow>
</MTimelineItem>
}
</MTimeline>
</MCard>
</MCol>
</MRow>
}
<MRow NoGutters>
<MCol Md=6 Cols="12">
<MCard MinHeight=400 Elevation="1" Class="ma-2">
<MCardSubtitle Class="text-subtitle-1">
@@ -93,15 +167,26 @@
</MRow>
@code {
[Inject]
private ThingsGateway.Web.Foundation.IRpcLogService RpcLogService { get; set; }
[Inject]
private ThingsGateway.Web.Foundation.IRuntimeLogService RuntimeLogService { get; set; }
[Inject]
private IVisitLogService VisitLogService { get; set; }
List<DevLogVisit> DevLogVisits;
List<DevLogOperate> DevLogOps;
List<ThingsGateway.Web.Foundation.RpcLog> RpcLogs;
List<ThingsGateway.Web.Foundation.RuntimeLog> RuntimeLogs;
[Inject]
private IOperateLogService OperateLogService { get; set; }
List<DevLogOperate> DevLogOps;
protected override async Task OnInitializedAsync()
{
if (UserManager.SuperAdmin)
{
RpcLogs = (await RpcLogService.Page(new() { Size = 5 })).Records.ToList();
RuntimeLogs = (await RuntimeLogService.Page(new() { Size = 5 })).Records.ToList();
}
DevLogVisits = (await VisitLogService.Page(new() { Size = 5, Account = UserResoures.CurrentUser?.Account })).Records.ToList();
DevLogOps = (await OperateLogService.Page(new() { Size = 5, Account = UserResoures.CurrentUser?.Account })).Records.ToList();
await base.OnInitializedAsync();
src/ThingsGateway.Web.Rcl/ThingsGateway.Web.Rcl.csproj
+1 -5
View File
@@ -7,11 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ThingsGateway.Web.Page\ThingsGateway.Web.Page.csproj" />
<ProjectReference Include="..\ThingsGateway.Web.Rcl.Core\ThingsGateway.Web.Rcl.Core.csproj" />
</ItemGroup>