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
88da327b
Commit
88da327b
authored
Feb 03, 2021
by
yiyu.li
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
36edd467
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
10 deletions
+16
-10
taskList.vue
Html/src/view/fml/statistical_analysis/taskList.vue
+16
-10
No files found.
Html/src/view/fml/statistical_analysis/taskList.vue
View file @
88da327b
...
@@ -98,8 +98,7 @@
...
@@ -98,8 +98,7 @@
<div
class=
"filter"
>
<div
class=
"filter"
>
<label>
触发时间:
</label>
<label>
触发时间:
</label>
<DatePicker
<DatePicker
type=
"datetime"
type=
"datetimerange"
placeholder=
"Select date"
style=
"width: 200px"
style=
"width: 200px"
v-model=
"startTime"
v-model=
"startTime"
@
on-change=
"getTime"
@
on-change=
"getTime"
...
@@ -108,8 +107,7 @@
...
@@ -108,8 +107,7 @@
<div
class=
"filter"
>
<div
class=
"filter"
>
<label>
完成时间:
</label>
<label>
完成时间:
</label>
<DatePicker
<DatePicker
type=
"datetime"
type=
"datetimerange"
placeholder=
"Select date"
style=
"width: 200px"
style=
"width: 200px"
v-model=
"endTime"
v-model=
"endTime"
@
on-change=
"getTime2"
@
on-change=
"getTime2"
...
@@ -199,11 +197,13 @@ export default {
...
@@ -199,11 +197,13 @@ export default {
{
{
title
:
"任务编号"
,
title
:
"任务编号"
,
key
:
"taskno"
,
key
:
"taskno"
,
width
:
30
0
,
width
:
15
0
,
},
},
{
{
title
:
"产线层级"
,
title
:
"产线层级"
,
key
:
"section"
,
key
:
"section"
,
width
:
150
,
},
},
{
{
title
:
"触发方"
,
title
:
"触发方"
,
...
@@ -216,6 +216,8 @@ export default {
...
@@ -216,6 +216,8 @@ export default {
{
{
title
:
"工件编号"
,
title
:
"工件编号"
,
key
:
"sn"
,
key
:
"sn"
,
width
:
150
,
},
},
{
{
title
:
"工单编号"
,
title
:
"工单编号"
,
...
@@ -230,7 +232,7 @@ export default {
...
@@ -230,7 +232,7 @@ export default {
key
:
"routeNo"
,
key
:
"routeNo"
,
},
},
{
{
title
:
"工序"
,
title
:
"工序
名称
"
,
key
:
"route"
,
key
:
"route"
,
},
},
{
{
...
@@ -248,6 +250,8 @@ export default {
...
@@ -248,6 +250,8 @@ export default {
{
{
title
:
"动作"
,
title
:
"动作"
,
key
:
"action"
,
key
:
"action"
,
width
:
150
,
},
},
{
{
title
:
"执行类型"
,
title
:
"执行类型"
,
...
@@ -296,8 +300,8 @@ export default {
...
@@ -296,8 +300,8 @@ export default {
sn
:
""
,
sn
:
""
,
state
:
0
,
state
:
0
,
performType
:
0
,
performType
:
0
,
startTime
:
""
,
startTime
:
[]
,
endTime
:
""
,
endTime
:
[]
,
detailobj
:
{},
detailobj
:
{},
};
};
},
},
...
@@ -316,8 +320,10 @@ export default {
...
@@ -316,8 +320,10 @@ export default {
sn
:
this
.
sn
,
sn
:
this
.
sn
,
status
:
this
.
status
,
status
:
this
.
status
,
actionType
:
this
.
performType
,
actionType
:
this
.
performType
,
triggertime
:
this
.
startTime
,
triggerbegin
:
this
.
startTime
.
length
>
0
?
this
.
startTime
[
0
]:
''
,
complatetime
:
this
.
endTime
,
triggerend
:
this
.
startTime
.
length
>
0
?
this
.
startTime
[
1
]:
''
,
complatebegin
:
this
.
endTime
.
length
>
0
?
this
.
endTime
[
0
]:
''
,
complatend
:
this
.
endTime
.
length
>
0
?
this
.
endTime
[
1
]:
''
,
page
:
page
,
page
:
page
,
pageSize
:
pagesize
,
pageSize
:
pagesize
,
};
};
...
...
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