Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
CivManage
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
ReactWeb5
CivManage
Commits
ccd098e1
Commit
ccd098e1
authored
Dec 12, 2022
by
邓超
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 主管图标及交互修改,编辑跟修改密码合并改为双击修改
parent
e6eba6d4
Pipeline
#65367
waiting for manual action with stages
Changes
2
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
9 deletions
+14
-9
EditUserModal.jsx
src/pages/userCenter/userManage/EditUserModal.jsx
+0
-0
UserManage.jsx
src/pages/userCenter/userManage/UserManage.jsx
+14
-9
No files found.
src/pages/userCenter/userManage/EditUserModal.jsx
View file @
ccd098e1
This diff is collapsed.
Click to expand it.
src/pages/userCenter/userManage/UserManage.jsx
View file @
ccd098e1
...
...
@@ -285,14 +285,14 @@ const UserManage = () => {
}
}
>
<
UserOutlined
style=
{
{
fontSize
:
'
20
px'
,
color
:
record
.
isManager
?
'#FAAD14'
:
'#1890FF'
}
}
style=
{
{
fontSize
:
'
16
px'
,
color
:
record
.
isManager
?
'#FAAD14'
:
'#1890FF'
}
}
/>
</
Popconfirm
>
</
Tooltip
>
<
Tooltip
title=
"关联权限"
>
<
IdcardOutlined
onClick=
{
()
=>
relateRole
(
record
)
}
style=
{
{
fontSize
:
'
20
px'
,
color
:
'#1890FF'
}
}
style=
{
{
fontSize
:
'
16
px'
,
color
:
'#1890FF'
}
}
/>
</
Tooltip
>
<
Tooltip
title=
"更改机构"
>
...
...
@@ -301,15 +301,15 @@ const UserManage = () => {
style=
{
{
fontSize
:
'16px'
,
color
:
'#1890FF'
}
}
/>
</
Tooltip
>
<
Tooltip
title=
"修改密码"
>
{
/*
<Tooltip title="修改密码">
<UnlockOutlined
onClick={() => changePassword(record)}
style={{ fontSize: '16px', color: '#1890FF' }}
/>
</
Tooltip
>
<
Tooltip
title=
"编辑用户"
>
</Tooltip>
*/
}
{
/*
<Tooltip title="编辑用户">
<EditTwoTone onClick={() => editUser(record)} style={{ fontSize: '16px' }} />
</
Tooltip
>
</Tooltip>
*/
}
{
(
record
.
state
==
0
||
record
.
state
==
null
)
&&
(
<>
{
record
.
loginName
==
'panda'
||
record
.
loginName
==
'admin'
?
(
...
...
@@ -329,7 +329,7 @@ const UserManage = () => {
cancelText=
"取消"
onConfirm=
{
()
=>
freezeUser
(
record
)
}
>
<
StopOutlined
style=
{
{
fontSize
:
'16px'
,
color
:
'#
e86060
'
}
}
/>
<
StopOutlined
style=
{
{
fontSize
:
'16px'
,
color
:
'#
1890ff
'
}
}
/>
</
Popconfirm
>
</
Tooltip
>
)
}
...
...
@@ -343,7 +343,7 @@ const UserManage = () => {
placement=
"bottomRight"
title=
{
<
p
>
即将解冻用户
{
' '
}
即将解冻用户
<
span
className=
{
styles
.
redText
}
>
{
voca
.
stripTags
(
record
.
loginName
)
}
</
span
>
,是否确认解冻?
</
p
>
...
...
@@ -352,7 +352,7 @@ const UserManage = () => {
cancelText=
"取消"
onConfirm=
{
()
=>
freezeUser
(
record
)
}
>
<
UserOutlined
style=
{
{
fontSize
:
'16px'
,
color
:
'#1890ff
'
}
}
/>
<
StopOutlined
style=
{
{
fontSize
:
'16px'
,
color
:
'#e86060
'
}
}
/>
</
Popconfirm
>
</
Tooltip
>
</>
...
...
@@ -1690,6 +1690,11 @@ const UserManage = () => {
showQuickJumper
:
true
,
showSizeChanger
:
true
,
}
}
onRow=
{
record
=>
({
onDoubleClick
:
()
=>
{
editUser
(
record
);
},
})
}
onChange=
{
onChangeInput
}
/>
)
}
...
...
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