g82tt/ThingsGateway
1
0
Fork 0
mirror of https://gitee.com/ThingsGateway/ThingsGateway.git synced 2025-10-25 20:53:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

mchart 更新

Browse Source
This commit is contained in:
Kimdiego2098
2024-03-30 22:03:19 +08:00
parent 3faf0aa2fc
commit b30eeb4694
2 changed files with 38 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/ThingsGateway.Gateway.Blazor/Page/HardwareInfoPage.razor.cs
View File

@@ -73,15 +73,13 @@ public partial class HardwareInfoPage
private async Task GetHardwareInfoEChartsOption()
{
var hisDatas = _hardwareInfoWorker.GetHis();
if (hardwareInfoEChartsOption == null)
hardwareInfoEChartsOption = new
{
hardwareInfoEChartsOption ??= new
backgroundColor = "",
tooltip = new { trigger = "axis" },
legend = new
{
backgroundColor = "",
tooltip = new { trigger = "axis" },
legend = new
{
data = new[] {
data = new[] {
AppService.I18n.T("CPU使用率"),
AppService.I18n.T("内存使用率"),
AppService.I18n.T("磁盘使用率"),
@@ -90,18 +88,18 @@ public partial class HardwareInfoPage
AppService.I18n.T("上载速度"),
AppService.I18n.T("下载速度")
},
left = "5%"
},
grid = new { left = "3%", right = "4%", bottom = "3%", containLabel = true },
toolbox = new { feature = new { saveAsImage = new { } } },
xAxis = new
{
type = "category",
boundaryGap = false,
data = hisDatas.Select(a => a.Date.ToString("yyyy-MM-dd HH:mm")).ToArray()
},
yAxis = new { type = "value" },
series = new[]
left = "5%"
},
grid = new { left = "3%", right = "4%", bottom = "3%", containLabel = true },
toolbox = new { feature = new { saveAsImage = new { } } },
xAxis = new
{
type = "category",
boundaryGap = false,
data = hisDatas.Select(a => a.Date.ToString("yyyy-MM-dd HH:mm")).ToArray()
},
yAxis = new { type = "value" },
series = new[]
{
new { name =AppService.I18n.T( "CPU使用率"), type = "line",
data = hisDatas.Select(a=>a.CpuUsage).ToArray(),
@@ -132,43 +130,7 @@ public partial class HardwareInfoPage
smooth=true
},
}
};
}
else
{
var option = new
{
xAxis = new
{
data = hisDatas.Select(a => a.Date.ToString("yyyy-MM-dd HH:mm")).ToArray()
},
series = new[]
{
new { name =AppService.I18n.T( "CPU使用率"),
data = hisDatas.Select(a=>a.CpuUsage).ToArray(),
},
new { name = AppService.I18n.T("内存使用率"),
data = hisDatas.Select(a=>a.MemoryUsage).ToArray(),
},
new { name = AppService.I18n.T("磁盘使用率"),
data = hisDatas.Select(a=>a.DriveUsage).ToArray(),
},
new { name = AppService.I18n.T("温度"),
data = hisDatas.Select(a=>a.Temperature).ToArray(),
},
new { name = AppService.I18n.T("电池"),
data = hisDatas.Select(a=>a.Battery).ToArray(),
},
new { name = AppService.I18n.T("上载速度"),
data = hisDatas.Select(a=>a.UplinkSpeed).ToArray(),
},
new { name = AppService.I18n.T("下载速度"),
data = hisDatas.Select(a=>a.DownlinkSpeed).ToArray(),
},
}
};
await hardwareInfoECharts.SetOption(option, false, false);
}
};
await InvokeStateHasChangedAsync();
}

78
src/ThingsGateway.Gateway.Blazor/Page/Index.razor.cs
View File

@@ -90,7 +90,7 @@ public partial class Index
{
try
{
await GetHardwareInfoEChartsOption();
GetHardwareInfoEChartsOption();
_sysVisitLogs = (await _serviceScope.ServiceProvider.GetService<IVisitLogService>().PageAsync(new() { Size = 5, Account = UserResoures.CurrentUser?.Account })).Records.ToList();
_sysOperateLogs = (await _serviceScope.ServiceProvider.GetService<IOperateLogService>().PageAsync(new() { Size = 5, Account = UserResoures.CurrentUser?.Account })).Records.ToList();
_rpcLogs = (await _serviceScope.ServiceProvider.GetService<IRpcLogService>().PageAsync(new() { Size = 5, })).Records.ToList();
@@ -116,18 +116,16 @@ public partial class Index
private object hardwareInfoEChartsOption = new();
private MECharts hardwareInfoECharts;
private async Task GetHardwareInfoEChartsOption()
private void GetHardwareInfoEChartsOption()
{
var hisDatas = _hardwareInfoWorker.GetHis();
if (hardwareInfoEChartsOption == null)
hardwareInfoEChartsOption = new
{
hardwareInfoEChartsOption ??= new
backgroundColor = "",
tooltip = new { trigger = "axis" },
legend = new
{
backgroundColor = "",
tooltip = new { trigger = "axis" },
legend = new
{
data = new[] {
data = new[] {
AppService.I18n.T("CPU使用率"),
AppService.I18n.T("内存使用率"),
AppService.I18n.T("磁盘使用率"),
@@ -136,18 +134,18 @@ public partial class Index
AppService.I18n.T("上载速度"),
AppService.I18n.T("下载速度")
},
left = "5%"
},
grid = new { left = "3%", right = "4%", bottom = "3%", containLabel = true },
toolbox = new { feature = new { saveAsImage = new { } } },
xAxis = new
{
type = "category",
boundaryGap = false,
data = hisDatas.Select(a => a.Date.ToString("yyyy-MM-dd HH:mm")).ToArray()
},
yAxis = new { type = "value" },
series = new[]
left = "5%"
},
grid = new { left = "3%", right = "4%", bottom = "3%", containLabel = true },
toolbox = new { feature = new { saveAsImage = new { } } },
xAxis = new
{
type = "category",
boundaryGap = false,
data = hisDatas.Select(a => a.Date.ToString("yyyy-MM-dd HH:mm")).ToArray()
},
yAxis = new { type = "value" },
series = new[]
{
new { name =AppService.I18n.T( "CPU使用率"), type = "line",
data = hisDatas.Select(a=>a.CpuUsage).ToArray(),
@@ -178,43 +176,7 @@ public partial class Index
smooth=true
},
}
};
}
else
{
var option = new
{
xAxis = new
{
data = hisDatas.Select(a => a.Date.ToString("yyyy-MM-dd HH:mm")).ToArray()
},
series = new[]
{
new { name =AppService.I18n.T( "CPU使用率"),
data = hisDatas.Select(a=>a.CpuUsage).ToArray(),
},
new { name = AppService.I18n.T("内存使用率"),
data = hisDatas.Select(a=>a.MemoryUsage).ToArray(),
},
new { name = AppService.I18n.T("磁盘使用率"),
data = hisDatas.Select(a=>a.DriveUsage).ToArray(),
},
new { name = AppService.I18n.T("温度"),
data = hisDatas.Select(a=>a.Temperature).ToArray(),
},
new { name = AppService.I18n.T("电池"),
data = hisDatas.Select(a=>a.Battery).ToArray(),
},
new { name = AppService.I18n.T("上载速度"),
data = hisDatas.Select(a=>a.UplinkSpeed).ToArray(),
},
new { name = AppService.I18n.T("下载速度"),
data = hisDatas.Select(a=>a.DownlinkSpeed).ToArray(),
},
}
};
await hardwareInfoECharts.SetOption(option, false, false);
}
};
}
#endregion CPU曲线