This commit is contained in:
xyy
2026-05-26 17:17:09 +08:00
parent 0c0f6d7509
commit caa49c716f
6 changed files with 22 additions and 26 deletions

View File

@@ -2,13 +2,13 @@
<configuration> <configuration>
<appSettings> <appSettings>
<!--压力PLC--> <!--压力PLC-->
<!--<add key="PLC1_IP" value="192.168.1.11"/>--> <add key="PLC1_IP" value="192.168.1.10"/>
<add key="PLC1_IP" value="127.0.0.1"/> <!--<add key="PLC1_IP" value="127.0.0.1"/>-->
<add key="PLC1_Port" value="502"/> <add key="PLC1_Port" value="502"/>
<!--二氧化碳PLC--> <!--二氧化碳PLC-->
<!--<add key="PLC2_IP" value="192.168.1.10"/>--> <add key="PLC2_IP" value="192.168.1.10"/>
<add key="PLC1_IP" value="127.0.0.1"/> <!--<add key="PLC1_IP" value="127.0.0.1"/>-->
<add key="PLC2_Port" value="502"/> <add key="PLC2_Port" value="502"/>

View File

@@ -13,7 +13,7 @@
<system:String x:Key="RealTimeDisplay">Adjust the set pressure, and the corresponding flow rate at this time</system:String> <system:String x:Key="RealTimeDisplay">Adjust the set pressure, and the corresponding flow rate at this time</system:String>
<system:String x:Key="CurrentTest">Set the pressure</system:String> <system:String x:Key="CurrentTest">Set the pressure</system:String>
<system:String x:Key="Setting">Setting</system:String> <system:String x:Key="Setting">Setting</system:String>
<system:String x:Key="TriggerDisplacement">Calibration pressure</system:String> <system:String x:Key="TriggerDisplacement">Calibration</system:String>
<system:String x:Key="CurrentPosition">Real-time traffic flow</system:String> <system:String x:Key="CurrentPosition">Real-time traffic flow</system:String>
<system:String x:Key="RealTimePressure">Real-time Pressure</system:String> <system:String x:Key="RealTimePressure">Real-time Pressure</system:String>

View File

@@ -89,7 +89,7 @@
<StackPanel Orientation="Horizontal" Margin="0,10" Width="550"> <StackPanel Orientation="Horizontal" Margin="0,10" Width="550">
<TextBlock Text="{DynamicResource CurrentTest}" VerticalAlignment="Center" Foreground="Black"/> <TextBlock Text="{DynamicResource CurrentTest}" VerticalAlignment="Center" Foreground="Black"/>
<TextBox x:Name="SettingPaTextBox" Width="120" Margin="10,0" Style="{StaticResource MyTextBoxStyle}" <TextBox x:Name="SettingPaTextBox" Width="140" Margin="10,0" Style="{StaticResource MyTextBoxStyle}"
IsReadOnly="True" IsReadOnly="True"
InputScope="Number" PreviewTextInput="SettingPaTextBox_PreviewTextInput" /> InputScope="Number" PreviewTextInput="SettingPaTextBox_PreviewTextInput" />
@@ -100,9 +100,9 @@
<StackPanel Orientation="Horizontal" Margin="0,10" Width="554"> <StackPanel Orientation="Horizontal" Margin="0,10" Width="554">
<TextBlock Text="{DynamicResource RealTimePressure}" VerticalAlignment="Center" Foreground="Black"/> <TextBlock Text="{DynamicResource RealTimePressure}" VerticalAlignment="Center" Foreground="Black"/>
<TextBox x:Name="RealTimePressureTextBox" Width="120" Margin="10,0" Style="{StaticResource MyTextBoxStyle}" IsReadOnly="True" IsEnabled="True"/> <TextBox x:Name="RealTimePressureTextBox" Width="140" Margin="32,0" Style="{StaticResource MyTextBoxStyle}" IsReadOnly="True" IsEnabled="True"/>
<TextBlock Text="pa" VerticalAlignment="Center" Foreground="Black"/> <TextBlock Text="pa" VerticalAlignment="Center" Margin="-20" Foreground="Black"/>
<Button Name="btnjiaozhun" Content="{DynamicResource TriggerDisplacement}" Width="180" Style="{StaticResource MyButtonStyle}" Click="Button_Click"/> <Button Name="btnjiaozhun" Content="{DynamicResource TriggerDisplacement}" Width="150" Style="{StaticResource MyButtonStyle}" Click="Button_Click"/>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>

View File

@@ -92,8 +92,8 @@
<TextBlock Text="{DynamicResource Peak force test result(N)}" VerticalAlignment="Center" Foreground="Black" Margin="{DynamicResource Margin1}"/> <TextBlock Text="{DynamicResource Peak force test result(N)}" VerticalAlignment="Center" Foreground="Black" Margin="{DynamicResource Margin1}"/>
<StackPanel Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center"> <StackPanel Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center">
<TextBox Name="RealTimePressureTextBox" Width="80" Style="{StaticResource MyTextBoxStyle}" Margin="0" IsEnabled="false"/> <TextBox Name="RealTimePressureTextBox" Width="100" Style="{StaticResource MyTextBoxStyle}" Margin="0" IsEnabled="false"/>
<TextBlock Text="pa" VerticalAlignment="Center" Foreground="Black" Margin="5,0,0,0"/> <TextBlock Text="pa" VerticalAlignment="Center" Foreground="Black" Margin="0,0,0,0"/>
</StackPanel> </StackPanel>
<Button Name="btnlianjiekou" Grid.Column="2" Content="{DynamicResource Deformation2}" Width="250" Style="{StaticResource MyButtonStyle}" Click="Button_Click" HorizontalAlignment="Left"/> <Button Name="btnlianjiekou" Grid.Column="2" Content="{DynamicResource Deformation2}" Width="250" Style="{StaticResource MyButtonStyle}" Click="Button_Click" HorizontalAlignment="Left"/>
@@ -110,8 +110,8 @@
<TextBlock Text="{DynamicResource TestResults}" VerticalAlignment="Center" Foreground="Black" Margin="{DynamicResource Margin2}"/> <TextBlock Text="{DynamicResource TestResults}" VerticalAlignment="Center" Foreground="Black" Margin="{DynamicResource Margin2}"/>
<StackPanel Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center"> <StackPanel Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center">
<TextBox Name="NoseTxt" Width="80" Style="{StaticResource MyTextBoxStyle}" Foreground="Black" IsEnabled="false" Margin="-50" /> <TextBox Name="NoseTxt" Width="100" Style="{StaticResource MyTextBoxStyle}" Foreground="Black" IsEnabled="false" Margin="-60" />
<TextBlock Text="pa" VerticalAlignment="Center" Foreground="Black" Margin="50,0,0,0"/> <TextBlock Text="pa" VerticalAlignment="Center" Foreground="Black" Margin="60,0,0,0"/>
</StackPanel> </StackPanel>
<Button Name="btnjiaozhun" Grid.Column="2" Content="{DynamicResource Calibration}" Style="{StaticResource MyButtonStyle}" Click="Button_Click_1" HorizontalAlignment="Left"/> <Button Name="btnjiaozhun" Grid.Column="2" Content="{DynamicResource Calibration}" Style="{StaticResource MyButtonStyle}" Click="Button_Click_1" HorizontalAlignment="Left"/>
@@ -128,8 +128,8 @@
<TextBlock Text="{DynamicResource Deformation1}" VerticalAlignment="Center" Foreground="Black" Margin="{DynamicResource Margin3}"/> <TextBlock Text="{DynamicResource Deformation1}" VerticalAlignment="Center" Foreground="Black" Margin="{DynamicResource Margin3}"/>
<StackPanel Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center" Width="Auto"> <StackPanel Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center" Width="Auto">
<TextBox Name="FowlTxt1" Width="100" Style="{StaticResource MyTextBoxStyle}" Foreground="Black" IsReadOnly="True" Margin="-35" /> <TextBox Name="FowlTxt1" Width="100" Style="{StaticResource MyTextBoxStyle}" Foreground="Black" IsReadOnly="True" Margin="-55" />
<TextBlock Text="L/min" VerticalAlignment="Center" Foreground="Black" Margin="40,0,0,0"/> <TextBlock Text="L/min" VerticalAlignment="Center" Foreground="Black" Margin="60,0,0,0"/>
</StackPanel> </StackPanel>
<Button Name="btnsetting" Grid.Column="2" Content="{DynamicResource Deformation4}" Style="{StaticResource MyButtonStyle}" Click="Button_Click_7" HorizontalAlignment="Center"/> <Button Name="btnsetting" Grid.Column="2" Content="{DynamicResource Deformation4}" Style="{StaticResource MyButtonStyle}" Click="Button_Click_7" HorizontalAlignment="Center"/>
@@ -145,7 +145,7 @@
<Button Content="{DynamicResource Deformation6}" Style="{StaticResource MyButtonStyle}" Width="180" Click="Button_Click_2" /> <Button Content="{DynamicResource Deformation6}" Style="{StaticResource MyButtonStyle}" Width="180" Click="Button_Click_2" />
<TextBox Name="AirTxt" Width="80" Margin="10,0" Style="{StaticResource MyTextBoxStyle}" IsEnabled="False"/> <TextBox Name="AirTxt" Width="120" Margin="10,0" Style="{StaticResource MyTextBoxStyle}" IsEnabled="False"/>
<TextBlock Text="hpa" VerticalAlignment="Center" Foreground="Black"/> <TextBlock Text="hpa" VerticalAlignment="Center" Foreground="Black"/>
</StackPanel> </StackPanel>

View File

@@ -190,7 +190,7 @@
Style="{StaticResource MyTextBoxStyle}" Style="{StaticResource MyTextBoxStyle}"
IsReadOnly="True" IsReadOnly="True"
PreviewTextInput="ClostTxt_PreviewTextInput" PreviewTextInput="ClostTxt_PreviewTextInput"
Width="80"/> Width="100"/>
<TextBlock Text="L/min" <TextBlock Text="L/min"
VerticalAlignment="Center" VerticalAlignment="Center"
@@ -220,7 +220,7 @@
Style="{StaticResource MyTextBoxStyle}" Style="{StaticResource MyTextBoxStyle}"
Text="???" Text="???"
IsEnabled="False" IsEnabled="False"
Width="80"/> Width="100"/>
<TextBlock Text="pa" <TextBlock Text="pa"
VerticalAlignment="Center" VerticalAlignment="Center"
Margin="10,0,0,0" Margin="10,0,0,0"
@@ -248,7 +248,7 @@
Style="{StaticResource MyTextBoxStyle}" Style="{StaticResource MyTextBoxStyle}"
Text="???" Text="???"
IsEnabled="False" IsEnabled="False"
Width="80"/> Width="100"/>
<TextBlock Text="L/min" <TextBlock Text="L/min"
VerticalAlignment="Center" VerticalAlignment="Center"
Margin="10,0,0,0" Margin="10,0,0,0"
@@ -277,7 +277,7 @@
Style="{StaticResource MyTextBoxStyle}" Style="{StaticResource MyTextBoxStyle}"
Text="???" Text="???"
IsEnabled="False" IsEnabled="False"
Width="80"/> Width="100"/>
<TextBlock Text="L/min" <TextBlock Text="L/min"
VerticalAlignment="Center" VerticalAlignment="Center"
Margin="10,0,0,0" Margin="10,0,0,0"
@@ -292,12 +292,8 @@
Margin="42,10,42,10"/> Margin="42,10,42,10"/>
</Grid> </Grid>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,10"> <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,10">
<TextBlock Text="{DynamicResource setFlow112}" VerticalAlignment="Center" FontWeight="Bold" FontSize="16" Margin="20 0 50 0"/> <TextBlock Text="{DynamicResource setFlow112}" VerticalAlignment="Center" FontWeight="Bold" FontSize="16" Margin="-10 0 50 0"/>
<TextBox Name="saveFlowOutTxt" Style="{StaticResource MyTextBoxStyle}" Text="???" Width="120" IsEnabled="False"/> <TextBox Name="saveFlowOutTxt" Style="{StaticResource MyTextBoxStyle}" Text="???" Width="120" IsEnabled="False"/>
<TextBlock Text="pa" VerticalAlignment="Center" Margin="10,0,0,0"/> <TextBlock Text="pa" VerticalAlignment="Center" Margin="10,0,0,0"/>
<TextBlock Text="{DynamicResource setFlow12}" VerticalAlignment="Center" FontWeight="Bold" FontSize="16" Margin="20 0 50 0"/> <TextBlock Text="{DynamicResource setFlow12}" VerticalAlignment="Center" FontWeight="Bold" FontSize="16" Margin="20 0 50 0"/>

View File

@@ -1479,7 +1479,7 @@ namespace ShanghaiEnvironmentalTechnology
// 验证并写入频率系数值 // 验证并写入频率系数值
await WriteRegisterWithValidation( await WriteRegisterWithValidation(
inputControl: frequencyTxt, inputControl: frequencyTxt,
registerAddress: 368, // 频率系数寄存器地址(根据实际地址修改) registerAddress: 3680, // 频率系数寄存器地址(根据实际地址修改)
minValue: 0.1f, // 频率系数最小0.1 minValue: 0.1f, // 频率系数最小0.1
maxValue: 10f // 频率系数最大10 maxValue: 10f // 频率系数最大10
); );