Commit fc6894a1 authored by 潘栩锋's avatar 潘栩锋 🚴

修复 IBC当按了报警复位,但PLC中的报警没有消失,电脑无法再次报警

parent 1342cdd2
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<TextBlock Style="{StaticResource TextBlockStyle_Title}" Text="IBC系统参数"/> <TextBlock Style="{StaticResource TextBlockStyle_Title}" Text="IBC系统参数"/>
</StackPanel> </StackPanel>
<ScrollViewer Grid.Row="1" > <ScrollViewer Grid.Row="1" >
<StackPanel Grid.Row="1" Orientation="Vertical" DataContext="{Binding DataContext,ElementName=grid_ibc}"> <StackPanel Grid.Row="1" DataContext="{Binding DataContext,ElementName=grid_ibc}">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="auto" /> <ColumnDefinition Width="auto" />
...@@ -75,8 +75,8 @@ ...@@ -75,8 +75,8 @@
</Grid> </Grid>
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="31*" /> <ColumnDefinition Width="auto" />
<ColumnDefinition Width="159*"/> <ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Border Style="{StaticResource BorderStyle_paramSection}"> <Border Style="{StaticResource BorderStyle_paramSection}">
<TextBlock Style="{StaticResource TextBlockStyle_ItemHeader}" Text="区间2" /> <TextBlock Style="{StaticResource TextBlockStyle_ItemHeader}" Text="区间2" />
......
...@@ -105,6 +105,9 @@ namespace FLY.IBC.Server ...@@ -105,6 +105,9 @@ namespace FLY.IBC.Server
{ {
Item.IsErrorReset = false; Item.IsErrorReset = false;
Item.IsErrorReset = true; Item.IsErrorReset = true;
//把全部报警都复位, 当复位无效,该属性还是true,下次查寄存器时,还是能触发报警
errorConf.ResetError();
} }
}); });
......
Subproject commit efea37de340789c229ce1acf81fad5561ce6f8a4 Subproject commit 3754da2611a8d829762527eeee5ff0bac58e553e
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment