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
4fa7c8e8
Commit
4fa7c8e8
authored
Nov 25, 2020
by
陈前坚
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
perf: serviceLog
parent
70cc8739
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
7 deletions
+12
-7
index.js
src/pages/log/serviceLog/index.js
+0
-0
UserManage.js
src/pages/userCenter/UserManage.js
+12
-7
No files found.
src/pages/log/serviceLog/index.js
View file @
4fa7c8e8
This diff is collapsed.
Click to expand it.
src/pages/userCenter/UserManage.js
View file @
4fa7c8e8
...
...
@@ -81,7 +81,7 @@ const UserManage = () => {
const
[
addOrgVisible
,
setAddOrgVisible
]
=
useState
(
false
);
// 添加机构
const
[
editOrgVisible
,
setEditOrgVisible
]
=
useState
(
false
);
// 编辑机构
const
[
deleteOrgVisible
,
setDeleteOrgVisible
]
=
useState
(
false
);
// 删除机构
const
[
roleVisible
,
setRoleVisible
]
=
useState
(
false
);
//
用户关联
const
[
roleVisible
,
setRoleVisible
]
=
useState
(
false
);
//
关联角色
const
[
changeOrgVisible
,
setChangeOrgVisible
]
=
useState
(
false
);
// 更改机构
const
[
passwordVisible
,
setPasswordVisible
]
=
useState
(
false
);
// 修改密码
const
[
editUserVisible
,
setEditUserVisible
]
=
useState
(
false
);
// 编辑用户
...
...
@@ -466,7 +466,7 @@ const UserManage = () => {
},
[
currentUser
]);
/** ***用户批量操作****** */
//
用户关联
//
关联角色
const
relateRoles
=
()
=>
{
getEmptyRoleList
();
setRoleVisible
(
true
);
...
...
@@ -484,7 +484,7 @@ const UserManage = () => {
};
/** ***右侧表格相关操作****** */
//
用户关联
//
关联角色
const
relateRole
=
record
=>
{
setRoleVisible
(
true
);
setCurrentUser
(
record
);
...
...
@@ -558,7 +558,12 @@ const UserManage = () => {
const
phone
=
addUserForm
.
getFieldValue
(
'phone'
)
||
''
;
const
email
=
addUserForm
.
getFieldValue
(
'email'
)
||
''
;
// 正则验证
if
(
!
noChinese
.
test
(
loginName
))
{
if
(
loginName
===
''
)
{
notification
.
error
({
message
:
'提交失败'
,
description
:
'登录名不能为空!'
,
});
}
else
if
(
!
noChinese
.
test
(
loginName
))
{
notification
.
error
({
message
:
'提交失败'
,
description
:
'登录名不支持中文!'
,
...
...
@@ -1320,9 +1325,9 @@ const UserManage = () => {
>
<
p
>
即将删除该机构,是否确认删除?
<
/p
>
<
/Modal
>
{
/*
用户关联
*/
}
{
/*
关联角色
*/
}
<
Modal
title
=
"
用户关联
"
title
=
"
关联角色
"
visible
=
{
roleVisible
}
onOk
=
{
multiRelateRoles
?
submitRoles
:
submitRole
}
onCancel
=
{()
=>
{
...
...
@@ -1334,7 +1339,7 @@ const UserManage = () => {
width
=
"960px"
>
<
Spin
spinning
=
{
loading
}
tip
=
"loading"
>
<
Tabs
defaultActiveKey
=
"1"
>
<
Tabs
defaultActiveKey
=
"1"
style
=
{{
marginTop
:
'-16px'
}}
>
<
TabPane
tab
=
"角色"
key
=
"1"
>
{
roleVisible
&&
rolelist
.
map
((
role
,
index
)
=>
(
...
...
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