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
8b2a222a
Commit
8b2a222a
authored
Jan 11, 2021
by
Maofei94
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 管理员昵称展示
parent
ca1ddab2
Pipeline
#22131
passed with stages
in 19 minutes 22 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
AvatarDropdown.js
src/components/GlobalHeader/AvatarDropdown.js
+3
-3
SiteManage.jsx
src/pages/userCenter/siteManage/SiteManage.jsx
+5
-2
No files found.
src/components/GlobalHeader/AvatarDropdown.js
View file @
8b2a222a
...
...
@@ -61,7 +61,6 @@ class AvatarDropdown extends React.Component {
<
/Menu.Item
>
<
/Menu
>
);
let
role
=
JSON
.
parse
(
localStorage
.
getItem
(
'panda-oms-authority'
))[
1
];
return
currentUser
?
(
<
HeaderDropdown
overlay
=
{
menuHeaderDropdown
}
>
<
span
className
=
{
`
${
styles
.
action
}
${
styles
.
account
}
`
}
>
...
...
@@ -72,8 +71,9 @@ class AvatarDropdown extends React.Component {
alt
=
"avatar"
/>
<
span
className
=
{
`
${
styles
.
name
}
anticon`
}
>
{
roleName
[
role
]}
{
/* {currentUser.name || loginName || '管理员'} */
}
{
currentUser
.
name
||
loginName
===
'omsa'
?
'超级管理员'
:
'管理员'
||
'管理员'
}
<
/span
>
<
/span
>
<
/HeaderDropdown
>
...
...
src/pages/userCenter/siteManage/SiteManage.jsx
View file @
8b2a222a
...
...
@@ -80,8 +80,11 @@ const SiteManage = props => {
arr
.
push
(
res
.
find
(
item
=>
item
.
id
===
'Web4StationRoot'
));
}
if
(
arr
[
0
])
{
const
stations
=
arr
[
0
].
children
;
const
stations
=
arr
[
0
].
children
||
[]
;
setTreeData
(
stations
);
if
(
stations
.
length
<
1
)
{
return
;
}
if
(
!
currentStation
.
stationID
)
{
setCurrentStation
(
stations
[
0
]);
}
else
{
...
...
@@ -109,7 +112,7 @@ const SiteManage = props => {
},
[
page
.
pageNum
]);
const
getList
=
name
=>
{
let
params
=
{
stationId
:
+
currentStation
.
stationID
,
stationId
:
+
currentStation
.
stationID
||
''
,
PageIndex
:
+
page
.
pageNum
,
PageSize
:
+
page
.
pageSize
,
};
...
...
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