RIZO/zhuangpei-mesbackend
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
qianhao.xu 2025-02-27 15:05:55 +08:00
parent e6da680a20
commit 16e8d26fc3
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
DOAN.Admin.WebApi/Controllers/MES/BI/Andon/AndonDataAnalysisController.cs
View File

@ -27,7 +27,7 @@ namespace DOAN.WebApi.Controllers.MES.BI
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
[HttpPost("list")]
[HttpGet("list")]
public IActionResult QueryTodayAndonFaultRecord()
{
@ -42,7 +42,7 @@ namespace DOAN.WebApi.Controllers.MES.BI
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
[HttpPost("getPieChart")]
[HttpGet("getPieChart")]
public IActionResult AbnormalDurationRatio()
{
@ -53,6 +53,7 @@ namespace DOAN.WebApi.Controllers.MES.BI
}
//TODO：本月停机时间统计柱状图
[HttpGet("getShutDowmBar")]
public IActionResult ShutdownBar()
{
var response = _andonDataAnalysisService.ShutdownBar();

13
DOAN.Service/MES/BI/AndonDataAnalysisService.cs
View File

@ -153,6 +153,7 @@ namespace DOAN.Service.MES.BI
})
.OrderBy(x => x.Name)
.ToList();
seriesLine.Data= seriesLine_data;
echartsOptionsSeries.Add(seriesLine);
#endregion
@ -164,8 +165,8 @@ namespace DOAN.Service.MES.BI
foreach(var andonFault in andonFaults)
{
EchartsSeries seriesBar = new EchartsSeries();
seriesLine.Name = andonFault.Name+"停机时间";
seriesLine.Type = "bar";
seriesBar.Name = andonFault.Name+"停机时间";
seriesBar.Type = "bar";
List<EchartsSeriesData> seriesLine_data_bar = null;
var result01 = Context.Queryable<AndonFaultRecord>()
.Where(x => x.CreatedTime >= firstDayOfMonth && x.CreatedTime <= lastDayOfMonth)
@ -181,8 +182,8 @@ namespace DOAN.Service.MES.BI
var allDaysInMonth01 = Enumerable.Range(0, (lastDayOfMonth - firstDayOfMonth).Days + 1)
.Select(offset => firstDayOfMonth.AddDays(offset).Date)
.ToList();
seriesLine_data = allDaysInMonth
.GroupJoin(result,
seriesLine_data_bar = allDaysInMonth
.GroupJoin(result01,
date => date,
summary => summary.Date,
(date, summaries) => new EchartsSeriesData
@ -192,8 +193,8 @@ namespace DOAN.Service.MES.BI
})
.OrderBy(x => x.Name)
.ToList();
echartsOptionsSeries.Add(seriesLine);
seriesBar.Data = seriesLine_data_bar;
echartsOptionsSeries.Add(seriesBar);
}
#endregion