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
05f61f16
Commit
05f61f16
authored
Jan 21, 2021
by
yiyu.li
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add
parent
5b3c335c
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
381 additions
and
24 deletions
+381
-24
feedingBlanking.vue
Html/src/view/fml/operation_manage/feedingBlanking.vue
+0
-0
lineMonitor.vue
Html/src/view/fml/statistical_analysis/lineMonitor.vue
+253
-7
taskList.vue
Html/src/view/fml/statistical_analysis/taskList.vue
+128
-17
reworkentry.vue
Html/src/view/qms/rework/reworkentry.vue
+0
-0
No files found.
Html/src/view/fml/operation_manage/feedingBlanking.vue
View file @
05f61f16
This diff is collapsed.
Click to expand it.
Html/src/view/fml/statistical_analysis/lineMonitor.vue
View file @
05f61f16
<
template
>
<
template
>
<div>
<div>
产线监控管理
<div
class=
"divborder"
>
</div>
<h2>
基本信息
</h2>
<div
class=
"newSearchDiv"
>
<div
class=
"filter"
>
<label>
{{
$t
(
"1950574"
)
}}
:
</label>
<Cascader
trigger=
"click"
class=
"searchSelect"
></Cascader>
</div>
<div
class=
"searchBtn"
>
<Button
type=
"primary"
class=
"twoWord"
icon=
"ios-search"
>
{{
$t
(
"1001"
)
}}
</Button>
<Button
type=
"primary"
class=
"twoWord"
icon=
"ios-search"
>
导出
</Button
>
</div>
</div>
</div>
<div
class=
"divborder"
>
<div
class=
"stateTitle flex"
>
<p><span>
4
</span>
生产中
</p>
<p><span>
4
</span>
待下料
</p>
<p><span>
4
</span>
待上料
</p>
<p><span>
4
</span>
不可用
</p>
</div>
<div
class=
"stateWrap"
>
<div
class=
"stateItem"
>
<p
class=
"flex"
>
<span
class=
"infoLabel"
>
工位:
</span>
<span
class=
"info"
></span>
</p>
<p
class=
"flex"
>
<span
class=
"infoLabel"
>
产品:
</span>
<span
class=
"info"
></span>
</p>
<p
class=
"flex"
>
<span
class=
"infoLabel"
>
工装:
</span>
<span
class=
"info"
></span>
</p>
<p
class=
"flex"
>
<span
class=
"infoLabel"
>
储位:
</span>
<span
class=
"info"
></span>
</p>
<p
class=
"flex"
>
<span
class=
"infoLabel"
>
工件:
</span>
<span
class=
"info"
></span>
</p>
</div>
</div>
<Table
class=
"tableClass"
:data=
"data1"
:columns=
"columns1"
:max-height=
"200"
></Table>
<Table
class=
"tableClass"
:data=
"data2"
:columns=
"columns2"
:max-height=
"200"
></Table>
<Table
class=
"tableClass"
:data=
"data3"
:columns=
"columns3"
:max-height=
"200"
></Table>
</div>
</div>
</
template
>
</
template
>
<
script
>
<
script
>
export
default
{
export
default
{
data
()
{
}
return
{
productionLine
:
[],
a
:
0
,
modal
:
false
,
columns1
:
[
{
title
:
this
.
$t
(
"1008"
),
key
:
"xuhao"
,
render
:
(
h
,
params
)
=>
{
return
h
(
"span"
,
params
.
index
+
(
this
.
page
-
1
)
*
this
.
pagesize
+
1
);
},
width
:
70
,
},
{
title
:
"产线层级"
,
key
:
"warehouse"
,
},
{
title
:
"设备"
,
key
:
"storage_sn"
,
},
{
title
:
"工装编号"
,
key
:
"install_sn"
,
},
{
title
:
"产品编号"
,
key
:
"workpiece_sn"
,
},
{
title
:
"工件编号"
,
key
:
"storage_sn"
,
},
{
title
:
"状态"
,
key
:
"install_sn"
,
},
{
title
:
"最后更新时间"
,
key
:
"workpiece_sn"
,
},
],
data1
:
[],
columns2
:
[
{
title
:
this
.
$t
(
"1008"
),
key
:
"xuhao"
,
render
:
(
h
,
params
)
=>
{
return
h
(
"span"
,
params
.
index
+
(
this
.
page
-
1
)
*
this
.
pagesize
+
1
);
},
width
:
70
,
},
{
title
:
"父工装类别"
,
key
:
"warehouse"
,
},
{
title
:
"父工装编号"
,
key
:
"storage_sn"
,
},
{
title
:
"父工装名称"
,
key
:
"install_sn"
,
},
{
title
:
"父工装规格"
,
key
:
"workpiece_sn"
,
},
{
title
:
"父工装编号"
,
key
:
"storage_sn"
,
},
{
title
:
"子工装类别"
,
key
:
"install_sn"
,
},
{
title
:
"最后更新时间"
,
key
:
"workpiece_sn"
,
},
],
data1
:
[],
columns3
:
[
{
title
:
this
.
$t
(
"1008"
),
key
:
"xuhao"
,
render
:
(
h
,
params
)
=>
{
return
h
(
"span"
,
params
.
index
+
(
this
.
page
-
1
)
*
this
.
pagesize
+
1
);
},
width
:
70
,
},
{
title
:
"产线层级"
,
key
:
"warehouse"
,
},
{
title
:
"设备"
,
key
:
"storage_sn"
,
},
{
title
:
"工装编号"
,
key
:
"install_sn"
,
},
{
title
:
"产品编号"
,
key
:
"workpiece_sn"
,
},
{
title
:
"工件编号"
,
key
:
"storage_sn"
,
},
{
title
:
"状态"
,
key
:
"install_sn"
,
},
{
title
:
"最后更新时间"
,
key
:
"workpiece_sn"
,
},
],
data1
:
[],
};
},
created
()
{},
};
</
script
>
</
script
>
<
style
>
<
style
lang=
"less"
scoped
>
.flex
{
display
:
flex
;
}
.stateWrap
{
margin
:
20px
10px
;
}
.stateItem
{
border
:
1px
solid
#000
;
width
:
200px
;
height
:
150px
;
padding-left
:
10px
;
p
{
height
:
30px
;
line-height
:
30px
;
font-size
:
16px
;
}
}
.stateTitle
{
p
{
font-size
:
20px
;
width
:
150px
;
height
:
40px
;
line-height
:
40px
;
span
{
display
:
inline-block
;
margin
:
0
10px
;
text-align
:
center
;
width
:
40px
;
height
:
40px
;
color
:
#fff
;
//
border
:
1px
solid
#333
;
}
}
p
:nth-child
(
1
)
span
{
background-color
:
#2db7f5
;
}
p
:nth-child
(
2
)
span
{
background-color
:
#19be6b
;
}
p
:nth-child
(
3
)
span
{
background-color
:
#ff9900
;
}
p
:nth-child
(
4
)
span
{
background-color
:
#ed4014
;
}
}
</
style
>
</
style
>
\ No newline at end of file
Html/src/view/fml/statistical_analysis/taskList.vue
View file @
05f61f16
<
template
>
<
template
>
<div
class=
"testdiv"
>
<div
class=
"testdiv"
>
\任务清单管理
<div
class=
"divborder"
>
<div
class=
"divborder"
>
<h2>
基本信息
</h2>
<h2>
基本信息
</h2>
<div
class=
"newSearchDiv"
>
<div
class=
"newSearchDiv"
>
<div
class=
"filter"
>
<div
class=
"filter"
>
<label>
{{
$t
(
"1950574"
)
}}
:
</label>
<label>
{{
$t
(
"1132"
)
}}
:
</label>
<Cascader
trigger=
"click"
class=
"searchSelect"
></Cascader>
<Cascader
trigger=
"click"
class=
"searchSelect"
:data=
"datalevel"
:value=
"leveldata"
></Cascader>
</div>
</div>
<div
class=
"filter"
>
<div
class=
"filter"
>
<label>
任务类型:
</label>
<label>
任务类型:
</label>
...
@@ -83,17 +87,33 @@
...
@@ -83,17 +87,33 @@
></DatePicker>
></DatePicker>
</div>
</div>
<div
class=
"searchBtn"
>
<div
class=
"searchBtn"
>
<Button
type=
"primary"
class=
"twoWord"
icon=
"ios-search"
>
{{
<Button
$t
(
"1001"
)
type=
"primary"
}}
</Button>
class=
"twoWord"
icon=
"ios-search"
@
click=
"search()"
>
{{
$t
(
"1001"
)
}}
</Button
>
<!-- -->
<!-- -->
<Button
type=
"primary"
class=
"twoWord"
icon=
"ios-search"
<Button
type=
"warning"
class=
"twoWord"
icon=
"ios-search"
@
click=
"cancel()"
>
取消
</Button
>
取消
</Button
>
<!--只有状态是待执行的可以改成取消-->
>
<!--只有状态是待执行的可以改成取消-->
<Button
type=
"primary"
class=
"twoWord"
icon=
"ios-search"
<Button
type=
"primary"
class=
"twoWord"
icon=
"ios-search"
@
click=
"manual()"
>
手动
</Button
>
手动
</Button
>
<!--当生产线的模式是手动是才可以进行手动任务执行-->
>
<!--当生产线的模式是手动是才可以进行手动任务执行-->
<Button
type=
"primary"
class=
"twoWord"
icon=
"ios-search"
<Button
type=
"primary"
class=
"twoWord"
icon=
"ios-search"
@
click=
"exportExcel()"
>
导出
</Button
>
导出
</Button
>
>
</div>
</div>
...
@@ -121,22 +141,91 @@
...
@@ -121,22 +141,91 @@
export
default
{
export
default
{
data
()
{
data
()
{
return
{
return
{
leveldata
:
[],
// 产线层级插件所需数据
datalevel
:
[],
// 产线层级选中数据
columns1
:
[
columns1
:
[
{
{
title
:
this
.
$t
(
'1008'
),
title
:
this
.
$t
(
"1008"
),
key
:
'xuhao'
,
key
:
"xuhao"
,
render
:
(
h
,
params
)
=>
{
render
:
(
h
,
params
)
=>
{
return
h
(
return
h
(
'span'
,
"span"
,
params
.
index
+
(
this
.
page
-
1
)
*
this
.
pagesize
+
1
params
.
index
+
(
this
.
page
-
1
)
*
this
.
pagesize
+
1
);
);
},
},
width
:
70
width
:
70
,
},
{
title
:
"任务清单"
,
key
:
"productcode"
,
},
{
title
:
"产线层级"
,
key
:
"productcode"
,
},
{
title
:
"触发方"
,
key
:
"productcode"
,
},
{
title
:
"任务类型"
,
key
:
"productcode"
,
},
},
{
{
title
:
this
.
$t
(
'100089'
),
title
:
"发起地"
,
key
:
'productcode'
,
key
:
"productcode"
,
minWidth
:
150
},
{
title
:
"工件编号"
,
key
:
"productcode"
,
},
{
title
:
"工单编号"
,
key
:
"productcode"
,
},
{
title
:
"产品编号"
,
key
:
"productcode"
,
},
{
title
:
"工序编号"
,
key
:
"productcode"
,
},
{
title
:
"工序"
,
key
:
"productcode"
,
},
{
title
:
"程序号"
,
key
:
"productcode"
,
},
{
title
:
"储位位置"
,
key
:
"productcode"
,
},
{
title
:
"工装编号"
,
key
:
"productcode"
,
},
{
title
:
"动作"
,
key
:
"productcode"
,
},
{
title
:
"执行类型"
,
key
:
"productcode"
,
},
{
title
:
"状态"
,
key
:
"productcode"
,
},
{
title
:
"触发时间"
,
key
:
"productcode"
,
},
{
title
:
"完成时间"
,
key
:
"productcode"
,
},
},
],
],
data1
:
[],
data1
:
[],
...
@@ -147,8 +236,30 @@ export default {
...
@@ -147,8 +236,30 @@ export default {
},
},
created
()
{
created
()
{
this
.
columns1
=
this
.
$time
.
initTableTitle
(
this
.
columns1
);
this
.
columns1
=
this
.
$time
.
initTableTitle
(
this
.
columns1
);
this
.
initlevel
()
},
methods
:
{
search
()
{},
cancel
()
{},
manual
()
{},
exportExcel
()
{},
initlevel
()
{
// 初始化产线层级
this
.
axios
.
request
({
url
:
"config/ProjectLevelSection/GetSectionTree"
,
method
:
"get"
,
})
.
then
((
res
)
=>
{
const
arr
=
[];
if
(
res
.
data
.
data
.
length
>
0
)
{
this
.
datalevel
=
res
.
data
.
data
;
arr
.
push
(
res
.
data
.
data
[
0
].
value
);
this
.
leveldata
=
arr
;
}
});
},
},
},
methods
:
{},
};
};
</
script
>
</
script
>
...
...
Html/src/view/qms/rework/reworkentry.vue
View file @
05f61f16
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