From c8fb6c077fd890852d2887d3fd41a9798b2b4944 Mon Sep 17 00:00:00 2001 From: hanqiangqiang <1364346467@qq.com> Date: Wed, 17 Jun 2026 15:15:17 +0800 Subject: [PATCH] =?UTF-8?q?PM=E6=B0=94=E8=B7=AFUI=E7=BE=8E=E5=8C=96?= =?UTF-8?q?=E5=B8=83=E5=B1=80=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App/SicUI/Models/PMs/PMOperationView.xaml | 1263 +++++++++++++-------- 1 file changed, 803 insertions(+), 460 deletions(-) diff --git a/App/SicUI/Models/PMs/PMOperationView.xaml b/App/SicUI/Models/PMs/PMOperationView.xaml index 06759b3..9aee4be 100644 --- a/App/SicUI/Models/PMs/PMOperationView.xaml +++ b/App/SicUI/Models/PMs/PMOperationView.xaml @@ -1355,7 +1355,7 @@ - - - + - - - + - + + + + + + + + + + + + + @@ -1719,8 +1701,6 @@ Canvas.Top="506" Width="28" Height="{StaticResource ResourceKey=Pipe_Height}" - HorizontalAlignment="Left" - VerticalAlignment="Center" CenterColor="{StaticResource ResourceKey=CenterColorPurple}" EdgeColor="{StaticResource ResourceKey=EdgeColorBlack}" FlowDirection="RightToLeft" @@ -1751,8 +1731,6 @@ Canvas.Top="534" Width="260" Height="{StaticResource ResourceKey=Pipe_Height}" - HorizontalAlignment="Left" - VerticalAlignment="Center" CenterColor="{StaticResource ResourceKey=CenterColorPurple}" EdgeColor="{StaticResource ResourceKey=EdgeColorBlack}" FlowDirection="RightToLeft" @@ -1794,8 +1772,6 @@ Canvas.Top="250" Width="392" Height="{StaticResource ResourceKey=Pipe_Height}" - HorizontalAlignment="Left" - VerticalAlignment="Center" CenterColor="{StaticResource ResourceKey=EdgeColorGray}" EdgeColor="{StaticResource ResourceKey=EdgeColorYellow}" FlowDirection="RightToLeft" @@ -1839,8 +1815,6 @@ Canvas.Top="426" Width="16" Height="15" - HorizontalAlignment="Center" - VerticalAlignment="Top" Command="{Binding CmdTurnGasValve}" DefaultOpen="{Binding V35.DefaultValue}" HideBlinding="True" @@ -1882,8 +1856,6 @@ Canvas.Top="496" Width="16" Height="15" - HorizontalAlignment="Left" - VerticalAlignment="Center" Command="{Binding CmdTurnGasValve}" DefaultOpen="{Binding V35.DefaultValue}" HideBlinding="True" @@ -1898,8 +1870,6 @@ Canvas.Top="499" Width="16" Height="15" - HorizontalAlignment="Left" - VerticalAlignment="Center" Command="{Binding CmdTurnGasValve}" DefaultOpen="{Binding V35.DefaultValue}" HideBlinding="True" @@ -1917,8 +1887,6 @@ Canvas.Top="310" Width="126" Height="{StaticResource ResourceKey=Pipe_Height}" - HorizontalAlignment="Left" - VerticalAlignment="Center" CenterColor="{StaticResource ResourceKey=CenterColorPurple}" EdgeColor="{StaticResource ResourceKey=CenterColorWhite}" FlowDirection="RightToLeft" @@ -1947,8 +1915,6 @@ Canvas.Top="117" Width="319" Height="{StaticResource ResourceKey=Pipe_Height}" - HorizontalAlignment="Left" - VerticalAlignment="Center" CenterColor="{StaticResource ResourceKey=CenterColorPurple}" EdgeColor="{StaticResource ResourceKey=CenterColorWhite}" FlowDirection="RightToLeft" @@ -1975,8 +1941,6 @@ Canvas.Top="434" Width="95" Height="{StaticResource ResourceKey=Pipe_Height}" - HorizontalAlignment="Left" - VerticalAlignment="Center" CenterColor="{StaticResource ResourceKey=CenterColorPurple}" EdgeColor="{StaticResource ResourceKey=CenterColorWhite}" FlowDirection="RightToLeft" @@ -1988,10 +1952,8 @@ Canvas.Top="436" Width="206" Height="{StaticResource ResourceKey=Pipe_Height}" - HorizontalAlignment="Left" - VerticalAlignment="Center" - CenterColor="{StaticResource ResourceKey=EdgeColorRed}" - EdgeColor="{StaticResource ResourceKey=EdgeColorRed}" + CenterColor="{StaticResource ResourceKey=CenterColorPurple}" + EdgeColor="{StaticResource ResourceKey=CenterColorWhite}" FlowDirection="RightToLeft" LeftDirection="None" RightDirection="None"> @@ -2018,8 +1980,6 @@ Canvas.Top="506" Width="28" Height="{StaticResource ResourceKey=Pipe_Height}" - HorizontalAlignment="Left" - VerticalAlignment="Center" CenterColor="{StaticResource ResourceKey=CenterColorPurple}" EdgeColor="{StaticResource ResourceKey=EdgeColorBlack}" FlowDirection="RightToLeft" @@ -2041,8 +2001,6 @@ Canvas.Top="270" Width="372" Height="{StaticResource ResourceKey=Pipe_Height}" - HorizontalAlignment="Left" - VerticalAlignment="Center" CenterColor="{StaticResource ResourceKey=EdgeColorGray}" EdgeColor="{StaticResource ResourceKey=EdgeColorGreen}" FlowDirection="RightToLeft" @@ -2069,10 +2027,8 @@ @@ -2294,8 +2236,6 @@ Canvas.Top="506" Width="28" Height="{StaticResource ResourceKey=Pipe_Height}" - HorizontalAlignment="Left" - VerticalAlignment="Center" CenterColor="{StaticResource ResourceKey=CenterColorPurple}" EdgeColor="{StaticResource ResourceKey=EdgeColorBlack}" FlowDirection="RightToLeft" @@ -2317,8 +2257,6 @@ Canvas.Top="290" Width="352" Height="{StaticResource ResourceKey=Pipe_Height}" - HorizontalAlignment="Left" - VerticalAlignment="Center" CenterColor="{StaticResource ResourceKey=CenterColorWhite}" EdgeColor="{StaticResource ResourceKey=EdgeColorBlue}" FlowDirection="RightToLeft" @@ -2334,10 +2272,8 @@ @@ -2573,8 +2493,6 @@ Canvas.Top="506" Width="28" Height="{StaticResource ResourceKey=Pipe_Height}" - HorizontalAlignment="Left" - VerticalAlignment="Center" CenterColor="{StaticResource ResourceKey=CenterColorPurple}" EdgeColor="{StaticResource ResourceKey=EdgeColorBlack}" FlowDirection="RightToLeft" @@ -2596,8 +2514,6 @@ Canvas.Top="310" Width="332" Height="{StaticResource ResourceKey=Pipe_Height}" - HorizontalAlignment="Left" - VerticalAlignment="Center" CenterColor="{StaticResource ResourceKey=EdgeColorGray}" EdgeColor="{StaticResource ResourceKey=EdgeColorLightCoral}" FlowDirection="RightToLeft" @@ -2624,10 +2540,8 @@ + + + + + + + + + + @@ -2722,10 +2654,8 @@ Canvas.Top="616" Width="48" Height="{StaticResource ResourceKey=Pipe_Height}" - HorizontalAlignment="Left" - VerticalAlignment="Center" CenterColor="{StaticResource ResourceKey=EdgeColorGray}" - EdgeColor="{StaticResource ResourceKey=EdgeColorLightCoral}" + EdgeColor="{StaticResource ResourceKey=EdgeColorGreen}" FlowDirection="RightToLeft" LeftDirection="None" RightDirection="None"> @@ -2736,13 +2666,12 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + - + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -3911,8 +4233,6 @@ Canvas.Top="321" Width="306" Height="{StaticResource ResourceKey=Pipe_Height}" - HorizontalAlignment="Left" - VerticalAlignment="Center" CenterColor="{StaticResource ResourceKey=CenterColorPurple}" EdgeColor="{StaticResource ResourceKey=CenterColorWhite}" FlowDirection="RightToLeft" @@ -3925,13 +4245,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4422,8 +4784,6 @@ Canvas.Top="-80" Width="70" Height="{StaticResource ResourceKey=Pipe_Height}" - HorizontalAlignment="Left" - VerticalAlignment="Center" CenterColor="{StaticResource ResourceKey=CenterColorPurple}" EdgeColor="{StaticResource ResourceKey=CenterColorWhite}" FlowDirection="LeftToRight" @@ -4436,8 +4796,6 @@ Canvas.Top="-80" Width="62" Height="{StaticResource ResourceKey=Pipe_Height}" - HorizontalAlignment="Left" - VerticalAlignment="Center" CenterColor="{StaticResource ResourceKey=CenterColorPurple}" EdgeColor="{StaticResource ResourceKey=CenterColorWhite}" FlowDirection="RightToLeft" @@ -4455,8 +4813,6 @@ Canvas.Top="16" Width="216" Height="{StaticResource ResourceKey=Pipe_Height}" - HorizontalAlignment="Left" - VerticalAlignment="Center" CenterColor="{StaticResource ResourceKey=EdgeColorBlack}" EdgeColor="{StaticResource ResourceKey=EdgeColorPurple}" FlowDirection="RightToLeft" @@ -4474,8 +4830,6 @@ Canvas.Top="14" Width="78" Height="{StaticResource ResourceKey=Pipe_Height}" - HorizontalAlignment="Left" - VerticalAlignment="Center" CenterColor="{StaticResource ResourceKey=CenterColorPurple}" EdgeColor="{StaticResource ResourceKey=EdgeColorBlack}" FlowDirection="RightToLeft" @@ -4489,8 +4843,6 @@ Canvas.Top="-13" Width="220" Height="{StaticResource ResourceKey=Pipe_Height}" - HorizontalAlignment="Left" - VerticalAlignment="Center" CenterColor="{StaticResource ResourceKey=CenterColorWhite}" EdgeColor="{StaticResource ResourceKey=CenterColorWhite}" FlowDirection="RightToLeft" @@ -4503,41 +4855,60 @@ - - - - + + + + + + + + + + + + + + + + @@ -4792,8 +5143,6 @@ Canvas.Top="70" Width="16" Height="15" - HorizontalAlignment="Left" - VerticalAlignment="Center" Command="{Binding CmdTurnGasValve}" HideBlinding="True" OnOff="{Binding EPV2.Feedback}" @@ -4806,8 +5155,6 @@ Canvas.Top="102" Width="19" Height="17" - HorizontalAlignment="Left" - VerticalAlignment="Center" Command="{Binding CmdTvEnable}" CommandReset="{Binding CmdTvReset}" DeviceData="{Binding TV}" @@ -4819,8 +5166,6 @@ Canvas.Top="118" Width="16" Height="15" - HorizontalAlignment="Left" - VerticalAlignment="Center" Command="{Binding CmdTurnGasValve}" HideBlinding="True" OnOff="{Binding EPV2.Feedback}" @@ -4834,8 +5179,6 @@ Canvas.Top="90" Width="16" Height="15" - HorizontalAlignment="Left" - VerticalAlignment="Center" Command="{Binding CmdTurnGasValve}" DefaultOpen="{Binding V69.DefaultValue}" HideBlinding="True" @@ -4850,8 +5193,6 @@ Canvas.Top="140" Width="16" Height="15" - HorizontalAlignment="Left" - VerticalAlignment="Center" Command="{Binding CmdTurnGasValve}" DefaultOpen="{Binding V69.DefaultValue}" HideBlinding="True" @@ -4867,19 +5208,21 @@ DeviceData="{Binding PumpData}" EnableControl="True" /> - - + + + - - + + - - + + +