Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
mes-pad
Project
Project
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
ximai
mes-pad
Commits
97a0ed43
Commit
97a0ed43
authored
Feb 24, 2024
by
李驰骋
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
登录改为选择作业单元
parent
d0ca3384
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
219 additions
and
209 deletions
+219
-209
http.api.js
common/http.api.js
+2
-0
index.vue
pages/index/index.vue
+204
-198
index.vue
pages/mes/prodReport/index.vue
+9
-8
index.js
store/index.js
+4
-3
No files found.
common/http.api.js
View file @
97a0ed43
...
...
@@ -26,6 +26,8 @@ const install = (Vue, vm) => {
params
),
getWorkstationList
:
(
params
=
{})
=>
vm
.
$u
.
get
(
config
.
adminPath
+
'/mobile/md/workstation/getWorkstationList'
,
params
),
getWorkUnitList
:
(
params
=
{})
=>
vm
.
$u
.
get
(
config
.
adminPath
+
'/md/workunit/getListByUser'
,
params
),
/**
* 生产管理相关API
**/
...
...
pages/index/index.vue
View file @
97a0ed43
...
...
@@ -18,21 +18,16 @@
</view>
<u-modal
width=
"90%"
v-model=
"showWorkstationFlag"
:showConfirmButton=
"false"
:showCancelButton=
"true"
title=
"请选择工作站"
content=
"操作内容"
>
<!--
<u-tabs
:list=
"processList"
:is-scroll=
"true"
:current=
"currentFlag"
name=
"processName"
@
change=
"getWorkstationList"
>
</u-tabs>
-->
<uv-tabs
:list=
"processList"
:current=
"currentFlag"
keyName=
"processName"
@
change=
"getWorkstationList"
v-if=
"showWorkstationFlag"
></uv-tabs>
<view
class=
"station_list"
>
<u-empty
text=
"暂无工作
站"
mode=
"list"
v-if=
"workstation
List.length==0"
<u-empty
text=
"暂无工作
单元"
mode=
"list"
v-if=
"workUnit
List.length==0"
style=
"margin: 0 auto;display: block;height: 360rpx;padding: 100rpx 0;"
></u-empty>
<template
v-else
>
<u-card
class=
"station_card"
:show-foot=
"false"
:title=
"'工作
站'+card.workstationCode"
:key=
"index
"
v-for=
"(card,index) in work
station
List"
>
<u-card
class=
"station_card"
:show-foot=
"false"
:title=
"'工作
单元'+card.workunitCode
"
v-for=
"(card,index) in work
Unit
List"
>
<view
class=
"station_card_text"
slot=
"body"
>
{{
'工作
站名称:'
+
card
.
workstation
Name
}}
<u-button
type=
"primary"
@
click=
"setWork
station
(card)"
{{
'工作
单元名称:'
+
card
.
workunit
Name
}}
<u-button
type=
"primary"
@
click=
"setWork
Unit
(card)"
style=
"margin-top: 30rpx;"
>
选择
</u-button>
</view>
...
...
@@ -45,7 +40,7 @@
title=
"请选择操作"
>
<view
class=
"logoutmenu"
>
<u-button
shape=
"circle"
class=
"menu_button"
@
click=
""
type=
"primary"
>
更改密码
</u-button>
<u-button
shape=
"circle"
class=
"menu_button"
@
click=
"handleCommand('work
station
')"
type=
"warning"
>
切换工作站
<u-button
shape=
"circle"
class=
"menu_button"
@
click=
"handleCommand('work
unit
')"
type=
"warning"
>
切换工作站
</u-button>
<u-button
shape=
"circle"
class=
"menu_button"
@
click=
"handleCommand('exit')"
type=
"error"
>
退出登录
</u-button>
</view>
...
...
@@ -54,14 +49,14 @@
</template>
<
script
>
import
TabHeader
from
"./TabHeader.vue"
import
ProContent
from
"../mes/pro/index.vue"
import
GxContent
from
"../mes/gx/index.vue"
import
QcContent
from
"../mes/qc/index.vue"
import
ProdReport
from
"../mes/prodReport/index.vue"
import
DictData
from
'@/components/DictData'
import
TabHeader
from
"./TabHeader.vue"
import
ProContent
from
"../mes/pro/index.vue"
import
GxContent
from
"../mes/gx/index.vue"
import
QcContent
from
"../mes/qc/index.vue"
import
ProdReport
from
"../mes/prodReport/index.vue"
import
DictData
from
'@/components/DictData'
export
default
{
export
default
{
name
:
'HomePage'
,
components
:
{
TabHeader
,
...
...
@@ -82,6 +77,7 @@ export default {
},
processList
:
[],
//工序清单
workstationList
:
[],
//工作站清单
workUnitList
:[],
//工作站清单
currentFlag
:
0
}
},
...
...
@@ -89,16 +85,16 @@ export default {
uni
.
$on
(
'switchTab'
,
(
indexCode
)
=>
{
this
.
tabIndex
=
indexCode
;
})
uni
.
$on
(
'changeWorkstation
'
,
(
indexCode
)
=>
{
this
.
handleCommand
(
'workstation
'
);
uni
.
$on
(
'changeWorkunit
'
,
(
indexCode
)
=>
{
this
.
handleCommand
(
'workunit
'
);
})
this
.
checkWorkstation
();
this
.
getProcess
List
();
this
.
getWorkUnit
List
();
},
destroyed
()
{
uni
.
$off
(
'switchTab'
);
uni
.
$off
(
'changeWorkstation
'
);
uni
.
$off
(
'changeWorkunit
'
);
},
methods
:
{
//用户部分点击
...
...
@@ -110,9 +106,9 @@ export default {
//检查工作站设置情况
checkWorkstation
()
{
if
(
this
.
vuex_workstation
==
null
)
{
if
(
this
.
vuex_workunit
==
null
)
{
this
.
showWorkstationFlag
=
true
;
this
.
$u
.
toast
(
"请设置当前触控屏的工作站
!"
);
this
.
$u
.
toast
(
"请设置当前触控屏的工作单元
!"
);
}
},
//获取工序清单
...
...
@@ -142,11 +138,21 @@ export default {
}
});
},
getWorkUnitList
(
item
)
{
this
.
$u
.
api
.
getWorkUnitList
({
}).
then
(
res
=>
{
if
(
res
.
code
===
200
)
{
this
.
workUnitList
=
res
.
rows
;
}
else
{
this
.
$u
.
toast
(
"获取工作单元清单异常"
+
res
.
msg
);
}
});
},
//设置当前触控屏的工作站
setWorkstation
(
station
)
{
this
.
$u
.
vuex
(
'vuex_workstation
'
,
station
);
setWorkUnit
(
station
)
{
this
.
$u
.
vuex
(
'vuex_workunit
'
,
station
);
this
.
showWorkstationFlag
=
false
;
uni
.
$emit
(
'switchWorkstation
'
,
station
);
uni
.
$emit
(
'switchWorkunit
'
,
station
);
},
handleCommand
(
command
)
{
if
(
command
===
'exit'
)
{
...
...
@@ -166,32 +172,32 @@ export default {
},
500
);
}
})
}
else
if
(
command
==
'workstation
'
)
{
}
else
if
(
command
==
'workunit
'
)
{
this
.
showLogoutMenu
=
false
;
this
.
showWorkstationFlag
=
true
;
}
}
}
}
}
</
script
>
<
style
>
.common-container
{
.common-container
{
width
:
100vw
;
height
:
100vh
;
display
:
flex
;
}
}
.common-head
{
.common-head
{
height
:
40px
;
background-color
:
rgb
(
3
,
26
,
60
);
display
:
flex
;
align-items
:
center
;
padding
:
0
15px
;
box-sizing
:
border-box
;
}
}
.header
{
.header
{
width
:
120px
;
background-color
:
#132138
;
color
:
aliceblue
;
...
...
@@ -206,63 +212,63 @@ export default {
margin
:
40
rpx
auto
;
display
:
block
;
}
}
}
.header
.divItem
{
.header
.divItem
{
height
:
100%
;
align-items
:
center
;
}
}
.header
.workstation
{
.header
.workstation
{
text-align
:
center
;
flex-grow
:
1
;
}
}
.header
.user
{
.header
.user
{
width
:
30%
;
}
}
.header
.user
.user-icon
{
.header
.user
.user-icon
{
float
:
right
;
}
}
img
{
img
{
width
:
40px
;
height
:
40px
;
border-radius
:
20px
;
margin-left
:
10px
;
}
}
.header
.user
.user-text
{
.header
.user
.user-text
{
float
:
right
;
}
}
.logoutmenu
{
.logoutmenu
{
width
:
100%
;
display
:
flex
;
justify-content
:
center
;
}
}
.menu_button
{
.menu_button
{
width
:
100px
;
margin
:
10px
;
}
}
.station_modal
{
}
.station_modal
{
}
.station_list
{
.station_list
{
display
:
flex
;
flex-wrap
:
wrap
;
}
}
.station_card
{
.station_card
{
width
:
250px
;
height
:
150px
;
}
}
.common-main
{
.common-main
{
flex
:
1
;
height
:
100%
;
padding
:
6px
6px
6px
0
;
...
...
@@ -270,9 +276,9 @@ img {
width
:
100%
;
overflow
:
auto
;
background-image
:
linear-gradient
(
to
top
right
,
rgb
(
19
26
56
),
rgb
(
33
64
128
));
}
}
.setting-body
{
.setting-body
{
position
:
absolute
;
bottom
:
20
rpx
;
width
:
200
rpx
;
...
...
@@ -284,5 +290,5 @@ img {
.setting-icon
{
margin
:
10
rpx
10
rpx
;
}
}
}
</
style
>
pages/mes/prodReport/index.vue
View file @
97a0ed43
...
...
@@ -63,9 +63,9 @@
</view>
<view
class=
"prod-body-right"
>
<view
style=
"text-align: center;line-height: 80rpx;font-size: 28rpx;font-weight: 600;"
>
{{
this
.
vuex_work
station
==
null
?
'请选择工作站'
:
this
.
vuex_workstation
.
workstation
Name
}}
{{
this
.
vuex_work
unit
==
null
?
'请选择工作单元'
:
this
.
vuex_workunit
.
workunit
Name
}}
</view>
<u-button
type=
"primary"
@
click=
"changeWorkstation"
>
切换工作
站
</u-button>
<u-button
type=
"primary"
@
click=
"changeWorkstation"
>
切换工作
单元
</u-button>
<br/>
<u-button
type=
"warning"
@
click=
"commonClick('KnifeTemp')"
>
刀模版上下机
</u-button>
<u-button
type=
"primary"
@
click=
"commonClick('Refresh')"
>
刷新
</u-button>
...
...
@@ -716,7 +716,7 @@ export default {
}
},
mounted
()
{
//监听工作站切换事件
uni
.
$on
(
'switchWork
station
'
,
(
station
)
=>
{
uni
.
$on
(
'switchWork
unit
'
,
(
station
)
=>
{
this
.
getTaskList
();
})
},
...
...
@@ -728,7 +728,7 @@ export default {
}
})
//监听工作站切换事件
uni
.
$on
(
'switchWork
station
'
,
(
station
)
=>
{
uni
.
$on
(
'switchWork
unit
'
,
(
station
)
=>
{
// this.reset();
this
.
getTaskList
();
})
...
...
@@ -737,7 +737,7 @@ export default {
this
.
getTaskList
();
//刷新任务状态
})
if
(
this
.
vuex_work
station
!=
null
)
{
if
(
this
.
vuex_work
unit
!=
null
)
{
this
.
getTaskList
();
}
// if (this.vuex_task != null) {
...
...
@@ -745,7 +745,7 @@ export default {
// }
},
destroyed
()
{
uni
.
$off
(
'switchWork
station
'
);
uni
.
$off
(
'switchWork
unit
'
);
uni
.
$off
(
'taskStatusChanged'
);
},
methods
:
{
...
...
@@ -759,7 +759,7 @@ export default {
console
.
log
(
'99999999'
,
arg
)
},
changeWorkstation
()
{
uni
.
$emit
(
'changeWork
station
'
);
uni
.
$emit
(
'changeWork
unit
'
);
},
commonClick
(
oper
)
{
if
([
'Refresh'
,
'MaterialUsageRecord'
].
indexOf
(
oper
)
===
-
1
&&
this
.
tableSelectData
.
length
===
0
)
{
...
...
@@ -929,8 +929,9 @@ export default {
},
getTaskList
()
{
this
.
form
=
{}
const
t
=
this
;
this
.
$u
.
api
.
getTaskList
({
work
stationId
:
this
.
vuex_workstation
.
workstation
Id
,
work
unitId
:
t
.
vuex_workunit
.
workunit
Id
,
}).
then
(
res
=>
{
if
(
res
.
code
===
200
)
{
this
.
tableData
=
res
.
rows
;
...
...
store/index.js
View file @
97a0ed43
...
...
@@ -46,6 +46,7 @@ const store = new Vuex.Store({
vuex_config
:
config
,
//当前设备绑定的工作站
vuex_workstation
:
null
,
vuex_workunit
:
null
,
//当前工作站正在进行的生产任务
vuex_task
:
null
,
...
...
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