fix bug leak无法触发 limitCount ErrorCommand

Furnace/FurnaceRT/Equipments/PMs/PMLeakCheck.cs

@@ -52,7 +52,7 @@ namespace FurnaceRT.Equipments.PMs
             DATA.Subscribe($"{Module}.LeakCheckLowLimit", () => _leakCheckTableParameter != null ? _leakCheckTableParameter.LowLimit : 0.0f);
             DATA.Subscribe($"{Module}.LeakCheckBasePressureLimit", () => _leakCheckTableParameter != null ? _leakCheckTableParameter.BasePressureLimit : 0.0f);
             DATA.Subscribe($"{Module}.LeakCheckDelayTime", () => _leakCheckTableParameter != null ? _leakCheckTableParameter.DelayTime : 0.0f);
-            DATA.Subscribe($"{Module}.LeakCheckDelayElapseTime", () => (_leakCheckTableParameter != null && _leakCheckStatus.Equals("LeakCheckDelay") && _leakCheckDelayTimer.IsRunning) || _leakCheckTimer.IsRunning ? _leakCheckDelayTimer.ElapsedMilliseconds / 1000 : 0.0f);
+            DATA.Subscribe($"{Module}.LeakCheckDelayElapseTime", () => (_leakCheckTableParameter != null && _leakCheckStatus.Equals("LeakCheckDelay") && _leakCheckDelayTimer.IsRunning) ? _leakCheckDelayTimer.ElapsedMilliseconds / 1000 : 0.0f);
             DATA.Subscribe($"{Module}.LeakCheckCheckTime", () => _leakCheckTableParameter != null ? _leakCheckTableParameter.CheckTime : 0.0f);
             DATA.Subscribe($"{Module}.LeakCheckElapseTime", () => _leakCheckTableParameter != null && !_leakCheckStatus.Equals("None") && _leakCheckTimer.IsRunning ? _leakCheckTimer.ElapsedMilliseconds / 1000 : 0.0f);
             DATA.Subscribe($"{Module}.LeakCheckBasePressure", () => _leakCheckTableParameter != null ? _basePressure : 0.0f);
@@ -291,6 +291,7 @@ namespace FurnaceRT.Equipments.PMs
                 {
                     _leakCheckDelayMonitorPressure = leakCheckParameter.PressureSensor.Value;
                     _leakCheckStatus = "LeakCheckDelay";
+           
 
                 }
             }
@@ -298,6 +299,7 @@ namespace FurnaceRT.Equipments.PMs
             {
                 _leakCheckMonitorPressure = leakCheckParameter.PressureSensor.Value;
                 _leakCheckStartPressure = _leakCheckDelayMonitorPressure;
+                _leakCheckDelayTimer.Reset();
             }
 
             if (_leakCheckTimer.IsRunning && _leakCheckTimer.ElapsedMilliseconds >= leakCheckParameter.CheckTime * 1000)
@@ -330,6 +332,7 @@ namespace FurnaceRT.Equipments.PMs
                 }
                 else
                 {
+
                     _isLeakCheckFinished = true;
                     _leakCheckStatus = "None";
                     _leakCheckTimer.Stop();
@@ -343,7 +346,7 @@ namespace FurnaceRT.Equipments.PMs
         public void AbortLeakCheck()
         {
             _leakCheckStatus = "None";
-            _currentRetryCount = 0;
+         
             if (_leakCheckDelayTimer.IsRunning)
                 _leakCheckDelayTimer.Stop();
 

Furnace/FurnaceUI/Views/Operations/PressureDetailView.xaml

@@ -260,7 +260,15 @@
                                 <Border>
                                     <Label Content="Retry Count:"/>
                                 </Border>
-                                 <TextBox  Tag="None"  IsReadOnly="True"    Text="{Binding LeakCheckRetryCurrentCount}"/>
+                                <Label  BorderBrush="#ccc" BorderThickness="1" Padding="5" Background="White" HorizontalContentAlignment="Center"  Width="90"   >
+                                    <Label.Content>
+                                        <StackPanel Orientation="Horizontal">
+                                            <TextBlock  Tag="None"      Text="{Binding LeakCheckRetryCurrentCount}" />
+                                            <TextBlock  Tag="None"      Text="/" Margin="10,0,10,0" />
+                                            <TextBlock  Tag="None"      Text="{Binding LeakCheckRetryLimit}" />
+                                        </StackPanel>
+                                    </Label.Content>
+                                </Label>
                             </StackPanel>
                             <StackPanel Orientation="Horizontal" >
                                 <Border>