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
9105f67b
Commit
9105f67b
authored
Dec 07, 2023
by
jingnan
👀
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新首页修改
parent
2c66f6e9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
202 additions
and
168 deletions
+202
-168
index.vue
...architecture-dee/src/layout/components/TagsView/index.vue
+1
-1
task-detail.vue
...ask-center/src/business-components/tabCom/task-detail.vue
+8
-2
index.vue
...task-center/src/localComponents/commonTabHeader/index.vue
+6
-1
my-task.vue
...ns/dee-task-center/src/views/home/compontents/my-task.vue
+145
-52
personal-assistant.vue
...-center/src/views/home/compontents/personal-assistant.vue
+23
-101
index.vue
...task-center/src/views/workflow/task-center/home/index.vue
+3
-2
moduleTaskListNew.vue
...ews/workflow/task-center/myPlanTask/moduleTaskListNew.vue
+9
-5
my-task.vue
...workflow/task-center/singleSigning/components/my-task.vue
+7
-4
No files found.
applications/architecture-dee/src/layout/components/TagsView/index.vue
View file @
9105f67b
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
v-show=
"!['系统管理','应用中心','安全中心','运维中心'].includes(activeModel.name)"
v-show=
"!['系统管理','应用中心','安全中心','运维中心'].includes(activeModel.name)"
ref=
"homeLink"
ref=
"homeLink"
class=
"home tags-view-item"
class=
"home tags-view-item"
:to=
"
{ path: '/dee-task-center/
workflow/task-center/hom
e'}"
:to=
"
{ path: '/dee-task-center/
home?title=任务中心
&
showMenu=fals
e'}"
tag="span"
tag="span"
>
>
<i
class=
"el-icon-s-home"
/>
<i
class=
"el-icon-s-home"
/>
...
...
applications/dee-task-center/src/business-components/tabCom/task-detail.vue
View file @
9105f67b
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
</div>
</div>
</div>
</div>
<div
class=
"detail-content"
>
<div
class=
"detail-content"
:class=
"basicData.canDeal?'':'disabledDeal'"
>
<div
v-show=
"currTab && currTab.configName==='taskDetailBasicInfo'"
class=
"background"
style=
"margin-bottom: 8px"
>
<div
v-show=
"currTab && currTab.configName==='taskDetailBasicInfo'"
class=
"background"
style=
"margin-bottom: 8px"
>
<div
class=
"flex-s"
>
<div
class=
"flex-s"
>
<div
v-if=
"basicData && basicData.basicInfo"
class=
"task-name"
>
{{
basicData
.
basicInfo
.
aliasName
||
basicData
.
basicInfo
.
name
}}
</div>
<div
v-if=
"basicData && basicData.basicInfo"
class=
"task-name"
>
{{
basicData
.
basicInfo
.
aliasName
||
basicData
.
basicInfo
.
name
}}
</div>
...
@@ -131,7 +131,7 @@
...
@@ -131,7 +131,7 @@
typeName:currTab.webServerName,
typeName:currTab.webServerName,
layKey: currTab.configName
layKey: currTab.configName
}"
}"
:basic-data="
{...basicData.businessObject,canDeal:basicData.canDeal}
"
:basic-data="
basicData.businessObject
"
:basic-info="basicData.basicInfo"
:basic-info="basicData.basicInfo"
/>
/>
<component
:is=
"currTab.comName"
v-else-if=
"currTab && currTab.comName"
:ref=
"currTab.name"
v-bind=
"currTab.configParams ? JSON.parse(currTab.configParams) :
{}" :process-instance-id="processInstanceId" :basic-data="basicData" />
<component
:is=
"currTab.comName"
v-else-if=
"currTab && currTab.comName"
:ref=
"currTab.name"
v-bind=
"currTab.configParams ? JSON.parse(currTab.configParams) :
{}" :process-instance-id="processInstanceId" :basic-data="basicData" />
...
@@ -951,5 +951,11 @@ export default {
...
@@ -951,5 +951,11 @@ export default {
}
}
}
}
.disabledDeal
{
.dee-tools
,
.table-row-btns
,
.el-button
{
display
:
none
;
}
}
}
}
</
style
>
</
style
>
applications/dee-task-center/src/localComponents/commonTabHeader/index.vue
View file @
9105f67b
...
@@ -23,11 +23,16 @@ export default {
...
@@ -23,11 +23,16 @@ export default {
default
:
()
=>
{
default
:
()
=>
{
return
[]
return
[]
}
}
},
activeTabName
:
{
type
:
String
,
default
:
''
}
}
},
},
data
()
{
data
()
{
const
_that
=
this
return
{
return
{
tabName
:
this
.
tabList
[
0
].
title
tabName
:
_that
.
activeTabName
||
this
.
tabList
[
0
].
title
}
}
},
},
methods
:
{
methods
:
{
...
...
applications/dee-task-center/src/views/home/compontents/my-task.vue
View file @
9105f67b
This diff is collapsed.
Click to expand it.
applications/dee-task-center/src/views/home/compontents/personal-assistant.vue
View file @
9105f67b
...
@@ -5,46 +5,29 @@
...
@@ -5,46 +5,29 @@
* @FilePath: applications/dee-task-center/src/views/home/compontents/apply-app.vue
* @FilePath: applications/dee-task-center/src/views/home/compontents/apply-app.vue
*/
*/
<
template
>
<
template
>
<div
class=
"
personal-assistant
"
>
<div
class=
"
apply-app
"
>
<el-card
class=
"box-card"
>
<el-card
class=
"box-card"
>
<el-tabs
v-model=
"activeName"
class=
"tabCon"
@
tab-click=
"handleClick"
>
<div
slot=
"header"
class=
"clearfix"
>
<el-tab-pane
label=
"快速访问"
name=
"first"
>
<span>
个人助手
</span>
<div
class=
"text div-card"
>
</div>
<div
v-for=
"(item, i) in quickAccessList"
:key=
"i"
class=
"card"
@
click=
"goModule(item)"
>
<div
class=
"text item div-card"
>
<el-badge
:value=
"item.total"
:max=
"99"
class=
"item"
>
<div
v-for=
"(item, i) in cardList"
:key=
"i"
class=
"card"
@
click=
"handClick(item.title)"
>
<div
class=
"icon"
>
<div
class=
"icon"
>
<img
:src=
"item.icon"
alt=
"Icon"
>
<img
:src=
"item.icon"
alt=
"Icon"
>
</div>
</el-badge>
<div
class=
"title"
>
{{
item
.
name
}}
</div>
</div>
</div>
</div>
</el-tab-pane>
<div
class=
"title"
>
<el-tab-pane
label=
"个人助手"
name=
"second"
>
{{
item
.
title
}}
<div
class=
"text div-card"
>
<div
v-for=
"(item, i) in cardList"
:key=
"i"
class=
"card"
@
click=
"handleClick(item.title)"
>
<div
class=
"icon"
>
<img
:src=
"item.icon"
alt=
"Icon"
>
</div>
<div
class=
"title"
>
{{
item
.
title
}}
</div>
</div>
</div>
</div>
</
el-tab-pane
>
</
div
>
</
el-tabs
>
</
div
>
</el-card>
</el-card>
</div>
</div>
</
template
>
</
template
>
<
script
>
<
script
>
import
{
getTaskCount
}
from
'@/api/workspace.js'
export
default
{
export
default
{
components
:
{},
components
:
{},
data
()
{
data
()
{
return
{
return
{
activeName
:
'first'
,
cardList
:
[
cardList
:
[
{
{
icon
:
'/icons/home/biaozhunguifan.png'
,
icon
:
'/icons/home/biaozhunguifan.png'
,
...
@@ -54,22 +37,7 @@ export default {
...
@@ -54,22 +37,7 @@ export default {
icon
:
'/icons/home/helpBook.png'
,
icon
:
'/icons/home/helpBook.png'
,
title
:
'帮助手册'
title
:
'帮助手册'
}
}
],
]
quickAccessList
:
[
{
icon
:
'/icons/home/jyrw.png'
,
name
:
'检验任务'
},
{
icon
:
'/icons/home/zprw.png'
,
name
:
'装配任务'
},
{
icon
:
'/icons/home/shrw.png'
,
name
:
'适航任务'
}
],
module
:
{}
}
}
},
},
computed
:
{},
computed
:
{},
...
@@ -77,66 +45,19 @@ export default {
...
@@ -77,66 +45,19 @@ export default {
created
()
{
created
()
{
// 初始化数据
// 初始化数据
},
},
mounted
()
{
this
.
getCustomModules
(
'检验任务'
,
0
)
this
.
getCustomModules
(
'装配任务'
,
1
)
this
.
getCustomModules
(
'适航任务'
,
2
)
},
methods
:
{
methods
:
{
handleClick
(
e
)
{
console
.
log
(
'e: '
,
e
)
},
getCustomModules
(
data
,
index
)
{
const
params
=
{}
if
(
data
===
'装配任务'
)
{
params
.
type
=
'FitOut'
this
.
quickAccessList
[
index
].
appId
=
'myTaskReceive'
}
else
if
(
data
===
'检验任务'
)
{
params
.
type
=
'CheckOut'
this
.
quickAccessList
[
index
].
appId
=
'myCheckTaskReceive'
}
else
{
params
.
type
=
'DMIR'
this
.
quickAccessList
[
index
].
appId
=
'myAirTaskReceive'
}
getTaskCount
(
params
).
then
(
res
=>
{
this
.
$set
(
this
.
quickAccessList
[
index
],
'total'
,
res
.
items
.
count
)
})
},
async
goModule
(
module
)
{
this
.
$router
.
push
({
path
:
'/dee-mes/taskReception'
,
query
:
{
title
:
module
.
name
,
showMenu
:
false
,
showTag
:
'false'
}
})
this
.
$store
.
dispatch
(
'menu/activeModel'
,
{
appId
:
module
.
appId
,
pageInfo
:
{
title
:
module
.
name
,
path
:
'/dee-mes/taskReception'
}
})
this
.
$store
.
dispatch
(
'app/closeSideBar'
,
false
)
}
}
}
}
}
</
script
>
</
script
>
<
style
lang=
'scss'
>
<
style
lang=
'scss'
>
.
personal-assistant
{
.
apply-app
{
height
:
100%
;
height
:
100%
;
.box-card
{
.box-card
{
height
:
100%
;
height
:
100%
;
.el-card__body
{
height
:
100%
;
.el-card__body
{
.tabCon
{
height
:
calc
(
100%
-
90px
);
height
:
100%
;
}
.el-tabs__content
{
height
:
calc
(
100%
-
60px
);
}
}
}
}
}
...
@@ -147,6 +68,7 @@ export default {
...
@@ -147,6 +68,7 @@ export default {
grid-template-columns
:
repeat
(
auto-fill
,
calc
((
100%
-
60px
)
/
4
));
// 自动填充一行的卡片个数
grid-template-columns
:
repeat
(
auto-fill
,
calc
((
100%
-
60px
)
/
4
));
// 自动填充一行的卡片个数
justify-content
:
space-between
;
// 卡片两端对齐,与flex的该属于一致
justify-content
:
space-between
;
// 卡片两端对齐,与flex的该属于一致
grid-gap
:
20px
;
grid-gap
:
20px
;
// padding-bottom: 10px;
// padding-bottom: 10px;
.card
{
.card
{
display
:
flex
;
display
:
flex
;
...
@@ -162,11 +84,11 @@ export default {
...
@@ -162,11 +84,11 @@ export default {
transition
:
box-shadow
0
.3s
ease
;
transition
:
box-shadow
0
.3s
ease
;
border
:
1px
solid
#C7C7C7
;
border
:
1px
solid
#C7C7C7
;
padding
:
5px
;
padding
:
5px
;
.icon
{
//
.icon{
img
{
//
img{
width
:
5
0px
;
// width: 3
0px;
}
//
}
}
//
}
.title
{
.title
{
text-align
:
center
;
text-align
:
center
;
width
:
calc
(
100%
-
10px
);
width
:
calc
(
100%
-
10px
);
...
...
applications/dee-task-center/src/views/workflow/task-center/home/index.vue
View file @
9105f67b
<
template
>
<
template
>
<div
class=
"TaskCenter"
>
<div
class=
"TaskCenter"
>
<commonTabHeader
:tab-list=
"tabList"
:active-name=
"activeName"
@
changActiveName=
"changActiveName"
/>
<commonTabHeader
:tab-list=
"tabList"
:active-
tab-
name=
"activeName"
@
changActiveName=
"changActiveName"
/>
<div
class=
"task-center-content"
>
<div
class=
"task-center-content"
>
<singleSignOff
v-if=
"activeName === '单个签审'"
/>
<singleSignOff
v-if=
"activeName === '单个签审'"
/>
<bulkSigning
v-if=
"activeName === '批量签审'"
/>
<bulkSigning
v-if=
"activeName === '批量签审'"
/>
...
@@ -22,6 +22,7 @@ export default {
...
@@ -22,6 +22,7 @@ export default {
// InitiatedProcess
// InitiatedProcess
},
},
data
()
{
data
()
{
const
_that
=
this
return
{
return
{
tabList
:
[
tabList
:
[
{
{
...
@@ -33,7 +34,7 @@ export default {
...
@@ -33,7 +34,7 @@ export default {
icon
:
'/images/common/batchEdit.png'
icon
:
'/images/common/batchEdit.png'
}
}
],
],
activeName
:
'单个签审'
activeName
:
_that
.
$route
.
query
&&
_that
.
$route
.
query
.
DAO
||
'单个签审'
}
}
},
},
methods
:
{
methods
:
{
...
...
applications/dee-task-center/src/views/workflow/task-center/myPlanTask/moduleTaskListNew.vue
View file @
9105f67b
...
@@ -54,12 +54,16 @@ export default {
...
@@ -54,12 +54,16 @@ export default {
this
.
clickTask
=
item
this
.
clickTask
=
item
// this.$emit('goModuleTaskDetail', item)
// this.$emit('goModuleTaskDetail', item)
this
.
$router
.
push
({
this
.
$router
.
push
({
path
:
'/dee-task-center/taskList?title=批量签审'
,
// path: '/dee-task-center/taskList?title=批量签审',
path
:
'/dee-task-center/workflow/task-center/home'
,
query
:
{
query
:
{
router
:
item
.
router
,
DAO
:
'批量签审'
,
taskCount
:
item
.
taskCount
,
processDefKey
:
item
.
procDefKey
,
taskKey
:
item
.
taskKey
,
taskDefinitionKey
:
item
.
taskKey
taskType
:
item
.
taskType
// router: item.router,
// taskCount: item.taskCount,
// taskKey: item.taskKey,
// taskType: item.taskType
}
}
})
})
}
}
...
...
applications/dee-task-center/src/views/workflow/task-center/singleSigning/components/my-task.vue
View file @
9105f67b
...
@@ -56,12 +56,13 @@
...
@@ -56,12 +56,13 @@
<
script
>
<
script
>
import
{
showIcon
}
from
'@/utils/util'
import
{
showIcon
}
from
'@/utils/util'
import
{
getTemps
}
from
'@/api/workflow/userSettings.js'
import
{
getTemps
}
from
'@/api/workflow/userSettings.js'
import
{
getUnfinishedTask
}
from
'@/api/workflow/taskCenter.js'
import
{
getUnfinishedTask
,
getFinishedTaskHome
}
from
'@/api/workflow/taskCenter.js'
import
{
getAllApplication
}
from
'@/api/workflow/config'
import
{
getAllApplication
}
from
'@/api/workflow/config'
import
_get
from
'lodash.get'
import
_get
from
'lodash.get'
export
default
{
export
default
{
name
:
'MyTask'
,
name
:
'MyTask'
,
data
()
{
data
()
{
const
_that
=
this
return
{
return
{
statusColor
:
{
statusColor
:
{
'审批中'
:
'#C3A146'
,
'审批中'
:
'#C3A146'
,
...
@@ -149,7 +150,8 @@ export default {
...
@@ -149,7 +150,8 @@ export default {
}
}
],
],
clickTask
:
null
,
clickTask
:
null
,
processDefKey
:
[]
processDefKey
:
[],
dataType
:
_that
.
$route
.
query
?
_that
.
$route
.
query
.
type
:
''
}
}
},
},
created
()
{
created
()
{
...
@@ -237,8 +239,9 @@ export default {
...
@@ -237,8 +239,9 @@ export default {
params
.
receiveTime2
=
this
.
searchForm
.
receiveTimeRange
[
1
]
+
' 23:59:59'
params
.
receiveTime2
=
this
.
searchForm
.
receiveTimeRange
[
1
]
+
' 23:59:59'
}
}
const
str
=
this
.
processDefKey
&&
this
.
processDefKey
.
length
?
this
.
processDefKey
.
map
(
x
=>
`processDefKey=
${
x
}
`
).
join
(
'&'
)
+
'&'
:
''
const
str
=
this
.
processDefKey
&&
this
.
processDefKey
.
length
?
this
.
processDefKey
.
map
(
x
=>
`processDefKey=
${
x
}
`
).
join
(
'&'
)
+
'&'
:
this
.
$route
.
query
?
`processDefKey=
${
this
.
$route
.
query
.
processDefKey
||
''
}
&taskDefinitionKey=
${
this
.
$route
.
query
.
taskDefinitionKey
||
''
}
&`
:
''
getUnfinishedTask
(
str
+
this
.
$utils
.
filterParams
(
params
)).
then
(
res
=>
{
const
requestUrl
=
this
.
dataType
===
'已办任务'
?
getFinishedTaskHome
:
getUnfinishedTask
requestUrl
(
str
+
this
.
$utils
.
filterParams
(
params
)).
then
(
res
=>
{
if
(
params
.
page
===
1
)
{
if
(
params
.
page
===
1
)
{
this
.
taskList
=
[]
this
.
taskList
=
[]
}
}
...
...
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