Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
phsl
/
admin
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
2bca7bb4
authored
Nov 12, 2024
by
GoldenZqqq
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 流程发起页面-timeline组件细节样式与icon优化
parent
d03fdecc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
15 deletions
+22
-15
src/assets/svgs/bpm/add-user.svg
+2
-0
src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue
+20
-15
No files found.
src/assets/svgs/bpm/add-user.svg
0 → 100644
View file @
2bca7bb4
<svg
t=
"1731390087280"
class=
"icon"
viewBox=
"0 0 1024 1024"
version=
"1.1"
xmlns=
"http://www.w3.org/2000/svg"
p-id=
"4297"
width=
"200"
height=
"200"
><path
d=
"M639.9 541.7c76.4-44.2 127.9-126.8 127.9-221.5C767.7 179 653.2 64.5 512 64.5S256.3 179 256.3 320.2c0 89.6 46.1 168.4 115.8 214.1C193.5 593 64.5 761.2 64.5 959.5h63.9c0-211.5 172.1-383.6 383.6-383.6 44.9 0 87.8 8.1 127.9 22.4v-56.6zM320.2 320.2c0-105.8 86-191.8 191.8-191.8s191.8 86 191.8 191.8S617.7 512 512 512s-191.8-86-191.8-191.8zM831.6 767.7V639.9h-63.9v127.8H639.9v63.9h127.8v127.9h63.9V831.6h127.9v-63.9z"
fill=
"#5f6266"
p-id=
"4298"
></path></svg>
\ No newline at end of file
src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue
View file @
2bca7bb4
...
...
@@ -46,19 +46,22 @@
"
>
<!-- && activity.nodeType === NodeType.USER_TASK_NODE -->
<el-button
class=
"!px-8px"
@
click=
"handleSelectUser(activity.id, customApproveUsers[activity.id])"
>
<Icon
icon=
"fa:user-plus"
/>
</el-button>
<el-tooltip
content=
"添加用户"
placement=
"left"
>
<el-button
class=
"!px-6px"
@
click=
"handleSelectUser(activity.id, customApproveUsers[activity.id])"
>
<img
class=
"w-18px text-#ccc"
src=
"@/assets/svgs/bpm/add-user.svg"
alt=
""
/>
</el-button>
</el-tooltip>
<div
v-for=
"(user, idx1) in customApproveUsers[activity.id]"
:key=
"idx1"
class=
"bg-gray-100 h-35px rounded-3xl flex items-center p
-8px gap-2
dark:color-gray-600 position-relative"
class=
"bg-gray-100 h-35px rounded-3xl flex items-center p
r-8px
dark:color-gray-600 position-relative"
>
<el-avatar
:size=
"28"
v-if=
"user.avatar"
:src=
"user.avatar"
/>
<el-avatar
:size=
"28"
v-else
>
<el-avatar
class=
"!m-5px"
:size=
"28"
v-if=
"user.avatar"
:src=
"user.avatar"
/>
<el-avatar
class=
"!m-5px"
:size=
"28"
v-else
>
{{ user.nickname.substring(0, 1) }}
</el-avatar>
{{ user.nickname }}
...
...
@@ -73,26 +76,28 @@
>
<!-- 信息:头像昵称 -->
<div
class=
"bg-gray-100 h-35px rounded-3xl flex items-center p
-8px gap-2
dark:color-gray-600 position-relative"
class=
"bg-gray-100 h-35px rounded-3xl flex items-center p
r-8px
dark:color-gray-600 position-relative"
>
<
template
v-if=
"task.assigneeUser?.avatar || task.assigneeUser?.nickname"
>
<el-avatar
class=
"!m-5px"
:size=
"28"
v-if=
"task.assigneeUser?.avatar"
:src=
"task.assigneeUser?.avatar"
/>
<el-avatar
:size=
"28"
v-else
>
<el-avatar
class=
"!m-5px"
:size=
"28"
v-else
>
{{
task
.
assigneeUser
?.
nickname
.
substring
(
0
,
1
)
}}
</el-avatar>
{{
task
.
assigneeUser
?.
nickname
}}
</
template
>
<
template
v-else-if=
"task.ownerUser?.avatar || task.ownerUser?.nickname"
>
<el-avatar
class=
"!m-5px"
:size=
"28"
v-if=
"task.ownerUser?.avatar"
:src=
"task.ownerUser?.avatar"
/>
<el-avatar
:size=
"28"
v-else
>
<el-avatar
class=
"!m-5px"
:size=
"28"
v-else
>
{{
task
.
ownerUser
?.
nickname
.
substring
(
0
,
1
)
}}
</el-avatar>
{{
task
.
ownerUser
?.
nickname
}}
...
...
@@ -126,10 +131,10 @@
<div
v-for=
"(user, idx1) in activity.candidateUsers"
:key=
"idx1"
class=
"bg-gray-100 h-35px rounded-3xl flex items-center p
-8px gap-2
dark:color-gray-600 position-relative"
class=
"bg-gray-100 h-35px rounded-3xl flex items-center p
r-8px
dark:color-gray-600 position-relative"
>
<el-avatar
:size=
"28"
v-if=
"user.avatar"
:src=
"user.avatar"
/>
<el-avatar
:size=
"28"
v-else
>
<el-avatar
class=
"!m-5px"
:size=
"28"
v-if=
"user.avatar"
:src=
"user.avatar"
/>
<el-avatar
class=
"!m-5px"
:size=
"28"
v-else
>
{{ user.nickname.substring(0, 1) }}
</el-avatar>
{{ user.nickname }}
...
...
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