Sic-Software
/
Sic.Framework
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Common] 

ProcessHistory默认显示对象集合，标记不存储到数据库
[UI.Client]
优化PM process取消查询功能
This commit is contained in:
hanqiangqiang 2023-12-20 10:34:57 +08:00
parent 7846249e97
commit 1bb929f06e
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MECF.Framework.Common/Aitex/Core/Common/DeviceData/RecipeProcessHistoryData.cs
View File

@ -32,11 +32,11 @@ namespace MECF.Framework.Common.Aitex.Core.Common.DeviceData
{
var phi1 = CustomXmlSerializer.Deserialize<ProcessDeviceItems>(new FileInfo($"Config\\PM\\PM1\\ProcessDeviceItemsPM1.xml"));
PM1ItemList = phi1.ItemList;
DATA.Subscribe($"PM1.ProcessHistoryItemsDefault", () => PM1ItemList, SubscriptionAttribute.FLAG.SaveDB);
DATA.Subscribe($"PM1.ProcessHistoryItemsDefault", () => PM1ItemList, SubscriptionAttribute.FLAG.IgnoreSaveDB);
var phi2 = CustomXmlSerializer.Deserialize<ProcessDeviceItems>(new FileInfo($"Config\\PM\\PM2\\ProcessDeviceItemsPM2.xml"));
PM2ItemList = phi2.ItemList;
DATA.Subscribe($"PM2.ProcessHistoryItemsDefault", () => PM2ItemList, SubscriptionAttribute.FLAG.SaveDB);
DATA.Subscribe($"PM2.ProcessHistoryItemsDefault", () => PM2ItemList, SubscriptionAttribute.FLAG.IgnoreSaveDB);
}
}

6
MECF.Framework.UI.Client/CenterViews/Modules/PM/PMProcessViewModel.cs
View File

@ -1730,9 +1730,7 @@ namespace MECF.Framework.UI.Client.CenterViews.Modules.PM
Task.Run(() =>
{
if (_cts?.Token.CanBeCanceled == true)
{
_cts.Cancel();
}
Thread.Sleep(200);
_busyIndicatorContentExport.Report(new ProgressUpdatingEventArgs(100, 100, ""));
@ -1748,7 +1746,11 @@ namespace MECF.Framework.UI.Client.CenterViews.Modules.PM
foreach (var daySlice in daySlices)
{
if (_cts.IsCancellationRequested)
{
_cts?.Dispose();
return;
}
gasFlowRunVent.Add( GasFlowSqlHelp.GetDayGasFlowSum(daySlice, SystemName, GasFlowSumList));
_busyIndicatorContentExport.Report(new ProgressUpdatingEventArgs(200, 200, $"{daySlice}"));