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
8c24e2dc
Commit
8c24e2dc
authored
Jun 12, 2021
by
潘栩锋
🚴
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复 厚度纵向趋势图,IBC控制图,称重流量图,单组份称重流量图 这4个带有自动显示最新数据 倒计时的,当先开客户端, 服务器后打开,会导致,倒计时=0, 但没有向服务器获取最新数据
parent
d932d1ef
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
74 additions
and
49 deletions
+74
-49
IbcCtrlGraphVm.cs
...FLY.IBC.UI.Client/UiModule/IbcCtrlGraph/IbcCtrlGraphVm.cs
+20
-13
TrendGraphVm2.cs
...LY.Thick.Blowing.UI/UiModule/TrendGraph2/TrendGraphVm2.cs
+15
-10
FlowGraph.xaml.cs
...LY.Weight/FLY.Weight.UI.Client/UIModule/FlowGraph.xaml.cs
+19
-13
FlowGraph.xaml.cs
....Weight2/FLY.Weight2.UI.Client/UiModule/FlowGraph.xaml.cs
+20
-13
No files found.
Project.FLY.IBC/FLY.IBC.UI.Client/UiModule/IbcCtrlGraph/IbcCtrlGraphVm.cs
View file @
8c24e2dc
...
...
@@ -172,8 +172,25 @@ namespace FLY.IBC.UI.Client.UiModule
//当不是最新数据时,10秒内无操作,自动按 [最新]
timer
=
new
DispatcherTimer
();
timer
.
Interval
=
TimeSpan
.
FromSeconds
(
1
);
timer
.
Tick
+=
Timer_Tick
;
timer
.
Start
();
timer
.
Tick
+=
(
s
,
e
)
=>
{
if
(
IsNewest
)
return
;
if
(
AutoKeepNewestTimeRemaining
>
0
)
AutoKeepNewestTimeRemaining
--;
if
(
AutoKeepNewestTimeRemaining
<=
0
)
{
ToNewest
();
}
};
this
.
PropertyChanged
+=
(
s
,
e
)
=>
{
if
(
e
.
PropertyName
==
nameof
(
IsNewest
))
{
timer
.
IsEnabled
=
!
IsNewest
;
}
};
}
private
void
BulkDb_PropertyChanged
(
object
sender
,
PropertyChangedEventArgs
e
)
...
...
@@ -223,17 +240,7 @@ namespace FLY.IBC.UI.Client.UiModule
}
}
private
void
Timer_Tick
(
object
sender
,
EventArgs
e
)
{
if
(!
IsNewest
&&
AutoKeepNewestTimeRemaining
>
0
)
{
AutoKeepNewestTimeRemaining
--;
if
(
AutoKeepNewestTimeRemaining
==
0
)
{
ToNewest
();
}
}
}
void
UpdateY
()
{
...
...
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/UiModule/TrendGraph2/TrendGraphVm2.cs
View file @
8c24e2dc
...
...
@@ -216,19 +216,24 @@ namespace FLY.Thick.Blowing.UI.Fix.Client.UiModule
timer
=
new
DispatcherTimer
();
timer
.
Interval
=
TimeSpan
.
FromSeconds
(
1
);
timer
.
Tick
+=
Timer_Tick
;
timer
.
Start
();
}
private
void
Timer_Tick
(
object
sender
,
EventArgs
e
)
{
if
(!
IsNewest
&&
AutoKeepNewestTimeRemaining
>
0
)
timer
.
Tick
+=
(
s
,
e
)
=>
{
AutoKeepNewestTimeRemaining
--;
if
(
AutoKeepNewestTimeRemaining
==
0
)
{
if
(
IsNewest
)
return
;
if
(
AutoKeepNewestTimeRemaining
>
0
)
AutoKeepNewestTimeRemaining
--;
if
(
AutoKeepNewestTimeRemaining
<=
0
)
{
ToNewest
();
}
}
};
this
.
PropertyChanged
+=
(
s
,
e
)
=>
{
if
(
e
.
PropertyName
==
nameof
(
IsNewest
))
{
timer
.
IsEnabled
=
!
IsNewest
;
}
};
}
private
void
ProfileParam_PropertyChanged
(
object
sender
,
PropertyChangedEventArgs
e
)
...
...
Project.FLY.Weight/FLY.Weight.UI.Client/UIModule/FlowGraph.xaml.cs
View file @
8c24e2dc
...
...
@@ -246,8 +246,25 @@ namespace FLY.Weight.UI.Client.UiModule
timer
=
new
DispatcherTimer
();
timer
.
Interval
=
TimeSpan
.
FromSeconds
(
1
);
timer
.
Tick
+=
Timer_Tick
;
timer
.
Start
();
timer
.
Tick
+=
(
s
,
e
)
=>
{
if
(
IsNewest
)
return
;
if
(
AutoKeepNewestTimeRemaining
>
0
)
AutoKeepNewestTimeRemaining
--;
if
(
AutoKeepNewestTimeRemaining
<=
0
)
{
ToNewest
();
}
};
this
.
PropertyChanged
+=
(
s
,
e
)
=>
{
if
(
e
.
PropertyName
==
nameof
(
IsNewest
))
{
timer
.
IsEnabled
=
!
IsNewest
;
}
};
}
private
void
BulkDb_PropertyChanged
(
object
sender
,
PropertyChangedEventArgs
e
)
...
...
@@ -290,17 +307,6 @@ namespace FLY.Weight.UI.Client.UiModule
UpdateY
();
}
private
void
Timer_Tick
(
object
sender
,
EventArgs
e
)
{
if
(!
IsNewest
&&
AutoKeepNewestTimeRemaining
>
0
)
{
AutoKeepNewestTimeRemaining
--;
if
(
AutoKeepNewestTimeRemaining
==
0
)
{
ToNewest
();
}
}
}
void
BindingSeries
()
...
...
Project.FLY.Weight2/FLY.Weight2.UI.Client/UiModule/FlowGraph.xaml.cs
View file @
8c24e2dc
...
...
@@ -244,8 +244,25 @@ namespace FLY.Weight2.UI.Client.UiModule
timer
=
new
DispatcherTimer
();
timer
.
Interval
=
TimeSpan
.
FromSeconds
(
1
);
timer
.
Tick
+=
Timer_Tick
;
timer
.
Start
();
timer
.
Tick
+=
(
s
,
e
)
=>
{
if
(
IsNewest
)
return
;
if
(
AutoKeepNewestTimeRemaining
>
0
)
AutoKeepNewestTimeRemaining
--;
if
(
AutoKeepNewestTimeRemaining
<=
0
)
{
ToNewest
();
}
};
this
.
PropertyChanged
+=
(
s
,
e
)
=>
{
if
(
e
.
PropertyName
==
nameof
(
IsNewest
))
{
timer
.
IsEnabled
=
!
IsNewest
;
}
};
}
private
void
BulkDb_PropertyChanged
(
object
sender
,
PropertyChangedEventArgs
e
)
...
...
@@ -288,17 +305,7 @@ namespace FLY.Weight2.UI.Client.UiModule
UpdateY
();
}
private
void
Timer_Tick
(
object
sender
,
EventArgs
e
)
{
if
(!
IsNewest
&&
AutoKeepNewestTimeRemaining
>
0
)
{
AutoKeepNewestTimeRemaining
--;
if
(
AutoKeepNewestTimeRemaining
==
0
)
{
ToNewest
();
}
}
}
void
BindingSeries
()
...
...
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