Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
G
GC_Branch
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
周磊
GC_Branch
Commits
8508b00e
Commit
8508b00e
authored
Aug 14, 2018
by
wangjunqiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'wang_master' of
https://gitee.com/wangwanxh/Vocs
into wang_master
parents
2544a6c0
9015a986
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
MDIBase.cs
GcDevicePc/MDIBase.cs
+1
-1
No files found.
GcDevicePc/MDIBase.cs
View file @
8508b00e
...
@@ -398,7 +398,7 @@ namespace GcDevicePc
...
@@ -398,7 +398,7 @@ namespace GcDevicePc
float
fDetvalueold
=
0.0f
;
float
fDetvalueold
=
0.0f
;
private
void
timer1_Tick
(
object
sender
,
EventArgs
e
)
private
void
timer1_Tick
(
object
sender
,
EventArgs
e
)
{
{
this
.
Text
=
String
.
Format
(
"VOCs在线监测-1.1.3.0
6
{0}"
,
Formstr
);
this
.
Text
=
String
.
Format
(
"VOCs在线监测-1.1.3.0
7
{0}"
,
Formstr
);
if
(
LandIn
.
Island
)
if
(
LandIn
.
Island
)
{
{
HmiStatus
.
Text
=
String
.
Format
(
"状态:{0}"
,
statestr
);
HmiStatus
.
Text
=
String
.
Format
(
"状态:{0}"
,
statestr
);
...
...
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