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
f68c2cf4
Commit
f68c2cf4
authored
Jan 14, 2021
by
陈前坚
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
perf: 查找用户相关操作
parent
ebe22401
Pipeline
#22372
skipped with stages
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
12 deletions
+20
-12
index.js
src/pages/log/omsLog/index.js
+17
-11
ChangePasswordModal.jsx
src/pages/userCenter/userManage/ChangePasswordModal.jsx
+2
-1
UserManage.js
src/pages/userCenter/userManage/UserManage.js
+1
-0
No files found.
src/pages/log/omsLog/index.js
View file @
f68c2cf4
...
...
@@ -8,6 +8,7 @@ import {
Button
,
notification
,
message
,
Tooltip
,
Spin
,
}
from
'antd'
;
import
{
SwapRightOutlined
}
from
'@ant-design/icons'
;
...
...
@@ -51,13 +52,24 @@ const OmsLog = () => {
key
:
'label'
,
width
:
360
,
},
{
title
:
'操作对象信息'
,
dataIndex
:
'shortInfo'
,
key
:
'shortInfo'
,
ellipsis
:
'true'
,
render
:
record
=>
(
<
Tooltip
placement
=
"left"
title
=
{
record
}
>
{
record
}
<
/Tooltip
>
),
},
{
title
:
'优先级'
,
dataIndex
:
'level'
,
key
:
'level'
,
dataIndex
:
'level
Str
'
,
key
:
'level
Str
'
,
width
:
100
,
filters
:
levelFilters
,
onFilter
:
(
value
,
record
)
=>
record
.
level
===
value
,
onFilter
:
(
value
,
record
)
=>
record
.
level
Str
===
value
,
render
:
record
=>
{
if
(
record
===
'高'
)
{
return
<
span
style
=
{{
color
:
'#ff7875'
}}
>
高
<
/span>
;
...
...
@@ -71,13 +83,6 @@ const OmsLog = () => {
return
record
;
},
},
{
title
:
'详情'
,
dataIndex
:
'shortInfo'
,
key
:
'shortInfo'
,
ellipsis
:
'true'
,
// width: 300,
},
];
// 在起止时间任意一个变化后获取数据
useEffect
(()
=>
{
...
...
@@ -103,9 +108,10 @@ const OmsLog = () => {
if
(
!
res
.
root
)
{
setData
([]);
}
else
{
// setData(res.root.filter(item => item.label!=="ServiceInput"&&item.label!=="ServiceReturn"));
setData
(
res
.
root
);
// 过滤优先级
let
arr1
=
res
.
root
.
map
(
item
=>
item
.
level
);
let
arr1
=
res
.
root
.
map
(
item
=>
item
.
level
Str
);
arr1
=
arr1
.
filter
((
value
,
index
)
=>
arr1
.
indexOf
(
value
)
===
index
);
setLevelFilters
(
arr1
.
map
(
item
=>
({
text
:
item
,
value
:
item
})));
}
...
...
src/pages/userCenter/userManage/ChangePasswordModal.jsx
View file @
f68c2cf4
...
...
@@ -3,7 +3,7 @@ import { Modal, Form, Input, notification, message } from 'antd';
import
{
updateUserPassword
}
from
'@/services/userCenter/userManage/api'
;
const
ChangePasswordModal
=
props
=>
{
const
{
visible
,
currentUser
,
onCancel
}
=
props
;
const
{
visible
,
currentUser
,
on
Select
,
on
Cancel
}
=
props
;
const
[
passwordForm
]
=
Form
.
useForm
();
// 修改密码
useEffect
(()
=>
{
...
...
@@ -34,6 +34,7 @@ const ChangePasswordModal = props => {
.
then
(
res
=>
{
if
(
res
.
code
===
0
)
{
onCancel
();
onSelect
([
`
${
currentUser
.
OUID
}
`
]);
notification
.
success
({
message
:
'提交成功'
,
duration
:
2
,
...
...
src/pages/userCenter/userManage/UserManage.js
View file @
f68c2cf4
...
...
@@ -920,6 +920,7 @@ const UserManage = () => {
<
ChangePasswordModal
visible
=
{
passwordVisible
}
currentUser
=
{
currentUser
}
onSelect
=
{
onSelect
}
onCancel
=
{()
=>
setPasswordVisible
(
false
)}
/
>
{
/* 编辑用户 */
}
...
...
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