Browse Source

升降温功能加上状态显示

reconfiguration
ZhaoGang 1 month ago
parent
commit
00c5139488
3 changed files with 76 additions and 10 deletions
  1. +24
    -1
      BPASmartClient.Academy/View/DeviceMotionView.xaml
  2. +21
    -0
      BPASmartClient.Academy/View/DeviceMotion_2View.xaml
  3. +31
    -9
      BPASmartClient.Academy/View/ReactionKettle50LView.xaml

+ 24
- 1
BPASmartClient.Academy/View/DeviceMotionView.xaml View File

@@ -1040,7 +1040,8 @@
Tag="2" /> Tag="2" />
</StackPanel> </StackPanel>
<StackPanel <StackPanel
Canvas.Left="785" Canvas.Top="41" Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Top">
Canvas.Left="785" Canvas.Top="41" HorizontalAlignment="Center" VerticalAlignment="Top"
Orientation="Vertical">
<RadioButton <RadioButton
Width="70" Height="20" Margin="0,0,0,2" BorderThickness="0" Width="70" Height="20" Margin="0,0,0,2" BorderThickness="0"
Click="new_Click" Content="二次闪蒸:开" FontSize="8" Foreground="White" Click="new_Click" Content="二次闪蒸:开" FontSize="8" Foreground="White"
@@ -1238,6 +1239,7 @@
<RadioButton <RadioButton
Height="40" Click="auto_click" Content="温度校准" GroupName="heat" Height="40" Click="auto_click" Content="温度校准" GroupName="heat"
Style="{StaticResource RectangleRadioButtonStyle}" /> Style="{StaticResource RectangleRadioButtonStyle}" />

</StackPanel> </StackPanel>
<Border <Border
Grid.Row="2" Margin="20,0,30,10" BorderBrush="#ff2AB2E7" BorderThickness="2"> Grid.Row="2" Margin="20,0,30,10" BorderBrush="#ff2AB2E7" BorderThickness="2">
@@ -1262,6 +1264,13 @@
Width="100" Height="30" Margin="40,0,0,0" BorderThickness="0" Width="100" Height="30" Margin="40,0,0,0" BorderThickness="0"
Click="TempCLose_CLick" Content="停止" Foreground="White" IsChecked="True" Click="TempCLose_CLick" Content="停止" Foreground="White" IsChecked="True"
Style="{StaticResource radiobutton}" /> Style="{StaticResource radiobutton}" />
<TextBlock
Margin="15,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="White"
Text="当前状态:" TextAlignment="Center" />
<TextBlock
HorizontalAlignment="Left" VerticalAlignment="Center" d:Foreground="Red" FontSize="20"
Foreground="{Binding DeviceStatus.配料罐自动升温, Converter={StaticResource BoolToColorConverter}}"
Text="⬛" TextAlignment="Center" />
</StackPanel> </StackPanel>
</WrapPanel> </WrapPanel>
<WrapPanel <WrapPanel
@@ -1284,6 +1293,13 @@
Width="100" Height="30" Margin="40,0,0,0" BorderThickness="0" Width="100" Height="30" Margin="40,0,0,0" BorderThickness="0"
Click="TempCLose_CLick" Content="停止" Foreground="White" IsChecked="True" Click="TempCLose_CLick" Content="停止" Foreground="White" IsChecked="True"
Style="{StaticResource radiobutton}" /> Style="{StaticResource radiobutton}" />
<TextBlock
Margin="15,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="White"
Text="当前状态:" TextAlignment="Center" />
<TextBlock
HorizontalAlignment="Left" VerticalAlignment="Center" d:Foreground="Red" FontSize="20"
Foreground="{Binding DeviceStatus.反应釜自动升温, Converter={StaticResource BoolToColorConverter}}"
Text="⬛" TextAlignment="Center" />
</StackPanel> </StackPanel>
</WrapPanel> </WrapPanel>
<WrapPanel <WrapPanel
@@ -1306,6 +1322,13 @@
Width="100" Height="30" Margin="40,0,0,0" BorderThickness="0" Width="100" Height="30" Margin="40,0,0,0" BorderThickness="0"
Click="TempCLose_CLick" Content="停止" Foreground="White" IsChecked="True" Click="TempCLose_CLick" Content="停止" Foreground="White" IsChecked="True"
Style="{StaticResource radiobutton}" /> Style="{StaticResource radiobutton}" />
<TextBlock
Margin="15,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="White"
Text="当前状态:" TextAlignment="Center" />
<TextBlock
HorizontalAlignment="Left" VerticalAlignment="Center" d:Foreground="Red" FontSize="20"
Foreground="{Binding DeviceStatus.反应釜自动降温, Converter={StaticResource BoolToColorConverter}}"
Text="⬛" TextAlignment="Center" />
</StackPanel> </StackPanel>
</WrapPanel> </WrapPanel>
<WrapPanel <WrapPanel


+ 21
- 0
BPASmartClient.Academy/View/DeviceMotion_2View.xaml View File

@@ -1424,6 +1424,13 @@
Width="100" Height="30" Margin="40,0,0,0" BorderThickness="0" Width="100" Height="30" Margin="40,0,0,0" BorderThickness="0"
Click="TempCLose_CLick" Content="停止" Foreground="White" IsChecked="True" Click="TempCLose_CLick" Content="停止" Foreground="White" IsChecked="True"
Style="{StaticResource radiobutton}" /> Style="{StaticResource radiobutton}" />
<TextBlock
Margin="15,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="White"
Text="当前状态:" TextAlignment="Center" />
<TextBlock
HorizontalAlignment="Left" VerticalAlignment="Center" d:Foreground="Red" FontSize="20"
Foreground="{Binding DeviceStatus.配料罐自动升温, Converter={StaticResource BoolToColorConverter}}"
Text="⬛" TextAlignment="Center" />
</StackPanel> </StackPanel>
</WrapPanel> </WrapPanel>
<WrapPanel <WrapPanel
@@ -1446,6 +1453,13 @@
Width="100" Height="30" Margin="40,0,0,0" BorderThickness="0" Width="100" Height="30" Margin="40,0,0,0" BorderThickness="0"
Click="TempCLose_CLick" Content="停止" Foreground="White" IsChecked="True" Click="TempCLose_CLick" Content="停止" Foreground="White" IsChecked="True"
Style="{StaticResource radiobutton}" /> Style="{StaticResource radiobutton}" />
<TextBlock
Margin="15,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="White"
Text="当前状态:" TextAlignment="Center" />
<TextBlock
HorizontalAlignment="Left" VerticalAlignment="Center" d:Foreground="Red" FontSize="20"
Foreground="{Binding DeviceStatus.反应釜自动升温, Converter={StaticResource BoolToColorConverter}}"
Text="⬛" TextAlignment="Center" />
</StackPanel> </StackPanel>
</WrapPanel> </WrapPanel>
<WrapPanel <WrapPanel
@@ -1468,6 +1482,13 @@
Width="100" Height="30" Margin="40,0,0,0" BorderThickness="0" Width="100" Height="30" Margin="40,0,0,0" BorderThickness="0"
Click="TempCLose_CLick" Content="停止" Foreground="White" IsChecked="True" Click="TempCLose_CLick" Content="停止" Foreground="White" IsChecked="True"
Style="{StaticResource radiobutton}" /> Style="{StaticResource radiobutton}" />
<TextBlock
Margin="15,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="White"
Text="当前状态:" TextAlignment="Center" />
<TextBlock
HorizontalAlignment="Left" VerticalAlignment="Center" d:Foreground="Red" FontSize="20"
Foreground="{Binding DeviceStatus.反应釜自动降温, Converter={StaticResource BoolToColorConverter}}"
Text="⬛" TextAlignment="Center" />
</StackPanel> </StackPanel>
</WrapPanel> </WrapPanel>
<WrapPanel <WrapPanel


+ 31
- 9
BPASmartClient.Academy/View/ReactionKettle50LView.xaml View File

@@ -1278,20 +1278,21 @@
</TransformGroup> </TransformGroup>
</bpa:Joint.RenderTransform> </bpa:Joint.RenderTransform>
</bpa:Joint> </bpa:Joint>
<GroupBox Header="显示图例" Canvas.Left="860" Canvas.Top="465" Foreground="White">
<GroupBox
Canvas.Left="860" Canvas.Top="465" Foreground="White" Header="显示图例">
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<TextBlock <TextBlock
HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="10"
Foreground="Red" Text=" ⬛ :该阀/电机/功能指令为关闭" TextAlignment="Center" />
HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="10" Foreground="Red"
Text=" ⬛ :该阀/电机/功能指令为关闭" TextAlignment="Center" />
<TextBlock <TextBlock
HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="10"
Foreground="Green" Text=" ⬛ :该阀/电机/功能指令为打开" TextAlignment="Center" />
HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="10" Foreground="Green"
Text=" ⬛ :该阀/电机/功能指令为打开" TextAlignment="Center" />
<TextBlock <TextBlock
HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="10"
Foreground="Red" Text="⚫ :该阀/电机/功能当前反馈状态为关闭" TextAlignment="Center" />
HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="10" Foreground="Red"
Text="⚫ :该阀/电机/功能当前反馈状态为关闭" TextAlignment="Center" />
<TextBlock <TextBlock
HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="10"
Foreground="Green" Text="⚫ :该阀/电机/功能当前反馈状态为打开" TextAlignment="Center" />
HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="10" Foreground="Green"
Text="⚫ :该阀/电机/功能当前反馈状态为打开" TextAlignment="Center" />
</StackPanel> </StackPanel>
</GroupBox> </GroupBox>
<bpa:PipeLineTR <bpa:PipeLineTR
@@ -1497,6 +1498,13 @@
Click="TempCLose_CLick" Content="停止" Foreground="White" IsChecked="True" Click="TempCLose_CLick" Content="停止" Foreground="White" IsChecked="True"
Style="{StaticResource radiobutton}" Style="{StaticResource radiobutton}"
Tag="反应釜升温" /> Tag="反应釜升温" />
<TextBlock
Margin="15,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="White"
Text="当前状态:" TextAlignment="Center" />
<TextBlock
HorizontalAlignment="Left" VerticalAlignment="Center" d:Foreground="Red" FontSize="20"
Foreground="{Binding DeviceStatus.IsSetReactHeat, Converter={StaticResource BoolToColorConverter}}"
Text="⬛" TextAlignment="Center" />
</StackPanel> </StackPanel>
</WrapPanel> </WrapPanel>
<!--#endregion--> <!--#endregion-->
@@ -1524,6 +1532,13 @@
Click="TempCLose_CLick" Content="停止" Foreground="White" IsChecked="True" Click="TempCLose_CLick" Content="停止" Foreground="White" IsChecked="True"
Style="{StaticResource radiobutton}" Style="{StaticResource radiobutton}"
Tag="反应釜降温" /> Tag="反应釜降温" />
<TextBlock
Margin="15,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="White"
Text="当前状态:" TextAlignment="Center" />
<TextBlock
HorizontalAlignment="Left" VerticalAlignment="Center" d:Foreground="Red" FontSize="20"
Foreground="{Binding DeviceStatus.IsSetReactCool, Converter={StaticResource BoolToColorConverter}}"
Text="⬛" TextAlignment="Center" />
</StackPanel> </StackPanel>
</WrapPanel> </WrapPanel>
<!--#endregion--> <!--#endregion-->
@@ -1551,6 +1566,13 @@
Click="TempCLose_CLick" Content="停止" Foreground="White" IsChecked="True" Click="TempCLose_CLick" Content="停止" Foreground="White" IsChecked="True"
Style="{StaticResource radiobutton}" Style="{StaticResource radiobutton}"
Tag="冷凝水罐降温" /> Tag="冷凝水罐降温" />
<TextBlock
Margin="15,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="White"
Text="当前状态:" TextAlignment="Center" />
<TextBlock
HorizontalAlignment="Left" VerticalAlignment="Center" d:Foreground="Red" FontSize="20"
Foreground="{Binding DeviceStatus.IsSetCWTCool, Converter={StaticResource BoolToColorConverter}}"
Text="⬛" TextAlignment="Center" />
</StackPanel> </StackPanel>
</WrapPanel> </WrapPanel>
<!--#endregion--> <!--#endregion-->


Loading…
Cancel
Save