Sic-Software
/
Sic03-8inch
4
0
Fork 0
Code Issues Pull Requests Activity

移除系统配置中水温设置中的SpareTemp项目。 

优化PM水温报警窗口显示效果，当超温报警触发时，水温颜色标黄或标红。
This commit is contained in:
DESKTOP-1N1NK8A\auvkk 2023-04-19 15:26:21 +08:00
parent 6f6c01b444
commit a8623d825c
3 changed files with 142 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SicRT/Config/System.sccfg
View File

@ -996,7 +996,6 @@
<config default="20" name="ElectrodeWFlowTemp" description="DO204 侧壁电极超温报警" max="90" min="0" paramter="" tag="" unit="℃" type="Double" /> <config default="20" name="ElectrodeWFlowTemp" description="DO204 侧壁电极超温报警" max="90" min="0" paramter="" tag="" unit="℃" type="Double" />
<config default="20" name="TMPumpFlowTemp" description="DO205 TM干泵超温报警" max="90" min="0" paramter="" tag="" unit="℃" type="Double" /> <config default="20" name="TMPumpFlowTemp" description="DO205 TM干泵超温报警" max="90" min="0" paramter="" tag="" unit="℃" type="Double" />
<config default="20" name="TMTopLidFlowTemp" description="DO207 TM腔上盖超温报警" max="90" min="0" paramter="" tag="" unit="℃" type="Double" /> <config default="20" name="TMTopLidFlowTemp" description="DO207 TM腔上盖超温报警" max="90" min="0" paramter="" tag="" unit="℃" type="Double" />
<config default="20" name="SpareTemp" description="DO208 预留" max="90" min="0" paramter="" tag="" unit="℃" type="Double" />
<config default="20" name="TransformerFlowTemp" description="DO206 变压器超温报警" max="90" min="0" paramter="" tag="" unit="℃" type="Double" /> <config default="20" name="TransformerFlowTemp" description="DO206 变压器超温报警" max="90" min="0" paramter="" tag="" unit="℃" type="Double" />
</configs> </configs>
@ -1577,7 +1576,6 @@
<config default="20" name="ElectrodeWFlowTemp" description="DO204 侧壁电极超温报警" max="90" min="0" paramter="" tag="" unit="℃" type="Double" /> <config default="20" name="ElectrodeWFlowTemp" description="DO204 侧壁电极超温报警" max="90" min="0" paramter="" tag="" unit="℃" type="Double" />
<config default="20" name="TMPumpFlowTemp" description="DO205 TM干泵超温报警" max="90" min="0" paramter="" tag="" unit="℃" type="Double" /> <config default="20" name="TMPumpFlowTemp" description="DO205 TM干泵超温报警" max="90" min="0" paramter="" tag="" unit="℃" type="Double" />
<config default="20" name="TMTopLidFlowTemp" description="DO207 TM腔上盖超温报警" max="90" min="0" paramter="" tag="" unit="℃" type="Double" /> <config default="20" name="TMTopLidFlowTemp" description="DO207 TM腔上盖超温报警" max="90" min="0" paramter="" tag="" unit="℃" type="Double" />
<config default="20" name="SpareTemp" description="DO208 预留" max="90" min="0" paramter="" tag="" unit="℃" type="Double" />
<config default="20" name="TransformerFlowTemp" description="DO206 变压器超温报警" max="90" min="0" paramter="" tag="" unit="℃" type="Double" /> <config default="20" name="TransformerFlowTemp" description="DO206 变压器超温报警" max="90" min="0" paramter="" tag="" unit="℃" type="Double" />
</configs> </configs>
<configs name="IdleService" visible="false"> <configs name="IdleService" visible="false">

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

@ -66,6 +66,81 @@
<Color x:Key="EdgeColorBlack">Black</Color> <Color x:Key="EdgeColorBlack">Black</Color>
<Color x:Key="EdgeColorLightGreen">#00ae9d</Color> <Color x:Key="EdgeColorLightGreen">#00ae9d</Color>
<Style x:Key="WaterTempBackground" TargetType="Border">
<Setter Property="BorderBrush" Value="{DynamicResource Table_BD}"/>
<Setter Property="BorderThickness" Value="0,0,1,1"/>
<Setter Property="Padding" Value="5,1"/>
<Style.Triggers>
<MultiDataTrigger>
<MultiDataTrigger.Conditions>
<Condition Binding="{Binding IsWarning}" Value="false"/>
<Condition Binding="{Binding IsAlarm}" Value="false"/>
</MultiDataTrigger.Conditions>
<Setter Property="Background" Value="{DynamicResource Table_BG_Content_Inner}"/>
</MultiDataTrigger>
<MultiDataTrigger>
<MultiDataTrigger.Conditions>
<Condition Binding="{Binding IsWarning}" Value="true"/>
<Condition Binding="{Binding IsAlarm}" Value="false"/>
</MultiDataTrigger.Conditions>
<Setter Property="Background" Value="#f4b575"/>
</MultiDataTrigger>
<MultiDataTrigger>
<MultiDataTrigger.Conditions>
<Condition Binding="{Binding IsWarning}" Value="False"/>
<Condition Binding="{Binding IsAlarm}" Value="True"/>
</MultiDataTrigger.Conditions>
<Setter Property="Background" Value="#f49f9f"/>
</MultiDataTrigger>
<MultiDataTrigger>
<MultiDataTrigger.Conditions>
<Condition Binding="{Binding IsWarning}" Value="True"/>
<Condition Binding="{Binding IsAlarm}" Value="True"/>
</MultiDataTrigger.Conditions>
<Setter Property="Background" Value="#f49f9f"/>
</MultiDataTrigger>
</Style.Triggers>
</Style>
<Style x:Key="WaterTempForeground" TargetType="TextBlock">
<Setter Property="HorizontalAlignment" Value="Center"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="FontFamily" Value="Arial"/>
<Setter Property="FontSize" Value="14"/>
<Setter Property="TextWrapping" Value="Wrap"/>
<Setter Property="Text" Value="{Binding Value, StringFormat=0.00}"/>
<Style.Triggers>
<MultiDataTrigger>
<MultiDataTrigger.Conditions>
<Condition Binding="{Binding IsWarning}" Value="false"/>
<Condition Binding="{Binding IsAlarm}" Value="false"/>
</MultiDataTrigger.Conditions>
<Setter Property="Foreground" Value="{DynamicResource FG_Black}"/>
</MultiDataTrigger>
<MultiDataTrigger>
<MultiDataTrigger.Conditions>
<Condition Binding="{Binding IsWarning}" Value="true"/>
<Condition Binding="{Binding IsAlarm}" Value="false"/>
</MultiDataTrigger.Conditions>
<Setter Property="Foreground" Value="#e66e2e"/>
</MultiDataTrigger>
<MultiDataTrigger>
<MultiDataTrigger.Conditions>
<Condition Binding="{Binding IsWarning}" Value="False"/>
<Condition Binding="{Binding IsAlarm}" Value="True"/>
</MultiDataTrigger.Conditions>
<Setter Property="Foreground" Value="#ff0f0f"/>
</MultiDataTrigger>
<MultiDataTrigger>
<MultiDataTrigger.Conditions>
<Condition Binding="{Binding IsWarning}" Value="True"/>
<Condition Binding="{Binding IsAlarm}" Value="True"/>
</MultiDataTrigger.Conditions>
<Setter Property="Foreground" Value="#ff0f0f"/>
</MultiDataTrigger>
</Style.Triggers>
</Style>
</UserControl.Resources> </UserControl.Resources>
<ScrollViewer <ScrollViewer
@ -1275,18 +1350,10 @@
<Border <Border
Grid.Row="1" Grid.Row="1"
Grid.Column="3" Grid.Column="3"
Padding="5,1" DataContext="{Binding SHFlowTemp}"
Background="{DynamicResource Table_BG_Content_Inner}" Style="{StaticResource WaterTempBackground}">
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,1,1">
<TextBlock <TextBlock
HorizontalAlignment="Center" Style="{StaticResource WaterTempForeground}" />
VerticalAlignment="Center"
FontFamily="Arial"
FontSize="14"
Foreground="{DynamicResource FG_Black}"
Text="{Binding SHFlowTemp, StringFormat=0.00}"
TextWrapping="Wrap" />
</Border> </Border>
<Border <Border
Grid.Row="2" Grid.Row="2"
@ -1322,18 +1389,10 @@
<Border <Border
Grid.Row="2" Grid.Row="2"
Grid.Column="3" Grid.Column="3"
Padding="5,1" DataContext="{Binding ChamberTopFlowTemp}"
Background="{DynamicResource Table_BG_Content_Inner}" Style="{StaticResource WaterTempBackground}">
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,1,1">
<TextBlock <TextBlock
HorizontalAlignment="Center" Style="{StaticResource WaterTempForeground}"/>
VerticalAlignment="Center"
FontFamily="Arial"
FontSize="14"
Foreground="{DynamicResource FG_Black}"
Text="{Binding ChamberTopFlowTemp, StringFormat=0.00}"
TextWrapping="Wrap" />
</Border> </Border>
@ -1373,18 +1432,10 @@
<Border <Border
Grid.Row="3" Grid.Row="3"
Grid.Column="3" Grid.Column="3"
Padding="5,1" DataContext="{Binding ChamberMid1FlowTemp}"
Background="{DynamicResource Table_BG_Content_Inner}" Style="{StaticResource WaterTempBackground}" >
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,1,1">
<TextBlock <TextBlock
HorizontalAlignment="Center" Style="{StaticResource WaterTempForeground}" />
VerticalAlignment="Center"
FontFamily="Arial"
FontSize="14"
Foreground="{DynamicResource FG_Black}"
Text="{Binding ChamberMid1FlowTemp, StringFormat=0.00}"
TextWrapping="Wrap" />
</Border> </Border>
@ -1421,18 +1472,10 @@
<Border <Border
Grid.Row="4" Grid.Row="4"
Grid.Column="3" Grid.Column="3"
Padding="5,1" DataContext="{Binding ChamberMid2FlowTemp}"
Background="{DynamicResource Table_BG_Content_Inner}" Style="{StaticResource WaterTempBackground}" >
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,1,1">
<TextBlock <TextBlock
HorizontalAlignment="Center" Style="{StaticResource WaterTempForeground}" />
VerticalAlignment="Center"
FontFamily="Arial"
FontSize="14"
Foreground="{DynamicResource FG_Black}"
Text="{Binding ChamberMid2FlowTemp, StringFormat=0.00}"
TextWrapping="Wrap" />
</Border> </Border>
@ -1469,18 +1512,10 @@
<Border <Border
Grid.Row="5" Grid.Row="5"
Grid.Column="3" Grid.Column="3"
Padding="5,1" DataContext="{Binding ChamberBottomFlowTemp}"
Background="{DynamicResource Table_BG_Content_Inner}" Style="{StaticResource WaterTempBackground}" >
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,1,1">
<TextBlock <TextBlock
HorizontalAlignment="Center" Style="{StaticResource WaterTempForeground}" />
VerticalAlignment="Center"
FontFamily="Arial"
FontSize="14"
Foreground="{DynamicResource FG_Black}"
Text="{Binding ChamberBottomFlowTemp, StringFormat=0.00}"
TextWrapping="Wrap" />
</Border> </Border>
<Border <Border
@ -1516,18 +1551,10 @@
<Border <Border
Grid.Row="6" Grid.Row="6"
Grid.Column="3" Grid.Column="3"
Padding="5,1" DataContext="{Binding ChamberBottomPlateTemp}"
Background="{DynamicResource Table_BG_Content_Inner}" Style="{StaticResource WaterTempBackground}" >
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,1,1">
<TextBlock <TextBlock
HorizontalAlignment="Center" Style="{StaticResource WaterTempForeground}" />
VerticalAlignment="Center"
FontFamily="Arial"
FontSize="14"
Foreground="{DynamicResource FG_Black}"
Text="{Binding ChamberBottomPlateTemp, StringFormat=0.00}"
TextWrapping="Wrap" />
</Border> </Border>
<Border <Border
@ -1563,18 +1590,10 @@
<Border <Border
Grid.Row="7" Grid.Row="7"
Grid.Column="3" Grid.Column="3"
Padding="5,1" DataContext="{Binding PowerRod1FlowTemp}"
Background="{DynamicResource Table_BG_Content_Inner}" Style="{StaticResource WaterTempBackground}" >
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,1,1">
<TextBlock <TextBlock
HorizontalAlignment="Center" Style="{StaticResource WaterTempForeground}" />
VerticalAlignment="Center"
FontFamily="Arial"
FontSize="14"
Foreground="{DynamicResource FG_Black}"
Text="{Binding PowerRod1FlowTemp, StringFormat=0.00}"
TextWrapping="Wrap" />
</Border> </Border>
</Grid> </Grid>
</TabItem> </TabItem>
@ -1682,18 +1701,10 @@
<Border <Border
Grid.Row="1" Grid.Row="1"
Grid.Column="2" Grid.Column="2"
Padding="5,1" DataContext="{Binding PowerRod2FlowTemp}"
Background="{DynamicResource Table_BG_Content_Inner}" Style="{StaticResource WaterTempBackground}">
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,1,1">
<TextBlock <TextBlock
HorizontalAlignment="Center" Style="{StaticResource WaterTempForeground}"/>
VerticalAlignment="Center"
FontFamily="Arial"
FontSize="14"
Foreground="{DynamicResource FG_Black}"
Text="{Binding PowerRod2FlowTemp, StringFormat=0.00}"
TextWrapping="Wrap" />
</Border> </Border>
<Border <Border
Grid.Row="2" Grid.Row="2"
@ -1727,18 +1738,10 @@
<Border <Border
Grid.Row="2" Grid.Row="2"
Grid.Column="2" Grid.Column="2"
Padding="5,1" DataContext="{Binding ForelineFlowTemp}"
Background="{DynamicResource Table_BG_Content_Inner}" Style="{StaticResource WaterTempBackground}" >
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,1,1">
<TextBlock <TextBlock
HorizontalAlignment="Center" Style="{StaticResource WaterTempForeground}" />
VerticalAlignment="Center"
FontFamily="Arial"
FontSize="14"
Foreground="{DynamicResource FG_Black}"
Text="{Binding ForelineFlowTemp, StringFormat=0.00}"
TextWrapping="Wrap" />
</Border> </Border>
@ -1774,18 +1777,10 @@
<Border <Border
Grid.Row="3" Grid.Row="3"
Grid.Column="2" Grid.Column="2"
Padding="5,1" DataContext="{Binding ElectrodeWFlowTemp}"
Background="{DynamicResource Table_BG_Content_Inner}" Style="{StaticResource WaterTempBackground}" >
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,1,1">
<TextBlock <TextBlock
HorizontalAlignment="Center" Style="{StaticResource WaterTempForeground}" />
VerticalAlignment="Center"
FontFamily="Arial"
FontSize="14"
Foreground="{DynamicResource FG_Black}"
Text="{Binding ElectrodeWFlowTemp, StringFormat=0.00}"
TextWrapping="Wrap" />
</Border> </Border>
@ -1820,18 +1815,10 @@
<Border <Border
Grid.Row="4" Grid.Row="4"
Grid.Column="2" Grid.Column="2"
Padding="5,1" DataContext="{Binding TMPumpFlowTemp}"
Background="{DynamicResource Table_BG_Content_Inner}" Style="{StaticResource WaterTempBackground}" >
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,1,1">
<TextBlock <TextBlock
HorizontalAlignment="Center" Style="{StaticResource WaterTempForeground}" />
VerticalAlignment="Center"
FontFamily="Arial"
FontSize="14"
Foreground="{DynamicResource FG_Black}"
Text="{Binding TMPumpFlowTemp, StringFormat=0.00}"
TextWrapping="Wrap" />
</Border> </Border>
@ -1867,18 +1854,10 @@
<Border <Border
Grid.Row="5" Grid.Row="5"
Grid.Column="2" Grid.Column="2"
Padding="5,1" DataContext="{Binding TMTopLidFlowTemp}"
Background="{DynamicResource Table_BG_Content_Inner}" Style="{StaticResource WaterTempBackground}" >
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,1,1">
<TextBlock <TextBlock
HorizontalAlignment="Center" Style="{StaticResource WaterTempForeground}" />
VerticalAlignment="Center"
FontFamily="Arial"
FontSize="14"
Foreground="{DynamicResource FG_Black}"
Text="{Binding TMTopLidFlowTemp, StringFormat=0.00}"
TextWrapping="Wrap" />
</Border> </Border>
<Border <Border
@ -1913,18 +1892,8 @@
<Border <Border
Grid.Row="6" Grid.Row="6"
Grid.Column="2" Grid.Column="2"
Padding="5,1" Style="{StaticResource WaterTempBackground}" >
Background="{DynamicResource Table_BG_Content_Inner}" <TextBlock/>
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,1,1">
<TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontFamily="Arial"
FontSize="14"
Foreground="{DynamicResource FG_Black}"
Text=""
TextWrapping="Wrap" />
</Border> </Border>
<Border <Border
@ -1959,18 +1928,10 @@
<Border <Border
Grid.Row="7" Grid.Row="7"
Grid.Column="2" Grid.Column="2"
Padding="5,1" DataContext="{Binding TransformerFlowTemp}"
Background="{DynamicResource Table_BG_Content_Inner}" Style="{StaticResource WaterTempBackground}" >
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,1,1">
<TextBlock <TextBlock
HorizontalAlignment="Center" Style="{StaticResource WaterTempForeground}" />
VerticalAlignment="Center"
FontFamily="Arial"
FontSize="14"
Foreground="{DynamicResource FG_Black}"
Text="{Binding TransformerFlowTemp, StringFormat=0.00}"
TextWrapping="Wrap" />
</Border> </Border>
</Grid> </Grid>
</TabItem> </TabItem>

52
SicUI/Models/PMs/PMOperationViewModel.cs
View File

@ -512,44 +512,44 @@ namespace SicUI.Models.PMs
#region Water Temp Data #region Water Temp Data
[Subscription("SHFlowTemp.Value")] [Subscription("SHFlowTemp.DeviceData")]
public float SHFlowTemp { get; set; } public AITSensorAnalogData SHFlowTemp { get; set; }
[Subscription("ChamTopFlowTemp.Value")] [Subscription("ChamTopFlowTemp.DeviceData")]
public float ChamberTopFlowTemp { get; set; } public AITSensorAnalogData ChamberTopFlowTemp { get; set; }
[Subscription("ChamMiddleFlow1Temp.Value")] [Subscription("ChamMiddleFlow1Temp.DeviceData")]
public float ChamberMid1FlowTemp { get; set; } public AITSensorAnalogData ChamberMid1FlowTemp { get; set; }
[Subscription("ChamMiddleFlow2Temp.Value")] [Subscription("ChamMiddleFlow2Temp.DeviceData")]
public float ChamberMid2FlowTemp { get; set; } public AITSensorAnalogData ChamberMid2FlowTemp { get; set; }
[Subscription("ChamBottomFlowTemp.Value")] [Subscription("ChamBottomFlowTemp.DeviceData")]
public float ChamberBottomFlowTemp { get; set; } public AITSensorAnalogData ChamberBottomFlowTemp { get; set; }
[Subscription("ChamBottomPlateTemp.Value")] [Subscription("ChamBottomPlateTemp.DeviceData")]
public float ChamberBottomPlateTemp { get; set; } public AITSensorAnalogData ChamberBottomPlateTemp { get; set; }
[Subscription("PowerRod1FlowTemp.Value")] [Subscription("PowerRod1FlowTemp.DeviceData")]
public float PowerRod1FlowTemp { get; set; } public AITSensorAnalogData PowerRod1FlowTemp { get; set; }
[Subscription("PowerRod2FlowTemp.Value")] [Subscription("PowerRod2FlowTemp.DeviceData")]
public float PowerRod2FlowTemp { get; set; } public AITSensorAnalogData PowerRod2FlowTemp { get; set; }
[Subscription("ForelineFlowTemp.Value")] [Subscription("ForelineFlowTemp.DeviceData")]
public float ForelineFlowTemp { get; set; } public AITSensorAnalogData ForelineFlowTemp { get; set; }
[Subscription("ElectrodeWFlowTemp.Value")] [Subscription("ElectrodeWFlowTemp.DeviceData")]
public float ElectrodeWFlowTemp { get; set; } public AITSensorAnalogData ElectrodeWFlowTemp { get; set; }
[Subscription("TMPumpFlowTemp.Value")] [Subscription("TMPumpFlowTemp.DeviceData")]
public float TMPumpFlowTemp { get; set; } public AITSensorAnalogData TMPumpFlowTemp { get; set; }
[Subscription("TMTopLidFlowTemp.Value")] [Subscription("TMTopLidFlowTemp.DeviceData")]
public float TMTopLidFlowTemp { get; set; } public AITSensorAnalogData TMTopLidFlowTemp { get; set; }
[Subscription("TransformerFlowTemp.Value")] [Subscription("TransformerFlowTemp.DeviceData")]
public float TransformerFlowTemp { get; set; } public AITSensorAnalogData TransformerFlowTemp { get; set; }
[Subscription("SensorSHFlowSW.Value")] [Subscription("SensorSHFlowSW.Value")]
public bool FlowSW1 { get; set; } public bool FlowSW1 { get; set; }