Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
T
TF-MOM-WEB
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
TFMOM
TF-MOM-WEB
Commits
00297c7e
Commit
00297c7e
authored
Jan 11, 2024
by
jingnan
👀
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://94.191.100.41/tfmom/tf-mom-web
into dev
parents
444a9c92
4965b5b2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
37 additions
and
18 deletions
+37
-18
menu.js
applications/architecture-dee/src/store/modules/menu.js
+1
-1
my-task.vue
...ns/dee-task-center/src/views/home/compontents/my-task.vue
+36
-17
No files found.
applications/architecture-dee/src/store/modules/menu.js
View file @
00297c7e
...
@@ -99,7 +99,7 @@ const actions = {
...
@@ -99,7 +99,7 @@ const actions = {
// if (!state.activeModel || model.appId !== state.activeModel.id || (model.appId === 'todoTask' && state.activeModel.id !== 'todoTask')) {
// if (!state.activeModel || model.appId !== state.activeModel.id || (model.appId === 'todoTask' && state.activeModel.id !== 'todoTask')) {
if
(
model
.
appId
===
'todoTask'
||
model
.
appId
===
'homeCenter'
||
model
.
appId
===
'myMessage'
||
if
(
model
.
appId
===
'todoTask'
||
model
.
appId
===
'homeCenter'
||
model
.
appId
===
'myMessage'
||
model
.
appId
===
'myTaskReceive'
||
model
.
appId
===
'myCheckTaskReceive'
||
model
.
appId
===
'myTaskReceive'
||
model
.
appId
===
'myCheckTaskReceive'
||
model
.
appId
===
'myAirTaskReceive'
)
{
// 待办任务页特殊处理
model
.
appId
===
'myAirTaskReceive'
||
model
.
appId
===
'myExecutDispatch'
)
{
// 待办任务页特殊处理
commit
(
'SET_ACTIVE_MODEL'
,
{
commit
(
'SET_ACTIVE_MODEL'
,
{
id
:
model
.
appId
,
id
:
model
.
appId
,
path
:
{
...
model
.
pageInfo
}
path
:
{
...
model
.
pageInfo
}
...
...
applications/dee-task-center/src/views/home/compontents/my-task.vue
View file @
00297c7e
...
@@ -124,6 +124,11 @@ export default {
...
@@ -124,6 +124,11 @@ export default {
taskType
:
'适航任务'
,
taskType
:
'适航任务'
,
type
:
'DMIR'
,
type
:
'DMIR'
,
appId
:
'myAirTaskReceive'
appId
:
'myAirTaskReceive'
},
{
taskType
:
'执行派工'
,
type
:
'Dispatch'
,
appId
:
'myExecutDispatch'
}
}
]
]
}
}
...
@@ -140,7 +145,7 @@ export default {
...
@@ -140,7 +145,7 @@ export default {
},
},
mounted
:
function
()
{
mounted
:
function
()
{
this
.
quickAccessList
.
forEach
((
item
,
index
)
=>
{
this
.
quickAccessList
.
forEach
((
item
,
index
)
=>
{
this
.
getCustomModules
(
index
)
this
.
getCustomModules
(
index
,
item
)
})
})
},
},
methods
:
{
methods
:
{
...
@@ -263,19 +268,24 @@ export default {
...
@@ -263,19 +268,24 @@ export default {
query
:
{
title
:
'任务查询'
}
query
:
{
title
:
'任务查询'
}
})
})
},
},
getCustomModules
(
index
)
{
getCustomModules
(
index
,
item
)
{
if
(
item
.
type
===
'Dispatch'
)
{
get
(
`/indexTask/task/ProdTask`
,
{}).
then
(
res
=>
{
this
.
$set
(
this
.
quickAccessList
[
index
],
'taskCount'
,
res
.
items
.
count
)
})
}
else
{
const
params
=
{
const
params
=
{
type
:
this
.
quickAccessList
[
index
].
type
type
:
this
.
quickAccessList
[
index
].
type
}
}
get
(
`/indexTask/task/fitOut`
,
params
).
then
(
res
=>
{
get
(
`/indexTask/task/fitOut`
,
params
).
then
(
res
=>
{
this
.
$set
(
this
.
quickAccessList
[
index
],
'taskCount'
,
res
.
items
.
count
)
this
.
$set
(
this
.
quickAccessList
[
index
],
'taskCount'
,
res
.
items
.
count
)
})
})
}
},
},
goInfo
(
item
)
{
goInfo
(
item
)
{
this
.
clickTask
=
item
this
.
clickTask
=
item
// this.$emit('getTaskDetail', item ? { id: item.id, processInstanceId: item.processInstanceId, title: item.title } : null)
// this.$emit('getTaskDetail', item ? { id: item.id, processInstanceId: item.processInstanceId, title: item.title } : null)
if
(
item
.
type
===
'FitOut'
||
item
.
type
===
'CheckOut'
||
item
.
type
===
'DMIR'
)
{
if
(
item
.
type
===
'FitOut'
||
item
.
type
===
'CheckOut'
||
item
.
type
===
'DMIR'
||
item
.
type
===
'Dispatch'
)
{
this
.
goModule
(
item
)
this
.
goModule
(
item
)
}
else
{
}
else
{
this
.
$router
.
push
({
this
.
$router
.
push
({
...
@@ -293,6 +303,14 @@ export default {
...
@@ -293,6 +303,14 @@ export default {
}
}
},
},
async
goModule
(
module
)
{
async
goModule
(
module
)
{
if
(
module
.
type
===
'Dispatch'
)
{
this
.
$router
.
push
({
path
:
'/dee-mes/instructions-dispatch'
,
query
:
{
title
:
module
.
taskType
}
})
}
else
{
this
.
$router
.
push
({
this
.
$router
.
push
({
path
:
'/dee-mes/taskReception'
,
path
:
'/dee-mes/taskReception'
,
query
:
{
query
:
{
...
@@ -301,6 +319,7 @@ export default {
...
@@ -301,6 +319,7 @@ export default {
showTag
:
'false'
showTag
:
'false'
}
}
})
})
}
this
.
$store
.
dispatch
(
'menu/activeModel'
,
{
this
.
$store
.
dispatch
(
'menu/activeModel'
,
{
appId
:
module
.
appId
,
appId
:
module
.
appId
,
pageInfo
:
{
pageInfo
:
{
...
...
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