Sic-Software/SIC-12
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整UI错误部分，修改干泵绑定，更新版本号

Browse Source
This commit is contained in:
hanqiangqiang 2026-06-01 10:03:53 +08:00
parent 32852232e4
commit 1948f4290d
5 changed files with 97 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SicRT/Properties/AssemblyInfo.cs
View File

@ -51,7 +51,7 @@ using System.Windows;
// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
// 方法是按如下所示使用“*”: : // 方法是按如下所示使用“*”: :
[assembly: AssemblyVersion("1.1.2.60529")] [assembly: AssemblyVersion("1.1.3.60601")]
[assembly: AssemblyInformationalVersion("氮化硅12寸（无EFEM）")] [assembly: AssemblyInformationalVersion("氮化硅12寸（无EFEM）")]

2
SicUI/Models/Maintenances/TM/TMView.xaml
View File

@ -2536,7 +2536,7 @@
Canvas.Top="586" Canvas.Top="586"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Center" VerticalAlignment="Center"
DeviceData="{Binding PumpData}" DeviceData="{Binding PumpData1}"
EnableControl="True" /> EnableControl="True" />
<controlUI:AITPumpSIC <controlUI:AITPumpSIC

2
SicUI/Models/Maintenances/TM/TMViewModel.cs
View File

@ -427,7 +427,7 @@ namespace SicUI.Client.Models.Platform.TM
public AITValveData TMPMBBanlance { get; set; } public AITValveData TMPMBBanlance { get; set; }
[Subscription("TM.TMPump1.DeviceData")] [Subscription("TM.TMPump1.DeviceData")]
public AITPumpData PumpData { get; set; } public AITPumpData PumpData1 { get; set; }
[Subscription("TM.TMPump2.DeviceData")] [Subscription("TM.TMPump2.DeviceData")]
public AITPumpData PumpData2 { get; set; } public AITPumpData PumpData2 { get; set; }

128
SicUI/Models/PMs/PMOperationView.xaml
View File

@ -1331,7 +1331,7 @@
x:Name="中间的部分" x:Name="中间的部分"
Grid.Column="0" Grid.Column="0"
Width="1581" Width="1581"
Margin="-20,-10,84,-3" Margin="-60,-10,84,-3"
IsEnabled="{Binding IsServiceMode}"> IsEnabled="{Binding IsServiceMode}">
<Canvas <Canvas
@ -1352,10 +1352,10 @@
<Canvas x:Name="管路"> <Canvas x:Name="管路">
<Label <Label
Canvas.Left="1609" Canvas.Left="1593"
Canvas.Top="588" Canvas.Top="588"
Content="V27" Content="V27"
RenderTransformOrigin="-1.179,0.348" /> RenderTransformOrigin="-1.179,0.348" HorizontalAlignment="Left" VerticalAlignment="Center" />
<Label <Label
Canvas.Left="174" Canvas.Left="174"
Canvas.Top="36" Canvas.Top="36"
@ -1656,15 +1656,15 @@
<industrialcontrol:PipeLine <industrialcontrol:PipeLine
Canvas.Left="274" Canvas.Left="274"
Canvas.Top="43" Canvas.Top="39"
Width="92" Width="96"
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="{Binding V33MoveSpeed}" MoveSpeed="{Binding V33MoveSpeed}"
RightDirection="None"> RightDirection="None" HorizontalAlignment="Center" VerticalAlignment="Top">
<industrialcontrol:PipeLine.RenderTransform> <industrialcontrol:PipeLine.RenderTransform>
<TransformGroup> <TransformGroup>
@ -2050,7 +2050,7 @@
<industrialcontrol:PipeLine <industrialcontrol:PipeLine
Canvas.Left="1483" Canvas.Left="1483"
Canvas.Top="564" Canvas.Top="564"
Width="206" Width="193"
Height="{StaticResource ResourceKey=Pipe_Height}" Height="{StaticResource ResourceKey=Pipe_Height}"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Top" VerticalAlignment="Top"
@ -2070,7 +2070,7 @@
<!--<control:PipeControl GasColor="Yellow" Canvas.Left="1287" Canvas.Top="711" Height="19.994" PipeType="Horizontal" Width="24" />--> <!--<control:PipeControl GasColor="Yellow" Canvas.Left="1287" Canvas.Top="711" Height="19.994" PipeType="Horizontal" Width="24" />-->
<industrialcontrol:PipeLine <industrialcontrol:PipeLine
Canvas.Left="1390" Canvas.Left="1390"
Canvas.Top="747" Canvas.Top="737"
Width="11" Width="11"
Height="{StaticResource ResourceKey=Pipe_Height}" Height="{StaticResource ResourceKey=Pipe_Height}"
CenterColor="{StaticResource ResourceKey=CenterColorPurple}" CenterColor="{StaticResource ResourceKey=CenterColorPurple}"
@ -2117,7 +2117,7 @@
<industrialcontrol:PipeLine <industrialcontrol:PipeLine
Canvas.Left="1346" Canvas.Left="1346"
Canvas.Top="633" Canvas.Top="633"
Width="269" Width="279"
Height="{StaticResource ResourceKey=Pipe_Height}" Height="{StaticResource ResourceKey=Pipe_Height}"
CenterColor="{StaticResource ResourceKey=CenterColorWhite}" CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
EdgeColor="{StaticResource ResourceKey=CenterColorWhite}" EdgeColor="{StaticResource ResourceKey=CenterColorWhite}"
@ -2140,9 +2140,9 @@
RightDirection="None" RightDirection="None"
Visibility="{Binding VisbleOnlyIdle}" /> Visibility="{Binding VisbleOnlyIdle}" />
<industrialcontrol:PipeLine <industrialcontrol:PipeLine
Canvas.Left="1531" Canvas.Left="1450"
Canvas.Top="768" Canvas.Top="785"
Width="76" Width="176"
Height="{StaticResource ResourceKey=Pipe_Height}" Height="{StaticResource ResourceKey=Pipe_Height}"
CenterColor="{StaticResource ResourceKey=EdgeColorBlack}" CenterColor="{StaticResource ResourceKey=EdgeColorBlack}"
EdgeColor="{StaticResource ResourceKey=EdgeColorPurple}" EdgeColor="{StaticResource ResourceKey=EdgeColorPurple}"
@ -2163,11 +2163,63 @@
MoveSpeed="{Binding V72MoveSpeed}" MoveSpeed="{Binding V72MoveSpeed}"
RightDirection="None" /> 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="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="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" />--> <!--<control:PipeControl GasColor="White" Canvas.Left="1445" Canvas.Top="677" Height="44" PipeType="Vertical" Width="19.994" />-->
<industrialcontrol:PipeLine <industrialcontrol:PipeLine
Canvas.Left="1607" Canvas.Left="1627"
Canvas.Top="586" Canvas.Top="586"
Width="30" Width="30"
Height="{StaticResource ResourceKey=Pipe_Height}" Height="{StaticResource ResourceKey=Pipe_Height}"
@ -2187,12 +2239,12 @@
</industrialcontrol:PipeLine.RenderTransform> </industrialcontrol:PipeLine.RenderTransform>
</industrialcontrol:PipeLine> </industrialcontrol:PipeLine>
<industrialcontrol:PipeLine <industrialcontrol:PipeLine
Canvas.Left="1607" Canvas.Left="1627"
Canvas.Top="624" Canvas.Top="624"
Width="145" Width="163"
Height="{StaticResource ResourceKey=Pipe_Height}" Height="{StaticResource ResourceKey=Pipe_Height}"
HorizontalAlignment="Center" HorizontalAlignment="Left"
VerticalAlignment="Top" VerticalAlignment="Center"
CenterColor="{StaticResource ResourceKey=EdgeColorBlack}" CenterColor="{StaticResource ResourceKey=EdgeColorBlack}"
EdgeColor="{StaticResource ResourceKey=EdgeColorPurple}" EdgeColor="{StaticResource ResourceKey=EdgeColorPurple}"
FlowDirection="RightToLeft" FlowDirection="RightToLeft"
@ -2722,7 +2774,7 @@
<!--<control:PipeControl GasColor="Purple" Canvas.Left="1301" Canvas.Top="560" Height="172" PipeType="Vertical" Width="19.994" />--> <!--<control:PipeControl GasColor="Purple" Canvas.Left="1301" Canvas.Top="560" Height="172" PipeType="Vertical" Width="19.994" />-->
<industrialcontrol:PipeLine <industrialcontrol:PipeLine
Canvas.Left="1396" Canvas.Left="1396"
Canvas.Top="586" Canvas.Top="576"
Width="161" Width="161"
Height="{StaticResource ResourceKey=Pipe_Height}" Height="{StaticResource ResourceKey=Pipe_Height}"
HorizontalAlignment="Center" 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="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="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: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 <control:CheckValue2
Canvas.Left="1533" Canvas.Left="1533"
@ -3931,7 +3983,7 @@
</TransformGroup>--> </TransformGroup>-->
<controlRT:ValveBig <controlRT:ValveBig
Canvas.Left="1600" Canvas.Left="1620"
Canvas.Top="590" Canvas.Top="590"
Width="16" Width="16"
Height="15" Height="15"
@ -3941,7 +3993,7 @@
OnOff="{Binding V27.Feedback}" OnOff="{Binding V27.Feedback}"
Tag="V27" Tag="V27"
ValveDirection="ToBottom" ValveDirection="ToBottom"
ValveName="{Binding V27.DisplayName}" /> ValveName="{Binding V27.DisplayName}" HorizontalAlignment="Left" VerticalAlignment="Center" />
<controlRT:ValveBig <controlRT:ValveBig
Canvas.Left="165" Canvas.Left="165"
Canvas.Top="29" Canvas.Top="29"
@ -6261,9 +6313,9 @@
Canvas.Top="299" Canvas.Top="299"
Content="M16" /> Content="M16" />
<Label <Label
Canvas.Left="1494" Canvas.Left="1446"
Canvas.Top="637" Canvas.Top="635"
Content="EPV2" /> Content="EPV2" HorizontalAlignment="Center" VerticalAlignment="Top" />
<Label <Label
Canvas.Left="1439" Canvas.Left="1439"
@ -6317,8 +6369,8 @@
Content="H2" Content="H2"
FontSize="10" /> FontSize="10" />
<Label <Label
Canvas.Left="1558" Canvas.Left="1574"
Canvas.Top="604" Canvas.Top="608"
Content="25mbar" HorizontalAlignment="Left" VerticalAlignment="Center" /> Content="25mbar" HorizontalAlignment="Left" VerticalAlignment="Center" />
<Label <Label
@ -6328,7 +6380,7 @@
<Label <Label
Canvas.Left="1363" Canvas.Left="1363"
Canvas.Top="745" Canvas.Top="735"
Content="Leak Check" Content="Leak Check"
Visibility="{Binding VisbleOnlyIdle}" /> Visibility="{Binding VisbleOnlyIdle}" />
@ -6343,9 +6395,9 @@
Content="To TM Pump" HorizontalAlignment="Left" VerticalAlignment="Center" /> Content="To TM Pump" HorizontalAlignment="Left" VerticalAlignment="Center" />
<Label <Label
Canvas.Left="1550" Canvas.Left="1535"
Canvas.Top="768" Canvas.Top="747"
Content="Scrubber Exhaust" /> Content="Scrubber Exhaust" HorizontalAlignment="Center" VerticalAlignment="Top" />
<StackPanel <StackPanel
Canvas.Left="1380" Canvas.Left="1380"
@ -6719,20 +6771,26 @@
</Canvas> </Canvas>
<controlRT:AITPumpSIC <controlRT:AITPumpSIC
Canvas.Left="1274" Canvas.Left="1220"
Canvas.Top="753" Canvas.Top="760"
DeviceData="{Binding PumpData}" DeviceData="{Binding PumpData1}"
EnableControl="True" />
<controlRT:AITPumpSIC
Canvas.Left="1340"
Canvas.Top="760"
DeviceData="{Binding PumpData2}"
EnableControl="True" /> EnableControl="True" />
<deviceControl:AITThrottleValve2 <deviceControl:AITThrottleValve2
Canvas.Left="1460" Canvas.Left="1460"
Canvas.Top="673" Canvas.Top="669"
Width="19" Width="19"
Height="17" Height="17"
Command="{Binding CmdTvEnable}" Command="{Binding CmdTvEnable}"
CommandReset="{Binding CmdTvReset}" CommandReset="{Binding CmdTvReset}"
DeviceData="{Binding TV}" DeviceData="{Binding TV}"
RenderTransformOrigin="-1.667,1.222" /> RenderTransformOrigin="-1.667,1.222" HorizontalAlignment="Center" VerticalAlignment="Top" />
<Canvas <Canvas
x:Name="源" x:Name="源"

2
SicUI/Properties/AssemblyInfo.cs
View File

@ -55,6 +55,6 @@ using System.Windows;
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.1.2.60529")] [assembly: AssemblyVersion("1.1.3.60601")]
[assembly: AssemblyInformationalVersion("氮化硅12寸（无EFEM）")] [assembly: AssemblyInformationalVersion("氮化硅12寸（无EFEM）")]