修改漏添加内容和问题点

This commit is contained in:
hanqiangqiang
2026-08-05 13:22:10 +08:00
parent 989c3a5580
commit dcc4a19d8e
4 changed files with 347 additions and 10 deletions
+342 -6
View File
@@ -4836,7 +4836,342 @@
RenderTransformOrigin="0.538,0.304"
UpStatus="{Binding BottomSectionStatus}" />
<Canvas Canvas.Left="30" Canvas.Top="175">
<StackPanel
Canvas.Left="67"
Canvas.Top="28"
Orientation="Horizontal">
<Grid
Width="60"
Height="27"
Margin="-1"
Cursor="Hand"
Opacity="1">
<Border Background="Transparent" BorderThickness="1">
<Rectangle
Margin="2,1,0,1"
Fill="Gray"
Opacity="1"
RadiusX="2"
RadiusY="2"
Stroke="#373737"
StrokeThickness="1"
Style="{x:Null}" />
</Border>
<Label
Width="61"
Margin="0,-1,0,-1"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
Content="{Binding L3InputTemp}"
ContentStringFormat="{}{0:F1}℃"
FontFamily="Verdana"
Foreground="#FFF"
ToolTip="PSU Outer Pyro Temp" />
</Grid>
<Grid
Width="60"
Height="27"
Margin="-1"
Cursor="Hand"
Opacity="1">
<Border Background="Transparent" BorderThickness="1">
<Rectangle
Margin="1"
Fill="Gray"
Opacity="1"
RadiusX="2"
RadiusY="2"
Stroke="#373737"
StrokeThickness="1"
Style="{x:Null}" />
</Border>
<Label
Width="61"
Margin="0,-1,0,-1"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
Content="{Binding L1InputTemp}"
ContentStringFormat="{}{0:F1}℃"
FontFamily="Verdana"
Foreground="#FFF"
ToolTip="PSU Inner Pyro Temp" />
</Grid>
<Grid
Width="60"
Height="27"
Margin="-1"
Cursor="Hand"
Opacity="1">
<Border Background="Transparent" BorderThickness="1">
<Rectangle
Margin="1"
Fill="Gray"
Opacity="1"
RadiusX="2"
RadiusY="2"
Stroke="#373737"
StrokeThickness="1"
Style="{x:Null}" />
</Border>
<Label
Width="61"
Margin="0,-1,0,-1"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
Content="{Binding L2InputTemp}"
ContentStringFormat="{}{0:F1}℃"
FontFamily="Verdana"
Foreground="#FFF"
ToolTip="PSU Middle Pyro Temp" />
</Grid>
</StackPanel>
<StackPanel
Canvas.Left="67"
Canvas.Top="54"
Orientation="Vertical">
<Grid
Width="64"
Height="25"
Margin="-1"
Cursor="Hand">
<Border Background="Transparent" BorderThickness="1">
<Rectangle
Margin="1"
Fill="Gray"
Opacity="1"
RadiusX="2"
RadiusY="2"
Stroke="#373737"
StrokeThickness="1"
Style="{x:Null}" />
</Border>
<Label
Width="66"
Margin="0,-2,0,-2"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
Content="{Binding SCR1Power}"
ContentStringFormat="{}{0:F2}KW"
FontFamily="Verdana"
Foreground="#FFF"
ToolTip="SCR Upper Power" />
</Grid>
<Grid
Width="64"
Height="25"
Margin="-1"
Cursor="Hand">
<Border Background="Transparent" BorderThickness="1">
<Rectangle
Margin="1"
Fill="Gray"
Opacity="1"
RadiusX="2"
RadiusY="2"
Stroke="#373737"
StrokeThickness="1"
Style="{x:Null}" />
</Border>
<Label
Width="66"
Margin="0,-2,0,-2"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
Content="{Binding SCR2Power}"
ContentStringFormat="{}{0:F2}KW"
FontFamily="Verdana"
Foreground="#FFF"
ToolTip="SCR Middle Power" />
</Grid>
<Grid
Width="64"
Height="25"
Margin="-1"
Cursor="Hand">
<Border Background="Transparent" BorderThickness="1">
<Rectangle
Margin="1"
Fill="Gray"
Opacity="1"
RadiusX="2"
RadiusY="2"
Stroke="#373737"
StrokeThickness="1"
Style="{x:Null}" />
</Border>
<Label
Width="66"
Margin="0,-2,0,-2"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
Content="{Binding SCR3Power}"
ContentStringFormat="{}{0:F2}KW"
FontFamily="Verdana"
Foreground="#FFF"
ToolTip="SCR Lower Power" />
</Grid>
</StackPanel>
<StackPanel
Canvas.Left="67"
Canvas.Top="125"
Orientation="Horizontal">
<Grid
Width="60"
Height="25"
Margin="-1"
Cursor="Hand">
<Border Background="Transparent" BorderThickness="1">
<Rectangle
Margin="1"
Fill="Gray"
Opacity="1"
RadiusX="2"
RadiusY="2"
Stroke="#373737"
StrokeThickness="1"
Style="{x:Null}" />
</Border>
<Label
Width="62"
Margin="0,-2,0,-2"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
Content="{Binding PSU1Power}"
ContentStringFormat="{}{0:F2}KW"
FontFamily="Verdana"
Foreground="#FFF"
ToolTip="PSU Inner Power" />
</Grid>
<Grid
Width="60"
Height="25"
Margin="-1"
Cursor="Hand">
<Border Background="Transparent" BorderThickness="1">
<Rectangle
Margin="1"
Fill="Gray"
Opacity="1"
RadiusX="2"
RadiusY="2"
Stroke="#373737"
StrokeThickness="1"
Style="{x:Null}" />
</Border>
<Label
Width="62"
Margin="0,-2,0,-2"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
Content="{Binding PSU2Power}"
ContentStringFormat="{}{0:F2}KW"
FontFamily="Verdana"
Foreground="#FFF"
ToolTip="PSU Middle Power" />
</Grid>
<Grid
Width="60"
Height="25"
Margin="-1"
Cursor="Hand">
<Border Background="Transparent" BorderThickness="1">
<Rectangle
Margin="1"
Fill="Gray"
Opacity="1"
RadiusX="2"
RadiusY="2"
Stroke="#373737"
StrokeThickness="1"
Style="{x:Null}" />
</Border>
<Label
Width="62"
Margin="0,-2,0,-2"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
Content="{Binding PSU3Power}"
ContentStringFormat="{}{0:F2}KW"
FontFamily="Verdana"
Foreground="#FFF"
ToolTip="PSU Outer Power" />
</Grid>
</StackPanel>
<StackPanel
Canvas.Left="180"
Canvas.Top="53"
Orientation="Vertical">
<Grid
Width="60"
Height="25"
Margin="-1"
Cursor="Hand">
<Border Background="Transparent" BorderThickness="1">
<Rectangle
Margin="1"
Fill="Gray"
Opacity="1"
RadiusX="2"
RadiusY="2"
Stroke="#373737"
StrokeThickness="1"
Style="{x:Null}" />
</Border>
<Label
Width="61"
Margin="0,-1,0,-1"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
Content="{Binding SimulatorTemp}"
ContentStringFormat="{}{0:F1}℃"
FontFamily="Verdana"
Foreground="#FFF"
ToolTip="PSU Simulator Temp" />
</Grid>
<Grid
Width="64"
Height="25"
Margin="-1,23,-1,-1"
Cursor="Hand">
<Border Background="Transparent" BorderThickness="1">
<Rectangle
Margin="1"
Fill="Gray"
Opacity="1"
RadiusX="2"
RadiusY="2"
Stroke="#373737"
StrokeThickness="1"
Style="{x:Null}" />
</Border>
<Label
Width="66"
Margin="0,2,0,2"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
Content="{Binding ActualSpeedFeedback}"
ContentStringFormat="{}{0:F1}rpm"
FontFamily="Verdana"
Foreground="#FFF"
ToolTip="Rotation Speed" />
</Grid>
</StackPanel>
<Canvas Canvas.Left="30" Canvas.Top="185">
<controlRT:AnalogControl
Canvas.Left="220"
Canvas.Top="-140"
Width="62"
Height="25"
BackColor="Blue"
DeviceData="{Binding ChamPress}"
HideDialog="true" />
<industrialcontrol:PipeLine
Canvas.Left="220"
Canvas.Top="-80"
@@ -4869,7 +5204,7 @@
<industrialcontrol:PipeLine
Canvas.Left="252"
Canvas.Top="16"
Width="236"
Width="221"
Height="{StaticResource ResourceKey=Pipe_Height}"
CenterColor="{StaticResource ResourceKey=EdgeColorBlack}"
EdgeColor="{StaticResource ResourceKey=CenterColorWhite}"
@@ -4923,7 +5258,7 @@
<industrialcontrol:PipeLine
Canvas.Left="152"
Canvas.Top="250"
Canvas.Top="235"
Width="100"
Height="{StaticResource ResourceKey=Pipe_Height}"
CenterColor="{StaticResource ResourceKey=EdgeColorBlack}"
@@ -5057,7 +5392,7 @@
<industrialcontrol:PipeLine
Canvas.Left="-2"
Canvas.Top="65"
Width="125"
Width="115"
Height="{StaticResource ResourceKey=Pipe_Height}"
CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
EdgeColor="{StaticResource ResourceKey=CenterColorWhite}"
@@ -5099,7 +5434,7 @@
<industrialcontrol:PipeLine
Canvas.Left="17"
Canvas.Top="100"
Width="141"
Width="131"
Height="{StaticResource ResourceKey=Pipe_Height}"
CenterColor="{StaticResource ResourceKey=CenterColorPurple}"
EdgeColor="{StaticResource ResourceKey=EdgeColorBlack}"
@@ -5262,10 +5597,11 @@
<controlRT:AITPumpSIC
Canvas.Left="-93"
Canvas.Top="220"
Canvas.Top="205"
DeviceData="{Binding PumpData}"
EnableControl="True" />
<Label Canvas.Left="238" Canvas.Top="-153">PT1</Label>
<Label Canvas.Left="225" Canvas.Top="-105">To TM Pump</Label>
<Label Canvas.Left="255" Canvas.Top="-78">V75</Label>
<Label Canvas.Left="242" Canvas.Top="-42">V76</Label>