From 1948f4290d308fae8750e0be1aa3f08b4f37cecd Mon Sep 17 00:00:00 2001
From: hanqiangqiang <1364346467@qq.com>
Date: Mon, 1 Jun 2026 10:03:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4UI=E9=94=99=E8=AF=AF=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=B9=B2=E6=B3=B5=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=EF=BC=8C=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SicRT/Properties/AssemblyInfo.cs            |   2 +-
 SicUI/Models/Maintenances/TM/TMView.xaml    |   2 +-
 SicUI/Models/Maintenances/TM/TMViewModel.cs |   2 +-
 SicUI/Models/PMs/PMOperationView.xaml       | 128 ++++++++++++++------
 SicUI/Properties/AssemblyInfo.cs            |   2 +-
 5 files changed, 97 insertions(+), 39 deletions(-)

diff --git a/SicRT/Properties/AssemblyInfo.cs b/SicRT/Properties/AssemblyInfo.cs
index 3619450..624c3b5 100644
--- a/SicRT/Properties/AssemblyInfo.cs
+++ b/SicRT/Properties/AssemblyInfo.cs
@@ -51,7 +51,7 @@ using System.Windows;
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 
-[assembly: AssemblyVersion("1.1.2.60529")]
+[assembly: AssemblyVersion("1.1.3.60601")]
 [assembly: AssemblyInformationalVersion("氮化硅12寸（无EFEM）")]
 
 
diff --git a/SicUI/Models/Maintenances/TM/TMView.xaml b/SicUI/Models/Maintenances/TM/TMView.xaml
index 81dc1ad..6666ced 100644
--- a/SicUI/Models/Maintenances/TM/TMView.xaml
+++ b/SicUI/Models/Maintenances/TM/TMView.xaml
@@ -2536,7 +2536,7 @@
                         Canvas.Top="586"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        DeviceData="{Binding PumpData}"
+                        DeviceData="{Binding PumpData1}"
                         EnableControl="True" />
 
                     <controlUI:AITPumpSIC
diff --git a/SicUI/Models/Maintenances/TM/TMViewModel.cs b/SicUI/Models/Maintenances/TM/TMViewModel.cs
index 69924ce..aac85e0 100644
--- a/SicUI/Models/Maintenances/TM/TMViewModel.cs
+++ b/SicUI/Models/Maintenances/TM/TMViewModel.cs
@@ -427,7 +427,7 @@ namespace SicUI.Client.Models.Platform.TM
         public AITValveData TMPMBBanlance { get; set; }
 
         [Subscription("TM.TMPump1.DeviceData")]
-        public AITPumpData PumpData { get; set; }
+        public AITPumpData PumpData1 { get; set; }
 
         [Subscription("TM.TMPump2.DeviceData")]
         public AITPumpData PumpData2 { get; set; }
diff --git a/SicUI/Models/PMs/PMOperationView.xaml b/SicUI/Models/PMs/PMOperationView.xaml
index 43058d2..7841f60 100644
--- a/SicUI/Models/PMs/PMOperationView.xaml
+++ b/SicUI/Models/PMs/PMOperationView.xaml
@@ -1331,7 +1331,7 @@
                 x:Name="中间的部分"
                 Grid.Column="0"
                 Width="1581"
-                Margin="-20,-10,84,-3"
+                Margin="-60,-10,84,-3"
                 IsEnabled="{Binding IsServiceMode}">
 
                 <Canvas
@@ -1352,10 +1352,10 @@
                 <Canvas x:Name="管路">
 
                     <Label
-                        Canvas.Left="1609"
+                        Canvas.Left="1593"
                         Canvas.Top="588"
                         Content="V27"
-                        RenderTransformOrigin="-1.179,0.348" />
+                        RenderTransformOrigin="-1.179,0.348" HorizontalAlignment="Left" VerticalAlignment="Center" />
                     <Label
                         Canvas.Left="174"
                         Canvas.Top="36"
@@ -1656,15 +1656,15 @@
 
                     <industrialcontrol:PipeLine
                         Canvas.Left="274"
-                        Canvas.Top="43"
-                        Width="92"
+                        Canvas.Top="39"
+                        Width="96"
                         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>
 
@@ -2050,7 +2050,7 @@
                     <industrialcontrol:PipeLine
                         Canvas.Left="1483"
                         Canvas.Top="564"
-                        Width="206"
+                        Width="193"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Top"
@@ -2070,7 +2070,7 @@
                     <!--<control:PipeControl GasColor="Yellow"  Canvas.Left="1287" Canvas.Top="711" Height="19.994" PipeType="Horizontal" Width="24" />-->
                     <industrialcontrol:PipeLine
                         Canvas.Left="1390"
-                        Canvas.Top="747"
+                        Canvas.Top="737"
                         Width="11"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
                         CenterColor="{StaticResource ResourceKey=CenterColorPurple}"
@@ -2117,7 +2117,7 @@
                     <industrialcontrol:PipeLine
                         Canvas.Left="1346"
                         Canvas.Top="633"
-                        Width="269"
+                        Width="279"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
                         CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
                         EdgeColor="{StaticResource ResourceKey=CenterColorWhite}"
@@ -2140,9 +2140,9 @@
                         RightDirection="None"
                         Visibility="{Binding VisbleOnlyIdle}" />
                     <industrialcontrol:PipeLine
-                        Canvas.Left="1531"
-                        Canvas.Top="768"
-                        Width="76"
+                        Canvas.Left="1450"
+                        Canvas.Top="785"
+                        Width="176"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
                         CenterColor="{StaticResource ResourceKey=EdgeColorBlack}"
                         EdgeColor="{StaticResource ResourceKey=EdgeColorPurple}"
@@ -2163,11 +2163,63 @@
                         MoveSpeed="{Binding V72MoveSpeed}"
                         RightDirection="None" />
 
+                    <industrialcontrol:PipeLine
+                        Canvas.Left="1459"
+                        Canvas.Top="755"
+                        Width="44"
+                        Height="{StaticResource ResourceKey=Pipe_Height}"
+                        CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
+                        EdgeColor="{StaticResource ResourceKey=CenterColorWhite}"
+                        FlowDirection="RightToLeft"
+                        LeftDirection="None"
+                        MoveSpeed="{Binding V72MoveSpeed}"
+                        RightDirection="None" HorizontalAlignment="Left" VerticalAlignment="Center" />
+                    <industrialcontrol:PipeLine
+                        Canvas.Left="1459"
+                        Canvas.Top="755"
+                        Width="17"
+                        Height="{StaticResource ResourceKey=Pipe_Height}"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Top"
+                        CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
+                        EdgeColor="{StaticResource ResourceKey=CenterColorWhite}"
+                        FlowDirection="RightToLeft"
+                        LeftDirection="None"
+                        MoveSpeed="{Binding V74MoveSpeed}"
+                        RightDirection="None">
+                        <industrialcontrol:PipeLine.RenderTransform>
+                            <TransformGroup>
+
+                                <RotateTransform Angle="90" />
+                            </TransformGroup>
+                        </industrialcontrol:PipeLine.RenderTransform>
+                    </industrialcontrol:PipeLine>
+
+                    <industrialcontrol:PipeLine
+                        Canvas.Left="1504"
+                        Canvas.Top="755"
+                        Width="17"
+                        Height="{StaticResource ResourceKey=Pipe_Height}"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Top"
+                        CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
+                        EdgeColor="{StaticResource ResourceKey=CenterColorWhite}"
+                        FlowDirection="RightToLeft"
+                        LeftDirection="None"
+                        MoveSpeed="{Binding V74MoveSpeed}"
+                        RightDirection="None">
+                        <industrialcontrol:PipeLine.RenderTransform>
+                            <TransformGroup>
+
+                                <RotateTransform Angle="90" />
+                            </TransformGroup>
+                        </industrialcontrol:PipeLine.RenderTransform>
+                    </industrialcontrol:PipeLine>
                     <!--<control:PipeControl GasColor="Yellow"  Canvas.Left="1367" Canvas.Top="667" Height="19.994" PipeType="Horizontal" Width="193" />-->
                     <!--<control:PipeControl GasColor="White"  Canvas.Left="1455" Canvas.Top="711" Height="19.994" PipeType="Horizontal" Width="35" />-->
                     <!--<control:PipeControl GasColor="White" Canvas.Left="1445" Canvas.Top="677" Height="44" PipeType="Vertical" Width="19.994" />-->
                     <industrialcontrol:PipeLine
-                        Canvas.Left="1607"
+                        Canvas.Left="1627"
                         Canvas.Top="586"
                         Width="30"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
@@ -2187,12 +2239,12 @@
                         </industrialcontrol:PipeLine.RenderTransform>
                     </industrialcontrol:PipeLine>
                     <industrialcontrol:PipeLine
-                        Canvas.Left="1607"
+                        Canvas.Left="1627"
                         Canvas.Top="624"
-                        Width="145"
+                        Width="163"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Top"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         CenterColor="{StaticResource ResourceKey=EdgeColorBlack}"
                         EdgeColor="{StaticResource ResourceKey=EdgeColorPurple}"
                         FlowDirection="RightToLeft"
@@ -2722,7 +2774,7 @@
                     <!--<control:PipeControl GasColor="Purple" Canvas.Left="1301" Canvas.Top="560" Height="172" PipeType="Vertical" Width="19.994" />-->
                     <industrialcontrol:PipeLine
                         Canvas.Left="1396"
-                        Canvas.Top="586"
+                        Canvas.Top="576"
                         Width="161"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
                         HorizontalAlignment="Center"
@@ -3911,7 +3963,7 @@
                     <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="1596" Canvas.Top="615" />
+                    <control:CheckValue2 Canvas.Left="1616" Canvas.Top="615" HorizontalAlignment="Left" VerticalAlignment="Center" />
 
                     <control:CheckValue2
                         Canvas.Left="1533"
@@ -3931,7 +3983,7 @@
                     </TransformGroup>-->
 
                     <controlRT:ValveBig
-                        Canvas.Left="1600"
+                        Canvas.Left="1620"
                         Canvas.Top="590"
                         Width="16"
                         Height="15"
@@ -3941,7 +3993,7 @@
                         OnOff="{Binding V27.Feedback}"
                         Tag="V27"
                         ValveDirection="ToBottom"
-                        ValveName="{Binding V27.DisplayName}" />
+                        ValveName="{Binding V27.DisplayName}" HorizontalAlignment="Left" VerticalAlignment="Center" />
                     <controlRT:ValveBig
                         Canvas.Left="165"
                         Canvas.Top="29"
@@ -6261,9 +6313,9 @@
                         Canvas.Top="299"
                         Content="M16" />
                     <Label
-                        Canvas.Left="1494"
-                        Canvas.Top="637"
-                        Content="EPV2" />
+                        Canvas.Left="1446"
+                        Canvas.Top="635"
+                        Content="EPV2" HorizontalAlignment="Center" VerticalAlignment="Top" />
 
                     <Label
                         Canvas.Left="1439"
@@ -6317,8 +6369,8 @@
                         Content="H2"
                         FontSize="10" />
                     <Label
-                        Canvas.Left="1558"
-                        Canvas.Top="604"
+                        Canvas.Left="1574"
+                        Canvas.Top="608"
                         Content="25mbar" HorizontalAlignment="Left" VerticalAlignment="Center" />
 
                     <Label
@@ -6328,7 +6380,7 @@
 
                     <Label
                         Canvas.Left="1363"
-                        Canvas.Top="745"
+                        Canvas.Top="735"
                         Content="Leak Check"
                         Visibility="{Binding VisbleOnlyIdle}" />
 
@@ -6343,9 +6395,9 @@
                         Content="To TM Pump" HorizontalAlignment="Left" VerticalAlignment="Center" />
 
                     <Label
-                        Canvas.Left="1550"
-                        Canvas.Top="768"
-                        Content="Scrubber Exhaust" />
+                        Canvas.Left="1535"
+                        Canvas.Top="747"
+                        Content="Scrubber Exhaust" HorizontalAlignment="Center" VerticalAlignment="Top" />
 
                     <StackPanel
                         Canvas.Left="1380"
@@ -6719,20 +6771,26 @@
                 </Canvas>
 
                 <controlRT:AITPumpSIC
-                    Canvas.Left="1274"
-                    Canvas.Top="753"
-                    DeviceData="{Binding PumpData}"
+                    Canvas.Left="1220"
+                    Canvas.Top="760"
+                    DeviceData="{Binding PumpData1}"
+                    EnableControl="True" />
+
+                <controlRT:AITPumpSIC
+                    Canvas.Left="1340"
+                    Canvas.Top="760"
+                    DeviceData="{Binding PumpData2}"
                     EnableControl="True" />
 
                 <deviceControl:AITThrottleValve2
                     Canvas.Left="1460"
-                    Canvas.Top="673"
+                    Canvas.Top="669"
                     Width="19"
                     Height="17"
                     Command="{Binding CmdTvEnable}"
                     CommandReset="{Binding CmdTvReset}"
                     DeviceData="{Binding TV}"
-                    RenderTransformOrigin="-1.667,1.222" />
+                    RenderTransformOrigin="-1.667,1.222" HorizontalAlignment="Center" VerticalAlignment="Top" />
 
                 <Canvas
                     x:Name="源"
diff --git a/SicUI/Properties/AssemblyInfo.cs b/SicUI/Properties/AssemblyInfo.cs
index 14e7c72..a919cf2 100644
--- a/SicUI/Properties/AssemblyInfo.cs
+++ b/SicUI/Properties/AssemblyInfo.cs
@@ -55,6 +55,6 @@ using System.Windows;
 // by using the '*' as shown below:
 
 
-[assembly: AssemblyVersion("1.1.2.60529")]
+[assembly: AssemblyVersion("1.1.3.60601")]
 [assembly: AssemblyInformationalVersion("氮化硅12寸（无EFEM）")]