Sic-Software
/
Sic08
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Activity

1.修改ROR M11配置文件的错误 

2.ROR时间间隔和基础压力可统一设置
This commit is contained in:
HCL 2023-10-31 14:20:48 +08:00
parent 1bb1fd34d6
commit 8d89c35b5a
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/Mainframe/Config/PM/MfcRor/MfcRor.xml
View File

@ -383,7 +383,7 @@
<Action Name="Pressure3" Value="Open" />
<Action Name="V53" Value="Open" />
<Action Name="Mfc22" Value="Open" />
<Action Name="Mfc11" Value="Close" />
<Action Name="Mfc10" Value="Close" />
<Action Name="Mfc12" Value="Close" />
</PreAction>

24
SicUI/Models/PMs/PMMfcRorViewModel.cs
View File

@ -54,7 +54,7 @@ namespace SicUI.Models.PMs
public MfcRorData SelectedMfcRorData { get; set; } = new MfcRorData();
public MfcRorData[] SelectedMfcRorDataList { get; set; }
protected override void OnViewLoaded(object view)
{
base.OnViewLoaded(view);
@ -85,13 +85,19 @@ namespace SicUI.Models.PMs
SelectedMfcRorData.Temperature = 293;
SelectedMfcRorData.Interval = 30;
if (SelectedMfcRorData.Interval == 0)
{
SelectedMfcRorData.Interval = 30;
}
if (SelectedMfcRorData.BasePressure == 0)
{
SelectedMfcRorData.BasePressure = 100;
}
//MFC默认的设定流量为量程的一半
SelectedMfcRorData.SetFlow = SelectedMfcRorData.Scale / 2.0;
SelectedMfcRorData.BasePressure = 100;
SelectedMfcRorData.Volume = StandardMfcRorData != null ? StandardMfcRorData.Volume : 0;
SelectedMfcRorData.Module = SystemName;
@ -109,7 +115,7 @@ namespace SicUI.Models.PMs
string[] mfcRorList = SelectedMfcRorArray.Split(',');
if(mfcRorList == null || mfcRorList.Length == 0)
if (mfcRorList == null || mfcRorList.Length == 0)
{
MessageBox.Show("Please Select Mfc First!");
return;
@ -150,12 +156,12 @@ namespace SicUI.Models.PMs
SelectedMfcRorDataList[i].Temperature = 293;
SelectedMfcRorDataList[i].Interval = 30;
SelectedMfcRorDataList[i].Interval = SelectedMfcRorData.Interval;
//MFC默认的设定流量为量程的一半
SelectedMfcRorDataList[i].SetFlow = SelectedMfcRorDataList[i].Scale / 2.0;
SelectedMfcRorDataList[i].BasePressure = 100;
SelectedMfcRorDataList[i].BasePressure = SelectedMfcRorData.BasePressure;
SelectedMfcRorDataList[i].Volume = StandardMfcRorData != null ? StandardMfcRorData.Volume : 0;
@ -197,10 +203,10 @@ namespace SicUI.Models.PMs
if (selection == DialogButton.Yes)
{
InvokeClient.Instance.Service.DoOperation($"{SystemName}.ClearMfcRorData");
}
}
}
public List<T> TableToListModel<T>(DataTable dt) where T : new()
public List<T> TableToListModel<T>(DataTable dt) where T : new()
{
// 定义集合
List<T> ts = new List<T>();