Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mes-ui
Project
Project
Details
Activity
Releases
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
周远喜
mes-ui
Commits
202f415b
Commit
202f415b
authored
Apr 01, 2020
by
renjintao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
apsUrl&&apsManualUrl
parent
5019055e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
61 deletions
+19
-61
api.js
pages/aps/aps/api.js
+9
-9
index.vue
pages/aps/aps/index.vue
+1
-44
api.js
pages/aps/scheduling/api.js
+6
-6
config.js
static/config.js
+3
-2
No files found.
pages/aps/aps/api.js
View file @
202f415b
...
...
@@ -21,39 +21,39 @@ export default {
},
//获取排产池数据列表
getall
()
{
return
Api
.
get
(
`
${
aps
}
/Mes_part_task_plan_simulate/getall`
);
return
Api
.
get
(
`
${
aps
Url
}
/Mes_part_task_plan_simulate/getall`
);
},
//点开排产池列表查看对应的工序
getbyorderid
(
params
)
{
return
Api
.
get
(
`
${
aps
}
/mes_op_task_plan_simulate/getbyorderid`
,
params
);
return
Api
.
get
(
`
${
aps
Url
}
/mes_op_task_plan_simulate/getbyorderid`
,
params
);
},
//订单优先级
orderpriority
(
params
)
{
return
Api
.
post
(
`
${
aps
}
/apspoolappservices/orderpriority`
,
params
);
return
Api
.
post
(
`
${
aps
Url
}
/apspoolappservices/orderpriority`
,
params
);
},
//删除工序
removeoptasksimluate
(
params
)
{
return
Api
.
post
(
`
${
aps
}
/apspoolappservices/removeoptasksimluate`
,
params
);
return
Api
.
post
(
`
${
aps
Url
}
/apspoolappservices/removeoptasksimluate`
,
params
);
},
//恢复工艺
recoveryoptasksimluate
(
params
)
{
return
Api
.
post
(
`
${
aps
}
/apspoolappservices/recoveryoptasksimluate`
,
params
);
return
Api
.
post
(
`
${
aps
Url
}
/apspoolappservices/recoveryoptasksimluate`
,
params
);
},
//移出排产池
shiftoutapspool
(
params
)
{
return
Api
.
post
(
`
${
aps
}
/apspoolappservices/shiftoutapspool`
,
params
);
return
Api
.
post
(
`
${
aps
Url
}
/apspoolappservices/shiftoutapspool`
,
params
);
},
//排产计算
apsprepareandcalc
(
params
)
{
return
Api
.
post
(
`
${
aps
}
/apspoolappservices/apsprepareandcalc`
,
params
);
return
Api
.
post
(
`
${
aps
Url
}
/apspoolappservices/apsprepareandcalc`
,
params
);
},
//排产方案下发
processschemedispatch
(
params
)
{
return
Api
.
post
(
`
${
aps
}
/apspoolappservices/processschemedispatch`
,
params
);
return
Api
.
post
(
`
${
aps
Url
}
/apspoolappservices/processschemedispatch`
,
params
);
},
//APS排产前数据合法性校验
recoveryoptasksimluate
(
params
)
{
return
Api
.
post
(
`
${
aps
}
/apspoolappservices/apsdatachecked`
,
params
);
return
Api
.
post
(
`
${
aps
Url
}
/apspoolappservices/apsdatachecked`
,
params
);
},
}
pages/aps/aps/index.vue
View file @
202f415b
...
...
@@ -61,48 +61,6 @@ export default {
deletelModal
:
false
,
apsModal
:
false
,
list
:
[
// {
// id: 1,
// part_task_pk: '2092',
// priority: '1',
// plan_qty: '6',
// spare_qty: '0',
// plan_start: '13/03/2020',
// plan_finish: '06/04/2020',
// notes: '',
// demand_start: '17/01/2020',
// demand_finish: '24/01/2020',
// insert_flag: 0,
// badjustflag: '0'
// },
// {
// id: 2,
// part_task_pk: '2095',
// priority: '2',
// plan_qty: '7',
// spare_qty: '0',
// plan_start: '13/03/2020',
// plan_finish: '09/04/2020',
// notes: 'null',
// demand_start: '17/01/2020',
// demand_finish: '24/01/2020',
// insert_flag: 1,
// badjustflag: '0'
// },
// {
// id: 3,
// part_task_pk: '2096',
// priority: '3',
// plan_qty: '9',
// spare_qty: '0',
// plan_start: '13/03/2020',
// plan_finish: '26/03/2020',
// notes: 'null',
// demand_start: '20/01/2020',
// demand_finish: '24/01/2020',
// insert_flag: 0,
// badjustflag: '0'
// }
],
curId
:
0
,
columns
:
[
...
...
@@ -271,7 +229,6 @@ export default {
}
},
mounted
()
{
//console.log(this)
this
.
loadList
()
},
...
...
@@ -285,7 +242,7 @@ export default {
Api
.
getall
().
then
((
res
)
=>
{
if
(
res
.
success
)
{
//
this.list=res.result
this
.
list
=
res
.
result
}
})
},
...
...
pages/aps/scheduling/api.js
View file @
202f415b
import
Api
from
'@/plugins/request'
export
default
{
getmesorder
(
params
)
{
return
Api
.
get
(
`
${
aps
}
/aps/getmesorder`
,
params
);
//待排产订单数据
return
Api
.
get
(
`
${
aps
ManualUrl
}
/aps/getmesorder`
,
params
);
//待排产订单数据
},
gettaskseqinfo
(
params
)
{
return
Api
.
get
(
`
${
aps
}
/aps/gettaskseqinfo`
,
params
);
//根据订单获取全部工序数据
return
Api
.
get
(
`
${
aps
ManualUrl
}
/aps/gettaskseqinfo`
,
params
);
//根据订单获取全部工序数据
},
getlist
(
params
)
{
return
Api
.
get
(
`
${
aps
}
/mes_sys_shop_info/getlist`
,
params
);
//手工排产:查询所在车间下的所有班组信息
return
Api
.
get
(
`
${
aps
ManualUrl
}
/mes_sys_shop_info/getlist`
,
params
);
//手工排产:查询所在车间下的所有班组信息
},
getbyshopid
(
params
)
{
return
Api
.
get
(
`
${
aps
}
/mes_sys_user_info/getuserbyshopid`
,
params
);
//手工排产:根据班组ID,加载人员信息
return
Api
.
get
(
`
${
aps
ManualUrl
}
/mes_sys_user_info/getuserbyshopid`
,
params
);
//手工排产:根据班组ID,加载人员信息
},
getlistEquip
(
params
)
{
return
Api
.
get
(
`
${
aps
}
/mes_equip_info/getlist`
,
params
);
//手工排产:获取所在车间的设备
return
Api
.
get
(
`
${
aps
ManualUrl
}
/mes_equip_info/getlist`
,
params
);
//手工排产:获取所在车间的设备
},
getbyequippk
(
params
)
{
return
Api
.
get
(
`
${
aps
}
/mes_sys_user_info/getuserbyequippk`
,
params
);
//手工排产:根据设备ID,加载人员信息
return
Api
.
get
(
`
${
aps
ManualUrl
}
/mes_sys_user_info/getuserbyequippk`
,
params
);
//手工排产:根据设备ID,加载人员信息
},
}
\ No newline at end of file
static/config.js
View file @
202f415b
...
...
@@ -30,7 +30,7 @@ const systemApi = {
let
hostAddress
=
"localhost"
;
//192.168.0.159
let
filePath
=
'39.100.148.168'
;
//文件上传ip
let
filePathDown
=
'39.100.148.168'
;
//文件上传ip
let
aps
Url
=
'47.92.102.113'
let
aps
Adress
=
'47.92.102.113'
let
address
=
systemApi
.
cloudServer
;
//占位符自动替换:
window
.
systemUrl
=
`http://
${
address
}
:10020/api/services/app`
;
//System-api 系统管理(基础数据)
...
...
@@ -47,7 +47,8 @@ const systemApi = {
window
.
certificateUrl
=
`http://
${
address
}
:10090/api/services/app`
;
//Process-api
window
.
crmUrl
=
`http://
${
address
}
:10100/api/services/app`
;
//crm客户、合同、项目管理
window
.
iconImg
=
`http://
${
hostAddress
}
:3000/imgicon/`
;
//待办任务图标路径
window
.
aps
=
`http://
${
apsUrl
}
:10110/api/services/app`
;
//aps手工排产
window
.
apsUrl
=
`http://
${
apsAdress
}
:10110/api/services/app`
;
//aps排产
window
.
apsManualUrl
=
`http://
${
apsAdress
}
:10091/api/services/app`
;
//aps手工排产
//oidc配置:
window
.
authConfig
=
{
authority
:
`http://
${
address
}
:10010`
,
...
...
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