From 586a6a2c31de1487d97d3d7abd46324bce184058 Mon Sep 17 00:00:00 2001
From: HCL <1625932291@qq.com>
Date: Tue, 31 Oct 2023 10:27:06 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9ROR=20M11=E9=85=8D=E7=BD=AE?=
=?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9A=84=E9=94=99=E8=AF=AF=202.ROR=E6=97=B6?=
=?UTF-8?q?=E9=97=B4=E9=97=B4=E9=9A=94=E5=92=8C=E5=9F=BA=E7=A1=80=E5=8E=8B?=
=?UTF-8?q?=E5=8A=9B=E5=8F=AF=E7=BB=9F=E4=B8=80=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Modules/SicModules/Config/PM/MfcRor/MfcRor.xml | 2 +-
SicUI/Models/PMs/PMMfcRorViewModel.cs | 16 +++++++++++-----
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/Modules/SicModules/Config/PM/MfcRor/MfcRor.xml b/Modules/SicModules/Config/PM/MfcRor/MfcRor.xml
index a3a1d60..6aad586 100644
--- a/Modules/SicModules/Config/PM/MfcRor/MfcRor.xml
+++ b/Modules/SicModules/Config/PM/MfcRor/MfcRor.xml
@@ -383,7 +383,7 @@
-
+
diff --git a/SicUI/Models/PMs/PMMfcRorViewModel.cs b/SicUI/Models/PMs/PMMfcRorViewModel.cs
index 58691fa..0cffaab 100644
--- a/SicUI/Models/PMs/PMMfcRorViewModel.cs
+++ b/SicUI/Models/PMs/PMMfcRorViewModel.cs
@@ -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;