修正柱状图
This commit is contained in:
parent
e9a416e2e5
commit
005bb4751c
@ -123,7 +123,7 @@ namespace ZR.Service.MES.andon
|
||||
.AndIF(query.DateTimeRange.Count() == 2 && query.DateTimeRange[0] > DateTime.MinValue, it => it.StartTime <= query.DateTimeRange[1]);
|
||||
|
||||
List<AndonFaultRecord> InitData = Context.Queryable<AndonFaultRecord>().Where(predicate.ToExpression()).ToList();
|
||||
List<DateTime> Xdata = GetOccupiedDates(query.DateTimeRange[0], query.DateTimeRange[0]);
|
||||
List<DateTime> Xdata = GetOccupiedDates(query.DateTimeRange[0], query.DateTimeRange[1]);
|
||||
|
||||
|
||||
|
||||
@ -143,7 +143,7 @@ namespace ZR.Service.MES.andon
|
||||
{
|
||||
DateTime midnight = GetMidnightTime(xdata);
|
||||
DateTime noon = GetNoonTime(xdata);
|
||||
Data[Xdata.IndexOf(xdata)] =InitData.Where(it => it.StartTime >= noon && it.StartTime <= midnight).Sum(it=>it.Duration);
|
||||
Data[Xdata.IndexOf(xdata)] =InitData.Where(it => it.StartTime >= midnight && it.StartTime <= noon).Sum(it=>it.Duration);
|
||||
exceptionDistributionResult.ExceptionTimeTotal = exceptionDistributionResult.ExceptionTimeTotal+ Data[Xdata.IndexOf(xdata)];
|
||||
}
|
||||
EveTIME.Data = Data;
|
||||
@ -163,7 +163,7 @@ namespace ZR.Service.MES.andon
|
||||
{
|
||||
DateTime midnight = GetMidnightTime(xdata);
|
||||
DateTime noon = GetNoonTime(xdata);
|
||||
Data[Xdata.IndexOf(xdata)] = InitData.Where(it => it.StartTime >= noon && it.StartTime <= midnight).Count();
|
||||
Data[Xdata.IndexOf(xdata)] = InitData.Where(it => it.StartTime >= midnight && it.StartTime <= noon).Count();
|
||||
exceptionDistributionResult.ExceptionNumTotal = exceptionDistributionResult.ExceptionNumTotal+Data[Xdata.IndexOf(xdata)];
|
||||
}
|
||||
EveTNUM.Data = Data;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user