Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
H
hemei
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
潘栩锋
hemei
Commits
fc6894a1
Commit
fc6894a1
authored
Aug 02, 2020
by
潘栩锋
🚴
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复 IBC当按了报警复位,但PLC中的报警没有消失,电脑无法再次报警
parent
1342cdd2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
4 deletions
+7
-4
PgSystem.xaml
Project.FLY.IBC/FLY.IBC.UI.Client/PgSystem.xaml
+3
-3
IBCSystem.cs
Project.FLY.IBC/FLY.IBC/Server/IBCSystem.cs
+3
-0
thick_public
thick_public
+1
-1
No files found.
Project.FLY.IBC/FLY.IBC.UI.Client/PgSystem.xaml
View file @
fc6894a1
...
...
@@ -29,7 +29,7 @@
<TextBlock Style="{StaticResource TextBlockStyle_Title}" Text="IBC系统参数"/>
</StackPanel>
<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.ColumnDefinitions>
<ColumnDefinition Width="auto" />
...
...
@@ -75,8 +75,8 @@
</Grid>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="
31*
" />
<ColumnDefinition
Width="159*"
/>
<ColumnDefinition Width="
auto
" />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Border Style="{StaticResource BorderStyle_paramSection}">
<TextBlock Style="{StaticResource TextBlockStyle_ItemHeader}" Text="区间2" />
...
...
Project.FLY.IBC/FLY.IBC/Server/IBCSystem.cs
View file @
fc6894a1
...
...
@@ -105,6 +105,9 @@ namespace FLY.IBC.Server
{
Item
.
IsErrorReset
=
false
;
Item
.
IsErrorReset
=
true
;
//把全部报警都复位, 当复位无效,该属性还是true,下次查寄存器时,还是能触发报警
errorConf
.
ResetError
();
}
});
...
...
thick_public
@
3754da26
Subproject commit
efea37de340789c229ce1acf81fad5561ce6f8a4
Subproject commit
3754da2611a8d829762527eeee5ff0bac58e553e
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment