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
4e299047
Commit
4e299047
authored
Jan 23, 2021
by
yiyu.li
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add
parent
b9a88432
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
52 additions
and
29 deletions
+52
-29
feedingBlanking.vue
Html/src/view/fml/operation_manage/feedingBlanking.vue
+52
-29
assemblyInfo.vue
Html/src/view/fms/associate/assemblyInfo.vue
+0
-0
No files found.
Html/src/view/fml/operation_manage/feedingBlanking.vue
View file @
4e299047
...
...
@@ -45,7 +45,8 @@
type=
"text"
class=
"searchInput"
style=
"width: 300px"
@
keyup
.
enter=
"getWorkOrderInfo()"
v-model=
"code"
@
on-keyup
.
enter=
"getWorkOrderInfo()"
/>
</div>
<div
class=
"row"
>
...
...
@@ -105,25 +106,33 @@
<span
class=
"infoLabel"
>
工单信息:
</span
>
<span
class=
"info"
></span>
<span
class=
"info"
>
{{
orderDetail
.
code
}}
</span>
</p>
<p
class=
"flex"
>
<span
class=
"infoLabel"
>
产品编号:
</span
>
<span
class=
"info"
></span>
<span
class=
"info"
>
{{
orderDetail
.
code
}}
</span>
</p>
<p
class=
"flex"
>
<span
class=
"infoLabel"
>
产品名称:
</span
>
<span
class=
"info"
></span>
<span
class=
"info"
>
{{
orderDetail
.
code
}}
</span>
</p>
<p
class=
"flex"
>
<span
class=
"infoLabel"
>
工件编号:
</span
>
<span
class=
"info"
></span>
<span
class=
"info"
>
{{
orderDetail
.
code
}}
</span>
</p>
</div>
<div
class=
"row"
>
...
...
@@ -131,19 +140,25 @@
<span
class=
"infoLabel"
>
状态:
</span
>
<span
class=
"info"
></span>
<span
class=
"info"
>
{{
orderDetail
.
code
}}
</span>
</p>
<p
class=
"flex"
>
<span
class=
"infoLabel"
>
储位编号:
</span
>
<span
class=
"info"
></span>
<span
class=
"info"
>
{{
orderDetail
.
code
}}
</span>
</p>
<p
class=
"flex"
>
<span
class=
"infoLabel"
>
工装编号:
</span
>
<span
class=
"info"
></span>
<span
class=
"info"
>
{{
orderDetail
.
code
}}
</span>
</p>
</div>
<div>
...
...
@@ -173,7 +188,8 @@
class=
"tableClass"
:data=
"data1"
:columns=
"columns1"
:max-height=
"200"
@
on-current-change=
"handleRowChange"
highlight-row
></Table>
</div>
<div
slot=
"footer"
>
...
...
@@ -209,15 +225,13 @@ export default {
attr1
:
false
,
//上料、下料、上下料
attr2
:
false
,
//上料、下料、上下料
modal
:
false
,
code
:
""
,
//工令单
columns1
:
[
{
title
:
this
.
$t
(
"1008"
),
key
:
"xuhao"
,
render
:
(
h
,
params
)
=>
{
return
h
(
"span"
,
params
.
index
+
1
);
return
h
(
"span"
,
params
.
index
+
1
);
},
width
:
70
,
},
...
...
@@ -244,10 +258,7 @@ export default {
title
:
this
.
$t
(
"1008"
),
key
:
"xuhao"
,
render
:
(
h
,
params
)
=>
{
return
h
(
"span"
,
params
.
index
+
1
);
return
h
(
"span"
,
params
.
index
+
1
);
},
width
:
70
,
},
...
...
@@ -265,6 +276,8 @@ export default {
},
],
data2
:
[],
orderDetail
:
{},
detailobj
:{}
};
},
created
()
{
...
...
@@ -326,7 +339,6 @@ export default {
if
(
res
.
data
.
ret
==
1
)
{
this
.
data1
=
res
.
data
.
data
;
this
.
data2
=
res
.
data
.
data
;
}
})
.
catch
((
err
)
=>
{
...
...
@@ -335,9 +347,17 @@ export default {
},
// 获取工单信息
getWorkOrderInfo
()
{
this
.
request
(
""
,
""
,
""
)
let
data
=
{
code
:
this
.
code
,
};
this
.
request
(
"/acc/AutomationOperate/ScanCode"
,
data
,
"get"
)
.
then
((
res
)
=>
{
if
(
res
.
data
.
ret
==
1
)
{
console
.
log
(
res
.
data
.
data
);
this
.
orderDetail
=
res
.
data
.
data
;
}
else
{
this
.
$Message
.
error
(
this
.
$t
(
res
.
data
,
msg
));
}
})
.
catch
((
err
)
=>
{
...
...
@@ -349,28 +369,31 @@ export default {
// 准备上料
let
data
=
{
section
:
13
,
section
:
13
,
code
:
"234324"
,
};
this
.
request
(
"/acc/AutomationOperate/Loading"
,
data
,
"post"
).
thne
((
res
)
=>
{
if
(
res
.
data
.
ret
==
1
)
{
this
.
request
(
"/acc/AutomationOperate/Loading"
,
data
,
"post"
).
thne
(
(
res
)
=>
{
if
(
res
.
data
.
ret
==
1
)
{
}
}
}
);
);
},
installOver
()
{
// 安装完成
let
data
=
{
section
:
13
section
:
13
,
};
this
.
request
(
""
,
data
,
"post"
).
thne
(
(
res
)
=>
{
if
(
res
.
data
.
ret
==
1
)
{
}
this
.
request
(
""
,
data
,
"post"
).
thne
((
res
)
=>
{
if
(
res
.
data
.
ret
==
1
)
{
}
);
}
);
},
handleRowChange
(
currentRow
,
oldCurrentRow
)
{
this
.
detailobj
=
currentRow
;
},
request
(
url
,
data
,
type
)
{
if
(
type
==
"get"
)
{
return
this
.
axios
...
...
Html/src/view/fms/associate/assemblyInfo.vue
View file @
4e299047
This diff is collapsed.
Click to expand it.
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