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
3b75ba64
Commit
3b75ba64
authored
Jan 29, 2021
by
yiyu.li
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
c8dff077
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
50 additions
and
27 deletions
+50
-27
lineMonitor.vue
Html/src/view/fml/statistical_analysis/lineMonitor.vue
+38
-26
assemblyInfo.vue
Html/src/view/fms/associate/assemblyInfo.vue
+12
-1
No files found.
Html/src/view/fml/statistical_analysis/lineMonitor.vue
View file @
3b75ba64
...
...
@@ -134,19 +134,19 @@ export default {
{
title
:
"工装编号"
,
key
:
"fixtureName"
,
render
:
(
h
,
params
)
=>
{
return
h
(
"a"
,
{
on
:
{
click
:
()
=>
{
// this.show1 = true;
},
},
},
"look"
);
},
//
render: (h, params) => {
//
return h(
//
"a",
//
{
//
on: {
//
click: () => {
//
// this.show1 = true;
//
},
//
},
//
},
//
"look"
//
);
//
},
},
{
title
:
"产品编号"
,
...
...
@@ -155,23 +155,35 @@ export default {
{
title
:
"工件编号"
,
key
:
"sn"
,
render
:
(
h
,
params
)
=>
{
return
h
(
"a"
,
{
on
:
{
click
:
()
=>
{
// this.show2 = true;
},
},
},
"look"
);
},
//
render: (h, params) => {
//
return h(
//
"a",
//
{
//
on: {
//
click: () => {
//
// this.show2 = true;
//
},
//
},
//
},
//
"look"
//
);
//
},
},
{
title
:
"状态"
,
key
:
"status"
,
render
:
(
h
,
params
)
=>
{
let
str
=
""
;
str
=
params
.
row
.
status
==
1
?
"待上料"
:
params
.
row
.
status
==
2
?
"生产中"
:
params
.
row
.
status
==
3
?
"待下料"
:
""
;
return
h
(
"div"
,
str
);
},
},
{
title
:
"最后更新时间"
,
...
...
Html/src/view/fms/associate/assemblyInfo.vue
View file @
3b75ba64
...
...
@@ -398,6 +398,17 @@ export default {
page
:
1
,
pagesize
:
10
,
columns2
:
[
{
type
:
"index2"
,
title
:
this
.
$t
(
"1008"
),
key
:
"xuhao"
,
render
:
(
h
,
params
)
=>
{
return
h
(
"span"
,
params
.
index
+
1
);
},
},
{
title
:
"子工装类型"
,
key
:
"category"
,
...
...
@@ -468,7 +479,7 @@ export default {
},
created
()
{
this
.
columns1
=
this
.
$time
.
initTableTitle
(
this
.
columns1
);
//
this.columns2 = this.$time.initTableTitle(this.columns2);
this
.
columns2
=
this
.
$time
.
initTableTitle
(
this
.
columns2
);
this
.
initFrockType
();
this
.
tosearch
();
...
...
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