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
49c5a1dd
Commit
49c5a1dd
authored
1 year ago
by
涂伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: '用户权限设置新增是否加入白名单'
parent
02aff5cf
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
50 additions
and
1 deletion
+50
-1
UserManage.jsx
src/pages/userCenter/userManage/UserManage.jsx
+46
-1
api.js
src/services/userManage/api.js
+4
-0
No files found.
src/pages/userCenter/userManage/UserManage.jsx
View file @
49c5a1dd
...
...
@@ -28,6 +28,7 @@ import {
EditTwoTone
,
DeleteOutlined
,
IdcardOutlined
,
SafetyOutlined
,
UnlockOutlined
,
ApartmentOutlined
,
StopOutlined
,
...
...
@@ -70,6 +71,7 @@ import {
GetAllSite
,
SetGroupManager
,
ChangeSMSState
,
AddUserAppBindWhiteList
,
}
from
'@/services/userManage/api'
;
import
{
AddUserAuthSetting
,
GetUserAuthSet
}
from
'@/services/database/api'
;
import
TreeComponents
from
'@/components/ExpendableTree'
;
...
...
@@ -238,7 +240,7 @@ const UserManage = () => {
{
title
:
'权限设置'
,
key
:
'action'
,
width
:
15
0
,
width
:
20
0
,
align
:
'center'
,
render
:
record
=>
(
<
Space
size=
"middle"
>
...
...
@@ -323,6 +325,49 @@ const UserManage = () => {
/>
</
Popconfirm
>
</
Tooltip
>
<
Tooltip
title=
{
record
.
whitelist
===
0
?
'加入终端白名单'
:
'取消终端白名单'
}
>
<
Popconfirm
placement=
"bottomRight"
title=
{
record
.
whitelist
===
0
?
(
<
p
>
确定用户
<
span
className=
{
styles
.
redText
}
>
{
voca
.
stripTags
(
record
.
loginName
)
}
</
span
>
加入终端白名单吗?
</
p
>
)
:
(
<
p
>
确定用户
<
span
className=
{
styles
.
redText
}
>
{
voca
.
stripTags
(
record
.
loginName
)
}
</
span
>
取消加入终端白名单吗?
</
p
>
)
}
okText=
"确认"
cancelText=
"取消"
onConfirm=
{
()
=>
{
AddUserAppBindWhiteList
({
userId
:
record
.
userId
,
state
:
!
record
.
whitelist
?
1
:
0
}).
then
(
res
=>
{
if
(
res
.
code
===
0
)
{
currentSelectOrg
===
'-1'
?
submitSearchUser
()
:
onSelect
([
currentSelectOrg
]);
notification
.
success
({
message
:
'设置成功'
,
description
:
res
.
msg
,
});
}
else
{
notification
.
error
({
message
:
'设置失败'
,
description
:
res
.
msg
,
});
}
});
}
}
>
<
SafetyOutlined
style=
{
{
fontSize
:
'16px'
,
color
:
record
.
whitelist
===
0
?
'#e86060'
:
'#1890FF'
}
}
// style={{ fontSize: '16px', color: '#1890FF' }}
/>
</
Popconfirm
>
</
Tooltip
>
</
Space
>
),
},
...
...
This diff is collapsed.
Click to expand it.
src/services/userManage/api.js
View file @
49c5a1dd
...
...
@@ -197,5 +197,9 @@ export const GetPasswordRegularization = params =>
export
const
SysConfiguration
=
params
=>
get
(
`/PandaCore/GCK/Common/SysConfiguration?moduleName=登录加密`
,
params
);
// 是否加入白名单
export
const
AddUserAppBindWhiteList
=
params
=>
get
(
`/PandaOMS/OMS/AddUserAppBindWhiteList`
,
params
);
// export const DeleteOUNew = params =>
// get(`${PUBLISH_SERVICE}/UserCenter/DeleteOU`, params)
This diff is collapsed.
Click to expand it.
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