Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
Laisi_AutoMES2
Overview
Overview
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
jiawei.su
Laisi_AutoMES2
Commits
6c7d3c42
Commit
6c7d3c42
authored
Jan 25, 2021
by
yiyu.li
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add
parent
572eae4f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
16 deletions
+18
-16
feedingBlanking.vue
Html/src/view/fml/operation_manage/feedingBlanking.vue
+8
-8
lineMonitor.vue
Html/src/view/fml/statistical_analysis/lineMonitor.vue
+10
-8
No files found.
Html/src/view/fml/operation_manage/feedingBlanking.vue
View file @
6c7d3c42
...
@@ -263,7 +263,7 @@ export default {
...
@@ -263,7 +263,7 @@ export default {
a
:
-
1
,
a
:
-
1
,
b
:
-
1
,
b
:
-
1
,
attr1
:
false
,
//上料、下料、上下料
attr1
:
false
,
//上料、下料、上下料
attr2
:
tru
e
,
//上料、下料、上下料
attr2
:
fals
e
,
//上料、下料、上下料
modal
:
false
,
modal
:
false
,
code
:
""
,
//工令单
code
:
""
,
//工令单
columns1
:
[
columns1
:
[
...
@@ -370,13 +370,13 @@ export default {
...
@@ -370,13 +370,13 @@ export default {
this
.
b
=
index
;
this
.
b
=
index
;
let
status
=
this
.
stationList
[
index
].
status
;
let
status
=
this
.
stationList
[
index
].
status
;
this
.
sectionid
=
this
.
stationList
[
index
].
section
;
this
.
sectionid
=
this
.
stationList
[
index
].
section
;
if
(
status
==
3
)
{
//
if (status == 3) {
this
.
attr1
=
true
;
//
this.attr1 = true;
this
.
tabindex
=
"2"
;
//
this.tabindex = "2";
this
.
getRunningDetail
(
index
);
//
this.getRunningDetail(index);
}
else
{
//
} else {
this
.
attr2
=
true
;
//
this.attr2 = true;
}
//
}
if
(
status
==
2
)
{
if
(
status
==
2
)
{
this
.
getRunningDetail
(
index
);
this
.
getRunningDetail
(
index
);
}
}
...
...
Html/src/view/fml/statistical_analysis/lineMonitor.vue
View file @
6c7d3c42
...
@@ -10,6 +10,7 @@
...
@@ -10,6 +10,7 @@
class=
"searchSelect"
class=
"searchSelect"
:data=
"datalevel"
:data=
"datalevel"
:value=
"leveldata"
:value=
"leveldata"
change-on-select
@
on-change=
"getSectionId"
@
on-change=
"getSectionId"
></Cascader>
></Cascader>
</div>
</div>
...
@@ -34,6 +35,10 @@
...
@@ -34,6 +35,10 @@
<div
class=
"divborder"
>
<div
class=
"divborder"
>
<div
class=
"stateTitle flex"
>
<div
class=
"stateTitle flex"
>
<p>
<p>
<span>
{{
summary
.
waittingTotal
}}
</span
>
待上料
</p>
<p>
<span>
{{
summary
.
produceTotal
}}
</span
<span>
{{
summary
.
produceTotal
}}
</span
>
生产中
>
生产中
</p>
</p>
...
@@ -41,10 +46,7 @@
...
@@ -41,10 +46,7 @@
<span>
{{
summary
.
complateTotal
}}
</span
<span>
{{
summary
.
complateTotal
}}
</span
>
待下料
>
待下料
</p>
</p>
<p>
<span>
{{
summary
.
waittingTotal
}}
</span
>
待上料
</p>
<p>
<p>
<span>
{{
summary
.
disableTotal
}}
</span
<span>
{{
summary
.
disableTotal
}}
</span
>
不可用
>
不可用
...
@@ -347,10 +349,10 @@ export default {
...
@@ -347,10 +349,10 @@ export default {
bgc
=
"red"
;
bgc
=
"red"
;
}
}
if
(
ele
.
status
==
1
)
{
if
(
ele
.
status
==
1
)
{
bgc
=
"#
2db7f5
"
;
bgc
=
"#
ff9900
"
;
}
}
if
(
ele
.
status
==
2
)
{
if
(
ele
.
status
==
2
)
{
bgc
=
"#
ff9900
"
;
bgc
=
"#
2db7f5
"
;
}
}
if
(
ele
.
status
==
3
)
{
if
(
ele
.
status
==
3
)
{
bgc
=
"#19be6b"
;
bgc
=
"#19be6b"
;
...
@@ -445,13 +447,13 @@ export default {
...
@@ -445,13 +447,13 @@ export default {
//
border
:
1px
solid
#333
;
//
border
:
1px
solid
#333
;
}
}
}
}
p
:nth-child
(
1
)
span
{
p
:nth-child
(
3
)
span
{
background-color
:
#2db7f5
;
background-color
:
#2db7f5
;
}
}
p
:nth-child
(
2
)
span
{
p
:nth-child
(
2
)
span
{
background-color
:
#19be6b
;
background-color
:
#19be6b
;
}
}
p
:nth-child
(
3
)
span
{
p
:nth-child
(
1
)
span
{
background-color
:
#ff9900
;
background-color
:
#ff9900
;
}
}
p
:nth-child
(
4
)
span
{
p
:nth-child
(
4
)
span
{
...
...
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