删除PM2中的V34配置

App/Modules/SicModules/Config/PM/PM2/DeviceModelPM2.xml

@@ -79,7 +79,6 @@
     <IoValve id="V32" display="ArSupply" schematicId="V32" unit="" isNc="true" isDefaultOpen="false" diOpen="DI_ArSupplyFB(V32)" doOpen="DO_ArSupply(V32)" diCloseSensor="" diOpenSensor="" />
     <IoValve id="V33" display="H2ArSwitch" schematicId="V33" unit="" isNc="true" isDefaultOpen="false" diOpen="DI_SHH2/ArSwitchFB(V33)" doOpen="DO_SHH2/ArSwitch(V33)" diCloseSensor="" diOpenSensor="" />
     <IoValve id="V33s" display="H2ArSwitch" schematicId="V33s" unit="" isNc="false" isDefaultOpen="true" diOpen="DI_SHH2/ArSwitchFB(V33)" doOpen="DO_SHH2/ArSwitch(V33)" diCloseSensor="" diOpenSensor="" />
-    <IoValve id="V34" display="NH3Source" schematicId="V34" unit="" isNc="true" isDefaultOpen="false" diOpen="DI_H2SupplyFB(V30)" doOpen="DO_H2Supply(V30)" diCloseSensor="" diOpenSensor="" />
     <IoValve id="V35" display="H2ArLine1" schematicId="V35" unit="" isNc="true" isDefaultOpen="false" diOpen="DI_H2ArLine1FB(V35)" doOpen="DO_H2ArLine1(V35)" diCloseSensor="" diOpenSensor="" />
     <IoValve id="V36" display="H2ArLine2" schematicId="V36" unit="" isNc="false" isDefaultOpen="true" diOpen="DI_H2ArLine2FB(V36)" doOpen="DO_H2ArLine2(V36)" diCloseSensor="" diOpenSensor="" />
     <IoValve id="V37" display="N2.Switch" schematicId="V37" unit="" isNc="false" isDefaultOpen="true" diOpen="DI_N2SwitchFB(V37)" doOpen="DO_N2Switch(V37)" diCloseSensor="" diOpenSensor="" />
@@ -708,9 +707,6 @@
     <RecipeValveAction id="N2NH3_16HighFlowMode" display="" schematicId="" unit="">
       <Valve Name="V47"  Vent="false" Run="true" />
     </RecipeValveAction>
-    <RecipeValveAction id="V34Value" display="" schematicId="" unit="">
-      <Valve Name="V34" Open="true" Close="false" />
-    </RecipeValveAction>
     <RecipeValveAction id="V38Value" display="" schematicId="" unit="">
       <Valve Name="V38" Open="true" Close="false" />
     </RecipeValveAction>

App/SicUI/Models/PMs/PMOperationView.xaml

@@ -1354,8 +1354,10 @@
                     <Label
                         Canvas.Left="1593"
                         Canvas.Top="588"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         Content="V27"
-                        RenderTransformOrigin="-1.179,0.348" HorizontalAlignment="Left" VerticalAlignment="Center" />
+                        RenderTransformOrigin="-1.179,0.348" />
                     <Label
                         Canvas.Left="174"
                         Canvas.Top="36"
@@ -1652,19 +1654,23 @@
                     <Label
                         Canvas.Left="1587"
                         Canvas.Top="532"
-                        Content="V76" HorizontalAlignment="Left" VerticalAlignment="Center" />
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        Content="V76" />
 
                     <industrialcontrol:PipeLine
                         Canvas.Left="274"
                         Canvas.Top="64"
                         Width="73"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Top"
                         CenterColor="{StaticResource ResourceKey=CenterColorPurple}"
                         EdgeColor="{StaticResource ResourceKey=CenterColorWhite}"
                         FlowDirection="RightToLeft"
                         LeftDirection="None"
                         MoveSpeed="{Binding V33MoveSpeed}"
-                        RightDirection="None" HorizontalAlignment="Center" VerticalAlignment="Top">
+                        RightDirection="None">
                         <industrialcontrol:PipeLine.RenderTransform>
                             <TransformGroup>
 
@@ -2168,12 +2174,14 @@
                         Canvas.Top="755"
                         Width="44"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
                         EdgeColor="{StaticResource ResourceKey=CenterColorWhite}"
                         FlowDirection="RightToLeft"
                         LeftDirection="None"
                         MoveSpeed="{Binding V72MoveSpeed}"
-                        RightDirection="None" HorizontalAlignment="Left" VerticalAlignment="Center" />
+                        RightDirection="None" />
                     <industrialcontrol:PipeLine
                         Canvas.Left="1459"
                         Canvas.Top="755"
@@ -3963,7 +3971,11 @@
                     <control:ValveBig HideBlinding="True" ValveName="V11" Tag="V11" OnOff="{Binding V11.Feedback}" Command="{Binding CmdTurnGasValve}" Height="15"   ValveDirection="ToRight" Width="16" Canvas.Left="98.663" Canvas.Top="385" />
                     <control:ValveBig HideBlinding="True" ValveName="V11" Tag="V11" OnOff="{Binding V11.Feedback}" Command="{Binding CmdTurnGasValve}" Height="15"   ValveDirection="ToRight" Width="16" Canvas.Left="98.663" Canvas.Top="415" />
                     <control:ValveBig HideBlinding="True" ValveName="V11" Tag="V11" OnOff="{Binding V11.Feedback}" Command="{Binding CmdTurnGasValve}" Height="15"   ValveDirection="ToRight" Width="16" Canvas.Left="98.663" Canvas.Top="605"   />-->
-                    <control:CheckValue2 Canvas.Left="1616" Canvas.Top="615" HorizontalAlignment="Left" VerticalAlignment="Center" />
+                    <control:CheckValue2
+                        Canvas.Left="1616"
+                        Canvas.Top="615"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center" />
 
                     <control:CheckValue2
                         Canvas.Left="1533"
@@ -3987,13 +3999,15 @@
                         Canvas.Top="590"
                         Width="16"
                         Height="15"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         Command="{Binding CmdTurnGasValve}"
                         DefaultOpen="{Binding V27.DefaultValue}"
                         HideBlinding="True"
                         OnOff="{Binding V27.Feedback}"
                         Tag="V27"
                         ValveDirection="ToBottom"
-                        ValveName="{Binding V27.DisplayName}" HorizontalAlignment="Left" VerticalAlignment="Center" />
+                        ValveName="{Binding V27.DisplayName}" />
                     <controlRT:ValveBig
                         Canvas.Left="165"
                         Canvas.Top="29"
@@ -4592,8 +4606,8 @@
                         Canvas.Top="639"
                         Width="16"
                         Height="15"
-                        DefaultOpen="{Binding EPV2.DefaultValue}"
                         Command="{Binding CmdTurnGasValve}"
+                        DefaultOpen="{Binding EPV2.DefaultValue}"
                         HideBlinding="True"
                         OnOff="{Binding EPV2.Feedback}"
                         Tag="EPV2"
@@ -4654,13 +4668,15 @@
                         Canvas.Top="528"
                         Width="16"
                         Height="15"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         Command="{Binding CmdTurnGasValve}"
                         DefaultOpen="{Binding V76.DefaultValue}"
                         HideBlinding="True"
                         OnOff="{Binding V76.Feedback}"
                         Tag="V76"
                         ValveDirection="ToBottom"
-                        ValveName="{Binding V76.DisplayName}" HorizontalAlignment="Left" VerticalAlignment="Center" />
+                        ValveName="{Binding V76.DisplayName}" />
 
                     <controlRT:AnalogControl2
                         Canvas.Left="537"
@@ -4820,16 +4836,16 @@
                                 RightDirection="None" />
 
                             <industrialcontrol:PipeLine
-    Canvas.Left="1410"
+                                Canvas.Left="1410"
-    Canvas.Top="391"
+                                Canvas.Top="391"
-    Width="136"
+                                Width="136"
-    Height="{StaticResource ResourceKey=Pipe_Height}"
+                                Height="{StaticResource ResourceKey=Pipe_Height}"
-    CenterColor="{StaticResource ResourceKey=CenterColorPurple}"
+                                CenterColor="{StaticResource ResourceKey=CenterColorPurple}"
-    EdgeColor="{StaticResource ResourceKey=CenterColorWhite}"
+                                EdgeColor="{StaticResource ResourceKey=CenterColorWhite}"
-    FlowDirection="RightToLeft"
+                                FlowDirection="RightToLeft"
-    LeftDirection="None"
+                                LeftDirection="None"
-    MoveSpeed="0"
+                                MoveSpeed="0"
-    RightDirection="None" />
+                                RightDirection="None" />
 
                             <industrialcontrol:PipeLine
                                 Canvas.Left="1335"
@@ -5036,8 +5052,8 @@
                         Canvas.Top="74"
                         Width="16"
                         Height="15"
-                        DefaultOpen="{Binding V64.DefaultValue}"
                         Command="{Binding CmdTurnGasValve}"
+                        DefaultOpen="{Binding V64.DefaultValue}"
                         HideBlinding="True"
                         OnOff="{Binding V64.Feedback}"
                         Tag="V64"
@@ -5049,8 +5065,8 @@
                         Canvas.Top="93"
                         Width="16"
                         Height="15"
-                        DefaultOpen="{Binding V65.DefaultValue}"
                         Command="{Binding CmdTurnGasValve}"
+                        DefaultOpen="{Binding V65.DefaultValue}"
                         HideBlinding="True"
                         OnOff="{Binding V65.Feedback}"
                         Tag="V65"
@@ -5096,8 +5112,8 @@
                         Canvas.Top="204"
                         Width="16"
                         Height="15"
-                        DefaultOpen="{Binding V91.DefaultValue}"
                         Command="{Binding CmdTurnGasValve}"
+                        DefaultOpen="{Binding V91.DefaultValue}"
                         HideBlinding="True"
                         OnOff="{Binding V91.Feedback}"
                         Tag="V91"
@@ -5170,8 +5186,8 @@
                         Canvas.Top="97"
                         Width="16"
                         Height="15"
-                        DefaultOpen="{Binding V96.DefaultValue}"
                         Command="{Binding CmdTurnGasValve}"
+                        DefaultOpen="{Binding V96.DefaultValue}"
                         HideBlinding="True"
                         OnOff="{Binding V96.Feedback}"
                         Tag="V96"
@@ -5182,8 +5198,8 @@
                         Canvas.Top="135"
                         Width="16"
                         Height="15"
-                        DefaultOpen="{Binding V95.DefaultValue}"
                         Command="{Binding CmdTurnGasValve}"
+                        DefaultOpen="{Binding V95.DefaultValue}"
                         HideBlinding="True"
                         OnOff="{Binding V95.Feedback}"
                         Tag="V95"
@@ -5194,8 +5210,8 @@
                         Canvas.Top="172"
                         Width="16"
                         Height="15"
-                        DefaultOpen="{Binding V94.DefaultValue}"
                         Command="{Binding CmdTurnGasValve}"
+                        DefaultOpen="{Binding V94.DefaultValue}"
                         HideBlinding="True"
                         OnOff="{Binding V94.Feedback}"
                         Tag="V94"
@@ -5206,8 +5222,8 @@
                         Canvas.Top="210"
                         Width="16"
                         Height="15"
-                        DefaultOpen="{Binding V93.DefaultValue}"
                         Command="{Binding CmdTurnGasValve}"
+                        DefaultOpen="{Binding V93.DefaultValue}"
                         HideBlinding="True"
                         OnOff="{Binding V93.Feedback}"
                         Tag="V93"
@@ -5218,8 +5234,8 @@
                         Canvas.Top="248"
                         Width="16"
                         Height="15"
-                        DefaultOpen="{Binding V92.DefaultValue}"
                         Command="{Binding CmdTurnGasValve}"
+                        DefaultOpen="{Binding V92.DefaultValue}"
                         HideBlinding="True"
                         OnOff="{Binding V92.Feedback}"
                         Tag="V92"
@@ -5230,8 +5246,8 @@
                         Canvas.Top="286"
                         Width="16"
                         Height="15"
-                        DefaultOpen="{Binding V97.DefaultValue}"
                         Command="{Binding CmdTurnGasValve}"
+                        DefaultOpen="{Binding V97.DefaultValue}"
                         HideBlinding="True"
                         OnOff="{Binding V97.Feedback}"
                         Tag="V97"
@@ -5593,14 +5609,14 @@
                         KnotT="Through"
                         ThroughInnerColor="#91b0cd" />-->
                     <control:Knot
-    Canvas.Left="1404"
+                        Canvas.Left="1404"
-    Canvas.Top="388"
+                        Canvas.Top="388"
-    Width="6"
+                        Width="6"
-    Height="6"
+                        Height="6"
-    KnotDirection="ToLeft"
+                        KnotDirection="ToLeft"
-    KnotElliColor="White"
+                        KnotElliColor="White"
-    KnotT="Through"
+                        KnotT="Through"
-    ThroughInnerColor="#91b0cd" />
+                        ThroughInnerColor="#91b0cd" />
                     <control:Knot
                         Canvas.Left="1306"
                         Canvas.Top="437"
@@ -6055,8 +6071,8 @@
                         Canvas.Top="665"
                         Width="16"
                         Height="15"
-                        DefaultOpen="{Binding V39.DefaultValue}"
                         Command="{Binding CmdTurnGasValve}"
+                        DefaultOpen="{Binding V39.DefaultValue}"
                         HideBlinding="True"
                         OnOff="{Binding V39.Feedback}"
                         Tag="V39"
@@ -6067,8 +6083,8 @@
                         Canvas.Top="665"
                         Width="16"
                         Height="15"
-                        DefaultOpen="{Binding V40.DefaultValue}"
                         Command="{Binding CmdTurnGasValve}"
+                        DefaultOpen="{Binding V40.DefaultValue}"
                         HideBlinding="True"
                         OnOff="{Binding V40.Feedback}"
                         Tag="V40"
@@ -6079,8 +6095,8 @@
                         Canvas.Top="665"
                         Width="16"
                         Height="15"
-                        DefaultOpen="{Binding V41.DefaultValue}"
                         Command="{Binding CmdTurnGasValve}"
+                        DefaultOpen="{Binding V41.DefaultValue}"
                         HideBlinding="True"
                         OnOff="{Binding V41.Feedback}"
                         RenderTransformOrigin="0.7,0.028"
@@ -6350,7 +6366,9 @@
                     <Label
                         Canvas.Left="1446"
                         Canvas.Top="635"
-                        Content="EPV2" HorizontalAlignment="Center" VerticalAlignment="Top" />
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Top"
+                        Content="EPV2" />
 
                     <Label
                         Canvas.Left="1439"
@@ -6406,12 +6424,16 @@
                     <Label
                         Canvas.Left="1574"
                         Canvas.Top="608"
-                        Content="25mbar" HorizontalAlignment="Left" VerticalAlignment="Center" />
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        Content="25mbar" />
 
                     <Label
                         Canvas.Left="1539"
                         Canvas.Top="631"
-                        Content="70mbar" HorizontalAlignment="Center" VerticalAlignment="Top" />
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Top"
+                        Content="70mbar" />
 
                     <Label
                         Canvas.Left="1363"
@@ -6423,16 +6445,22 @@
                     <Label
                         Canvas.Left="1568"
                         Canvas.Top="552"
-                        Content="ATM" HorizontalAlignment="Left" VerticalAlignment="Center" />
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        Content="ATM" />
                     <Label
                         Canvas.Left="1574"
                         Canvas.Top="477"
-                        Content="To TM Pump" HorizontalAlignment="Left" VerticalAlignment="Center" />
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        Content="To TM Pump" />
 
                     <Label
                         Canvas.Left="1535"
                         Canvas.Top="747"
-                        Content="Scrubber Exhaust" HorizontalAlignment="Center" VerticalAlignment="Top" />
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Top"
+                        Content="Scrubber Exhaust" />
 
                     <StackPanel
                         Canvas.Left="1380"
@@ -6822,10 +6850,12 @@
                     Canvas.Top="669"
                     Width="19"
                     Height="17"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Top"
                     Command="{Binding CmdTvEnable}"
                     CommandReset="{Binding CmdTvReset}"
                     DeviceData="{Binding TV}"
-                    RenderTransformOrigin="-1.667,1.222" HorizontalAlignment="Center" VerticalAlignment="Top" />
+                    RenderTransformOrigin="-1.667,1.222" />
 
                 <Canvas
                     x:Name="源"