diff --git a/DOAN.Admin.WebApi/Controllers/MES/BI/Andon/AndonDataAnalysisController.cs b/DOAN.Admin.WebApi/Controllers/MES/BI/Andon/AndonDataAnalysisController.cs
index 6475a96..5db5848 100644
--- a/DOAN.Admin.WebApi/Controllers/MES/BI/Andon/AndonDataAnalysisController.cs
+++ b/DOAN.Admin.WebApi/Controllers/MES/BI/Andon/AndonDataAnalysisController.cs
@@ -27,7 +27,7 @@ namespace DOAN.WebApi.Controllers.MES.BI
///
///
///
- [HttpPost("list")]
+ [HttpGet("list")]
public IActionResult QueryTodayAndonFaultRecord()
{
@@ -42,7 +42,7 @@ namespace DOAN.WebApi.Controllers.MES.BI
///
///
///
- [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();
diff --git a/DOAN.Service/MES/BI/AndonDataAnalysisService.cs b/DOAN.Service/MES/BI/AndonDataAnalysisService.cs
index 91b6b83..eff33f9 100644
--- a/DOAN.Service/MES/BI/AndonDataAnalysisService.cs
+++ b/DOAN.Service/MES/BI/AndonDataAnalysisService.cs
@@ -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 seriesLine_data_bar = null;
var result01 = Context.Queryable()
.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