From f6b4a74d7a8bd938c5c0024bb642868483cb53e8 Mon Sep 17 00:00:00 2001
From: hanqiangqiang <1364346467@qq.com>
Date: Wed, 27 May 2026 17:26:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E4=BF=9D=E5=AD=98=E6=96=B0?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=B0=94=E8=B7=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SicUI/Models/PMs/PMOperationView.xaml | 363 ++++++++++++++------------
 1 file changed, 198 insertions(+), 165 deletions(-)

diff --git a/SicUI/Models/PMs/PMOperationView.xaml b/SicUI/Models/PMs/PMOperationView.xaml
index 2032f40..35982c9 100644
--- a/SicUI/Models/PMs/PMOperationView.xaml
+++ b/SicUI/Models/PMs/PMOperationView.xaml
@@ -1409,7 +1409,7 @@
                 x:Name="中间的部分"
                 Grid.Column="0"
                 Width="1581"
-                Margin="-100,1,0,-3"
+                Margin="-100,40,0,-3"
                 HorizontalAlignment="Left"
                 IsEnabled="{Binding IsServiceMode}">
 
@@ -1423,11 +1423,11 @@
                     VerticalAlignment="Center"
                     UseLayoutRounding="False">
                     <controlRT:Reactor
-                        Canvas.Left="39"
+                        Canvas.Left="40"
                         Canvas.Top="-79"
                         IsVisy="{Binding SHLidIsOpen}"
                         RenderTransformOrigin="0.538,0.304"
-                        UpStatus="{Binding BottomSectionStatus}" />
+                        UpStatus="{Binding BottomSectionStatus}" HorizontalAlignment="Left" VerticalAlignment="Center" />
                 </Canvas>
 
                 <Canvas x:Name="管路">
@@ -1443,29 +1443,29 @@
                         RenderTransformOrigin="-1.179,0.348" />
                     <Label
                         Canvas.Left="174"
-                        Canvas.Top="30"
-                        Content="V31" />
+                        Canvas.Top="1"
+                        Content="V31" HorizontalAlignment="Center" VerticalAlignment="Top" />
                     <Label
                         Canvas.Left="168"
-                        Canvas.Top="59"
-                        Content="V32" />
+                        Canvas.Top="44"
+                        Content="V32" HorizontalAlignment="Center" VerticalAlignment="Top" />
                     <Label
-                        Canvas.Left="320"
-                        Canvas.Top="76"
-                        Content="V33" />
+                        Canvas.Left="235"
+                        Canvas.Top="92"
+                        Content="V33" HorizontalAlignment="Center" VerticalAlignment="Top" />
                     <Label
-                        Canvas.Left="249"
+                        Canvas.Left="279"
                         Canvas.Top="65"
                         Content="V33s"
-                        RenderTransformOrigin="-1,0" />
+                        RenderTransformOrigin="-1,0" HorizontalAlignment="Left" VerticalAlignment="Center" />
                     <Label
-                        Canvas.Left="270"
+                        Canvas.Left="300"
                         Canvas.Top="95"
-                        Content="V35" />
+                        Content="V35" HorizontalAlignment="Left" VerticalAlignment="Center" />
                     <Label
-                        Canvas.Left="270"
+                        Canvas.Left="300"
                         Canvas.Top="116"
-                        Content="V36" />
+                        Content="V36" HorizontalAlignment="Left" VerticalAlignment="Center" />
                     <Label
                         Canvas.Left="637"
                         Canvas.Top="284"
@@ -1647,8 +1647,8 @@
                         Canvas.Top="279"
                         Content="V58s" />
                     <Label
-                        Canvas.Left="1438"
-                        Canvas.Top="70"
+                        Canvas.Left="1419"
+                        Canvas.Top="51"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         Content="V68" />
@@ -1661,35 +1661,35 @@
                         Visibility="{Binding VisbleOnlyIdle}" />
 
                     <Label
-                        Canvas.Left="1564"
-                        Canvas.Top="110"
+                        Canvas.Left="1579"
+                        Canvas.Top="62"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         Content="V96 HW"
                         RenderTransformOrigin="5.071,0.609" />
                     <Label
-                        Canvas.Left="1564"
-                        Canvas.Top="150"
+                        Canvas.Left="1579"
+                        Canvas.Top="102"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         Content="V95 ST"
                         RenderTransformOrigin="5.071,0.609" />
                     <Label
-                        Canvas.Left="1563"
-                        Canvas.Top="188"
+                        Canvas.Left="1578"
+                        Canvas.Top="138"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         Content="V94 RO"
                         RenderTransformOrigin="5.071,0.609" />
                     <Label
-                        Canvas.Left="1563"
-                        Canvas.Top="229"
+                        Canvas.Left="1578"
+                        Canvas.Top="173"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         Content="V93 CH"
                         RenderTransformOrigin="5.071,0.609" />
                     <Label
-                        Canvas.Left="1563"
+                        Canvas.Left="1578"
                         Canvas.Top="268"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
@@ -1705,11 +1705,11 @@
                         RenderTransformOrigin="5.071,0.609" />
 
                     <Label
-                        Canvas.Left="1355"
-                        Canvas.Top="71"
+                        Canvas.Left="1133"
+                        Canvas.Top="84"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Content="V111 LP"
+                        Content="V65"
                         RenderTransformOrigin="5.071,0.609" />
 
 
@@ -1815,16 +1815,16 @@
 
 
                     <industrialcontrol:PipeLine
-                        Canvas.Left="244"
-                        Canvas.Top="56"
-                        Width="79"
+                        Canvas.Left="274"
+                        Canvas.Top="43"
+                        Width="92"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
                         CenterColor="{StaticResource ResourceKey=CenterColorPurple}"
                         EdgeColor="{StaticResource ResourceKey=CenterColorWhite}"
                         FlowDirection="RightToLeft"
                         LeftDirection="None"
                         MoveSpeed="{Binding V33MoveSpeed}"
-                        RightDirection="None">
+                        RightDirection="None" HorizontalAlignment="Center" VerticalAlignment="Top">
                         <industrialcontrol:PipeLine.RenderTransform>
                             <TransformGroup>
                                 <ScaleTransform />
@@ -1835,40 +1835,21 @@
                         </industrialcontrol:PipeLine.RenderTransform>
                     </industrialcontrol:PipeLine>
                     <industrialcontrol:PipeLine
-                        Canvas.Left="242"
-                        Canvas.Top="92"
-                        Width="114"
+                        Canvas.Left="147"
+                        Canvas.Top="88"
+                        Width="125"
                         Height="2"
                         CenterColor="{StaticResource ResourceKey=EdgeColorRed}"
                         EdgeColor="{StaticResource ResourceKey=EdgeColorRed}"
                         LeftDirection="None"
                         MoveSpeed="{Binding V33sMoveSpeed}"
-                        RightDirection="None" />
-                    <industrialcontrol:PipeLine
-                        Canvas.Left="356"
-                        Canvas.Top="33"
-                        Width="60"
-                        Height="{StaticResource ResourceKey=Pipe_Height}"
-                        CenterColor="{StaticResource ResourceKey=EdgeColorRed}"
-                        EdgeColor="{StaticResource ResourceKey=EdgeColorRed}"
-                        FlowDirection="RightToLeft"
-                        LeftDirection="None"
-                        MoveSpeed="{Binding V33sMoveSpeed}"
-                        RightDirection="None">
-                        <industrialcontrol:PipeLine.RenderTransform>
-                            <TransformGroup>
-                                <ScaleTransform />
-                                <SkewTransform />
-                                <RotateTransform Angle="90" />
-                                <TranslateTransform />
-                            </TransformGroup>
-                        </industrialcontrol:PipeLine.RenderTransform>
-                    </industrialcontrol:PipeLine>
+                        RightDirection="None" HorizontalAlignment="Center" VerticalAlignment="Top" />
+
 
 
                     <industrialcontrol:PipeLine
                         Canvas.Left="147"
-                        Canvas.Top="31"
+                        Canvas.Top="2"
                         Width="1410"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
                         CenterColor="{StaticResource ResourceKey=EdgeColorRed}"
@@ -1876,10 +1857,10 @@
                         FlowDirection="RightToLeft"
                         LeftDirection="None"
                         MoveSpeed="{Binding V31MoveSpeed}"
-                        RightDirection="None" />
+                        RightDirection="None" HorizontalAlignment="Center" VerticalAlignment="Top" />
                     <industrialcontrol:PipeLine
                         Canvas.Left="148"
-                        Canvas.Top="56"
+                        Canvas.Top="41"
                         Width="1409"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
                         CenterColor="{StaticResource ResourceKey=CenterColorPurple}"
@@ -1887,11 +1868,11 @@
                         FlowDirection="RightToLeft"
                         LeftDirection="None"
                         MoveSpeed="{Binding V32MoveSpeed}"
-                        RightDirection="None" />
+                        RightDirection="None" HorizontalAlignment="Center" VerticalAlignment="Top" />
                     <industrialcontrol:PipeLine
-                        Canvas.Left="243"
+                        Canvas.Left="273"
                         Canvas.Top="115"
-                        Width="940"
+                        Width="910"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
                         CenterColor="{StaticResource ResourceKey=CenterColorPurple}"
                         EdgeColor="{StaticResource ResourceKey=CenterColorWhite}"
@@ -1900,9 +1881,9 @@
                         MoveSpeed="{Binding V35MoveSpeed}"
                         RightDirection="None" />
                     <industrialcontrol:PipeLine
-                        Canvas.Left="242"
+                        Canvas.Left="272"
                         Canvas.Top="135"
-                        Width="846"
+                        Width="816"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
                         CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
                         EdgeColor="{StaticResource ResourceKey=CenterColorWhite}"
@@ -3568,8 +3549,8 @@
                     </industrialcontrol:PipeLine>
 
                     <industrialcontrol:PipeLine
-                        Canvas.Left="1303"
-                        Canvas.Top="92"
+                        Canvas.Left="1113"
+                        Canvas.Top="79"
                         Width="113"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
                         HorizontalAlignment="Left"
@@ -3598,7 +3579,7 @@
                     <industrialcontrol:PipeLine
                         Canvas.Left="1181"
                         Canvas.Top="172"
-                        Width="237"
+                        Width="227"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
@@ -3612,7 +3593,7 @@
                     <industrialcontrol:PipeLine
                         Canvas.Left="1181"
                         Canvas.Top="209"
-                        Width="237"
+                        Width="227"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
@@ -3625,7 +3606,7 @@
                     <industrialcontrol:PipeLine
                         Canvas.Left="1181"
                         Canvas.Top="248"
-                        Width="237"
+                        Width="227"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
@@ -3638,7 +3619,7 @@
                     <industrialcontrol:PipeLine
                         Canvas.Left="1181"
                         Canvas.Top="286"
-                        Width="237"
+                        Width="227"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
@@ -3652,7 +3633,7 @@
                     <industrialcontrol:PipeLine
                         Canvas.Left="1181"
                         Canvas.Top="327"
-                        Width="237"
+                        Width="227"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
@@ -3664,8 +3645,8 @@
                         RightDirection="None" />
 
                     <industrialcontrol:PipeLine
-                        Canvas.Left="1434"
-                        Canvas.Top="131"
+                        Canvas.Left="1449"
+                        Canvas.Top="83"
                         Width="186"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
                         HorizontalAlignment="Left"
@@ -3677,8 +3658,8 @@
                         MoveSpeed="0"
                         RightDirection="None" />
                     <industrialcontrol:PipeLine
-                        Canvas.Left="1434"
-                        Canvas.Top="169"
+                        Canvas.Left="1449"
+                        Canvas.Top="121"
                         Width="186"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
                         HorizontalAlignment="Left"
@@ -3690,8 +3671,8 @@
                         MoveSpeed="0"
                         RightDirection="None" />
                     <industrialcontrol:PipeLine
-                        Canvas.Left="1434"
-                        Canvas.Top="208"
+                        Canvas.Left="1449"
+                        Canvas.Top="158"
                         Width="186"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
                         HorizontalAlignment="Left"
@@ -3703,8 +3684,8 @@
                         MoveSpeed="0"
                         RightDirection="None" />
                     <industrialcontrol:PipeLine
-                        Canvas.Left="1434"
-                        Canvas.Top="252"
+                        Canvas.Left="1449"
+                        Canvas.Top="196"
                         Width="186"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
                         HorizontalAlignment="Left"
@@ -3716,7 +3697,7 @@
                         MoveSpeed="0"
                         RightDirection="None" />
                     <industrialcontrol:PipeLine
-                        Canvas.Left="1434"
+                        Canvas.Left="1449"
                         Canvas.Top="288"
                         Width="167"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
@@ -3729,7 +3710,7 @@
                         MoveSpeed="0"
                         RightDirection="None" />
                     <industrialcontrol:PipeLine
-                        Canvas.Left="1523"
+                        Canvas.Left="1538"
                         Canvas.Top="319"
                         Width="78"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
@@ -4140,9 +4121,32 @@
                     </industrialcontrol:PipeLine>
 
                     <industrialcontrol:PipeLine
-                        Canvas.Left="1303"
-                        Canvas.Top="92"
-                        Width="40"
+                        Canvas.Left="1194"
+                        Canvas.Top="4"
+                        Width="130"
+                        Height="{StaticResource ResourceKey=Pipe_Height}"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        CenterColor="{StaticResource ResourceKey=CenterColorPurple}"
+                        EdgeColor="{StaticResource ResourceKey=CenterColorWhite}"
+                        FlowDirection="LeftToRight"
+                        LeftDirection="None"
+                        MoveSpeed="{Binding V63MoveSpeed}"
+                        RightDirection="None">
+                        <industrialcontrol:PipeLine.RenderTransform>
+                            <TransformGroup>
+                                <ScaleTransform />
+                                <SkewTransform />
+                                <RotateTransform Angle="90" />
+                                <TranslateTransform />
+                            </TransformGroup>
+                        </industrialcontrol:PipeLine.RenderTransform>
+                    </industrialcontrol:PipeLine>
+
+                    <industrialcontrol:PipeLine
+                        Canvas.Left="1115"
+                        Canvas.Top="43"
+                        Width="36"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
@@ -4212,8 +4216,8 @@
 
                     <!--<control:PipeControl GasColor="White" Canvas.Left="1366.31" Canvas.Top="158" Height="178.99" PipeType="Vertical" Width="19.994" />-->
                     <industrialcontrol:PipeLine
-                        Canvas.Left="1436"
-                        Canvas.Top="58"
+                        Canvas.Left="1451"
+                        Canvas.Top="43"
                         Width="232"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
                         HorizontalAlignment="Left"
@@ -4234,7 +4238,7 @@
                         </industrialcontrol:PipeLine.RenderTransform>
                     </industrialcontrol:PipeLine>
                     <industrialcontrol:PipeLine
-                        Canvas.Left="1418"
+                        Canvas.Left="1408"
                         Canvas.Top="92"
                         Width="263"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
@@ -4243,7 +4247,7 @@
                         FlowDirection="RightToLeft"
                         LeftDirection="None"
                         MoveSpeed="0"
-                        RightDirection="None">
+                        RightDirection="None" HorizontalAlignment="Left" VerticalAlignment="Center">
                         <industrialcontrol:PipeLine.RenderTransform>
                             <TransformGroup>
                                 <ScaleTransform />
@@ -4280,7 +4284,7 @@
                     <!--<control:PipeControl GasColor="White" Canvas.Left="1514" Canvas.Top="158" Height="276" PipeType="Vertical" Width="19.994" />-->
                     <!--<control:PipeControl GasColor="White" Canvas.Left="1540" Canvas.Top="159" Height="304" PipeType="Vertical" Width="19.994" />-->
                     <industrialcontrol:PipeLine
-                        Canvas.Left="1620"
+                        Canvas.Left="1635"
                         Canvas.Top="132"
                         Width="255"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
@@ -4303,7 +4307,7 @@
                     </industrialcontrol:PipeLine>
 
                     <industrialcontrol:PipeLine
-                        Canvas.Left="1601"
+                        Canvas.Left="1616"
                         Canvas.Top="290"
                         Width="31"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
@@ -4326,7 +4330,7 @@
                     </industrialcontrol:PipeLine>
 
                     <industrialcontrol:PipeLine
-                        Canvas.Left="1525"
+                        Canvas.Left="1540"
                         Canvas.Top="320"
                         Width="35"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
@@ -4352,7 +4356,7 @@
                     <!--<control:PipeControl GasColor="White"  Canvas.Left="1459" Canvas.Top="424" Height="19.994" PipeType="Horizontal" Width="65" />-->
                     <!--<control:PipeControl GasColor="White"  Canvas.Left="1460" Canvas.Top="453" Height="19.994" PipeType="Horizontal" Width="90" />-->
                     <industrialcontrol:PipeLine
-                        Canvas.Left="1563"
+                        Canvas.Left="1578"
                         Canvas.Top="385"
                         Width="55"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
@@ -4430,7 +4434,6 @@
                         ValveName="{Binding V27.DisplayName}" />
                     <controlRT:ValveBig
                         Canvas.Left="165"
-                        Canvas.Top="24"
                         Width="16"
                         Height="15"
                         Command="{Binding CmdTurnGasValve}"
@@ -4439,10 +4442,22 @@
                         OnOff="{Binding V31.Feedback}"
                         Tag="V31"
                         ValveDirection="ToRight"
-                        ValveName="{Binding V31.DisplayName}" />
+                        ValveName="{Binding V31.DisplayName}" HorizontalAlignment="Center" VerticalAlignment="Top" Canvas.Top="-6" />
+                    <controlRT:ValveBig
+                        Canvas.Left="165"
+                        Canvas.Top="80"
+                        Width="16"
+                        Height="15"
+                        Command="{Binding CmdTurnGasValve}"
+                        DefaultOpen="{Binding V31.DefaultValue}"
+                        HideBlinding="True"
+                        OnOff="{Binding V31.Feedback}"
+                        Tag="V31"
+                        ValveDirection="ToRight"
+                        ValveName="{Binding V31.DisplayName}" HorizontalAlignment="Center" VerticalAlignment="Top" />
                     <controlRT:ValveBig
                         Canvas.Left="164"
-                        Canvas.Top="50"
+                        Canvas.Top="33"
                         Width="16"
                         Height="15"
                         Command="{Binding CmdTurnGasValve}"
@@ -4451,10 +4466,10 @@
                         OnOff="{Binding V32.Feedback}"
                         Tag="V32"
                         ValveDirection="ToRight"
-                        ValveName="{Binding V32.DisplayName}" />
+                        ValveName="{Binding V32.DisplayName}" HorizontalAlignment="Center" VerticalAlignment="Top" />
                     <controlRT:ValveBig
-                        Canvas.Left="309"
-                        Canvas.Top="87"
+                        Canvas.Left="239"
+                        Canvas.Top="80"
                         Width="16"
                         Height="15"
                         Command="{Binding CmdTurnGasValve}"
@@ -4462,10 +4477,10 @@
                         HideBlinding="True"
                         OnOff="{Binding V33.Feedback}"
                         Tag="V33"
-                        ValveDirection="ToLeft"
-                        ValveName="{Binding V33.DisplayName}" />
+                        ValveDirection="ToRight"
+                        ValveName="{Binding V33.DisplayName}" RenderTransformOrigin="15.186,-1.056" HorizontalAlignment="Center" VerticalAlignment="Top" />
                     <controlRT:ValveBig
-                        Canvas.Left="260"
+                        Canvas.Left="290"
                         Canvas.Top="127"
                         Width="16"
                         Height="15"
@@ -4475,9 +4490,9 @@
                         OnOff="{Binding V36.Feedback}"
                         Tag="V36"
                         ValveDirection="ToRight"
-                        ValveName="{Binding V36.DisplayName}" />
+                        ValveName="{Binding V36.DisplayName}" HorizontalAlignment="Left" VerticalAlignment="Center" />
                     <controlRT:ValveBig
-                        Canvas.Left="260"
+                        Canvas.Left="290"
                         Canvas.Top="107"
                         Width="16"
                         Height="15"
@@ -4487,7 +4502,7 @@
                         OnOff="{Binding V35.Feedback}"
                         Tag="V35"
                         ValveDirection="ToRight"
-                        ValveName="{Binding V35.DisplayName}" />
+                        ValveName="{Binding V35.DisplayName}" HorizontalAlignment="Left" VerticalAlignment="Center" />
                     <controlRT:ValveBig
                         Canvas.Left="668"
                         Canvas.Top="248"
@@ -4795,8 +4810,8 @@
                         ValveDirection="ToBottom"
                         ValveName="{Binding V59.DisplayName}" />
                     <controlRT:ValveBig
-                        Canvas.Left="207"
-                        Canvas.Top="74"
+                        Canvas.Left="237"
+                        Canvas.Top="68"
                         Width="16"
                         Height="15"
                         Command="{Binding CmdTurnGasValve}"
@@ -4806,7 +4821,7 @@
                         RenderTransformOrigin="0.84,0.5"
                         Tag="V33s"
                         ValveDirection="ToBottom"
-                        ValveName="{Binding V33s.DisplayName}" />
+                        ValveName="{Binding V33s.DisplayName}" HorizontalAlignment="Center" VerticalAlignment="Top" />
                     <controlRT:ValveBig
                         Canvas.Left="881"
                         Canvas.Top="589"
@@ -5011,8 +5026,8 @@
 
 
                     <controlRT:ValveBig
-                        Canvas.Left="1429"
-                        Canvas.Top="73"
+                        Canvas.Left="1444"
+                        Canvas.Top="50"
                         Width="16"
                         Height="15"
                         HorizontalAlignment="Left"
@@ -5541,8 +5556,8 @@
                         ValveName="{Binding V87.DisplayName}" />
 
                     <controlRT:ValveBig
-                        Canvas.Left="1344"
-                        Canvas.Top="84"
+                        Canvas.Left="1137"
+                        Canvas.Top="71"
                         Width="16"
                         Height="15"
                         HorizontalAlignment="Left"
@@ -5620,10 +5635,9 @@
                         ValveDirection="ToRight"
                         ValveName="{Binding V91.DisplayName}" />
 
-
                     <controlRT:AnalogControl2
-                        Canvas.Left="1450"
-                        Canvas.Top="270"
+                        Canvas.Left="1465"
+                        Canvas.Top="217"
                         Width="62"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
@@ -5632,8 +5646,29 @@
                         OperationName="SetMfcFlowValue" />
 
                     <controlRT:AnalogControl2
-                        Canvas.Left="1450"
-                        Canvas.Top="232"
+                        Canvas.Left="1465"
+                        Canvas.Top="255"
+                        Width="62"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        Command="{Binding CmdSetMfcFlow}"
+                        DeviceData="{Binding Mfc32Data}"
+                        OperationName="SetMfcFlowValue" />
+
+                    <controlRT:AnalogControl2
+                        Canvas.Left="1465"
+                        Canvas.Top="293"
+                        Width="62"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        Command="{Binding CmdSetMfcFlow}"
+                        DeviceData="{Binding Mfc32Data}"
+                        OperationName="SetMfcFlowValue" />
+
+
+                    <controlRT:AnalogControl2
+                        Canvas.Left="1465"
+                        Canvas.Top="179"
                         Width="62"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
@@ -5642,8 +5677,8 @@
                         OperationName="SetMfcFlowValue" />
 
                     <controlRT:AnalogControl2
-                        Canvas.Left="1450"
-                        Canvas.Top="192"
+                        Canvas.Left="1465"
+                        Canvas.Top="141"
                         Width="62"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
@@ -5651,8 +5686,8 @@
                         DeviceData="{Binding Mfc36Data}"
                         OperationName="SetMfcFlowValue" />
                     <controlRT:AnalogControl2
-                        Canvas.Left="1450"
-                        Canvas.Top="151"
+                        Canvas.Left="1465"
+                        Canvas.Top="103"
                         Width="62"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
@@ -5660,8 +5695,8 @@
                         DeviceData="{Binding Mfc37Data}"
                         OperationName="SetMfcFlowValue" />
                     <controlRT:AnalogControl2
-                        Canvas.Left="1450"
-                        Canvas.Top="114"
+                        Canvas.Left="1465"
+                        Canvas.Top="66"
                         Width="62"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
@@ -5669,8 +5704,8 @@
                         DeviceData="{Binding Mfc38Data}"
                         OperationName="SetMfcFlowValue" />
                     <controlRT:ValveBig
-                        Canvas.Left="1550"
-                        Canvas.Top="123"
+                        Canvas.Left="1565"
+                        Canvas.Top="75"
                         Width="16"
                         Height="15"
                         HorizontalAlignment="Left"
@@ -5682,8 +5717,8 @@
                         ValveDirection="ToRight"
                         ValveName="{Binding V96.DisplayName}" />
                     <controlRT:ValveBig
-                        Canvas.Left="1550"
-                        Canvas.Top="162"
+                        Canvas.Left="1565"
+                        Canvas.Top="113"
                         Width="16"
                         Height="15"
                         HorizontalAlignment="Left"
@@ -5695,8 +5730,8 @@
                         ValveDirection="ToRight"
                         ValveName="{Binding V95.DisplayName}" />
                     <controlRT:ValveBig
-                        Canvas.Left="1550"
-                        Canvas.Top="201"
+                        Canvas.Left="1565"
+                        Canvas.Top="150"
                         Width="16"
                         Height="15"
                         HorizontalAlignment="Left"
@@ -5708,8 +5743,8 @@
                         ValveDirection="ToRight"
                         ValveName="{Binding V94.DisplayName}" />
                     <controlRT:ValveBig
-                        Canvas.Left="1550"
-                        Canvas.Top="244"
+                        Canvas.Left="1565"
+                        Canvas.Top="188"
                         Width="16"
                         Height="15"
                         HorizontalAlignment="Left"
@@ -5721,7 +5756,7 @@
                         ValveDirection="ToRight"
                         ValveName="{Binding V93.DisplayName}" />
                     <controlRT:ValveBig
-                        Canvas.Left="1550"
+                        Canvas.Left="1565"
                         Canvas.Top="280"
                         Width="16"
                         Height="15"
@@ -6083,21 +6118,23 @@
 
                     <control:PressureSwitch
                         Canvas.Left="213"
-                        Canvas.Top="28"
-                        CheckOk="{Binding SI00Data[10]}" />
+                        CheckOk="{Binding SI00Data[10]}" HorizontalAlignment="Center" VerticalAlignment="Top" Canvas.Top="-1" />
                     <Label
                         Canvas.Left="203"
-                        Canvas.Top="32"
-                        Content="PS1" />
+                        Canvas.Top="3"
+                        Content="PS3" HorizontalAlignment="Center" VerticalAlignment="Top"  />
                     <control:PressureSwitch
                         Canvas.Left="211"
-                        Canvas.Top="53"
-                        CheckOk="{Binding SI00Data[10]}"
-                        RenderTransformOrigin="0.508,0.483" />
+                        Canvas.Top="38"
+                        CheckOk="{Binding SI00Data[10]}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+                    <control:PressureSwitch
+                        Canvas.Left="211"
+                        Canvas.Top="84"
+                        CheckOk="{Binding SI00Data[10]}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
                     <Label
                         Canvas.Left="200"
-                        Canvas.Top="58"
-                        Content="PS2" />
+                        Canvas.Top="43"
+                        Content="PS2" HorizontalAlignment="Center" VerticalAlignment="Top" />
 
                     <!--<control:PipeControl GasColor="Black" Canvas.Left="852" Canvas.Top="405" Height="4" PipeType="Horizontal" Width="5" />-->
                     <!--<control:Knot KnotT="Through"  KnotElliColor="Yellow"  KnotDirection="ToTop" Canvas.Left="322" Canvas.Top="133" Height="6" ThroughInnerColor="#91b0cd" Width="6" />-->
@@ -6219,15 +6256,7 @@
                         ThroughInnerColor="#91b0cd"
                         Visibility="Hidden" />
 
-                    <control:Knot
-                        Canvas.Left="356"
-                        Canvas.Top="54"
-                        Width="6"
-                        Height="6"
-                        KnotDirection="ToTop"
-                        KnotElliColor="Yellow"
-                        KnotT="Through"
-                        ThroughInnerColor="#91b0cd" />
+
 
 
                     <!--  PC1,PC2  -->
@@ -6582,14 +6611,14 @@
                         ThroughInnerColor="#91b0cd" />
 
                     <control:Knot
-                        Canvas.Left="337"
+                        Canvas.Left="338"
                         Canvas.Top="131"
                         Width="6"
                         Height="5"
                         KnotDirection="ToLeft"
                         KnotElliColor="White"
                         KnotT="Through"
-                        ThroughInnerColor="#91b0cd" />
+                        ThroughInnerColor="#91b0cd" HorizontalAlignment="Left" VerticalAlignment="Center" />
                     <control:Knot
                         Canvas.Left="426"
                         Canvas.Top="131"
@@ -6737,35 +6766,35 @@
                         RenderTransformOrigin="5.071,0.609" />
 
                     <Label
-                        Canvas.Left="1505"
-                        Canvas.Top="110"
+                        Canvas.Left="1520"
+                        Canvas.Top="98"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         Content="M38"
                         RenderTransformOrigin="5.071,0.609" />
                     <Label
-                        Canvas.Left="1505"
-                        Canvas.Top="150"
+                        Canvas.Left="1520"
+                        Canvas.Top="138"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         Content="M37"
                         RenderTransformOrigin="5.071,0.609" />
                     <Label
-                        Canvas.Left="1505"
-                        Canvas.Top="189"
+                        Canvas.Left="1520"
+                        Canvas.Top="61"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         Content="M36"
                         RenderTransformOrigin="5.071,0.609" />
                     <Label
-                        Canvas.Left="1505"
-                        Canvas.Top="229"
+                        Canvas.Left="1520"
+                        Canvas.Top="173"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         Content="M35"
                         RenderTransformOrigin="5.071,0.609" />
                     <Label
-                        Canvas.Left="1504"
+                        Canvas.Left="1519"
                         Canvas.Top="269"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
@@ -7063,14 +7092,18 @@
 
                     <Label
                         Canvas.Left="120"
-                        Canvas.Top="48"
+                        Canvas.Top="41"
                         Content="Ar"
+                        FontSize="10" HorizontalAlignment="Center" VerticalAlignment="Top" />
+                    <Label
+                        Canvas.Left="120"
+                        Canvas.Top="82"
+                        Content="H2"
                         FontSize="10" />
                     <Label
                         Canvas.Left="120"
-                        Canvas.Top="20"
                         Content="H2"
-                        FontSize="10" />
+                        FontSize="10" HorizontalAlignment="Center" VerticalAlignment="Top" Canvas.Top="-9" />
                     <Label
                         Canvas.Left="1623"
                         Canvas.Top="567"