Sic-Software
/
Sic10
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

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

2.ROR时间间隔和基础压力可统一设置
This commit is contained in:
HCL 2023-10-31 10:27:06 +08:00
parent 15f20b57e8
commit 586a6a2c31
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/SicModules/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>

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

@ -86,13 +86,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;
@ -151,12 +157,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;