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
9d4878eb
Commit
9d4878eb
authored
Nov 23, 2020
by
陈前坚
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
perf: style
parent
c6f2ade2
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
40 additions
and
38 deletions
+40
-38
UserManage.js
src/pages/userCenter/UserManage.js
+7
-7
UserManage.less
src/pages/userCenter/UserManage.less
+1
-1
RoleManage.jsx
src/pages/userCenter/roleManage/RoleManage.jsx
+9
-9
RoleManage.less
src/pages/userCenter/roleManage/RoleManage.less
+8
-5
SiteManage.jsx
src/pages/userCenter/siteManage/SiteManage.jsx
+10
-11
SiteManage.less
src/pages/userCenter/siteManage/SiteManage.less
+5
-5
No files found.
src/pages/userCenter/UserManage.js
View file @
9d4878eb
...
...
@@ -143,7 +143,7 @@ const UserManage = () => {
dataIndex
:
'loginName'
,
key
:
'loginName'
,
fixed
:
'left'
,
width
:
100
,
//
width: 100,
render
:
item
=>
(
<
div
ref
=
{
r
=>
{
...
...
@@ -158,7 +158,7 @@ const UserManage = () => {
title
:
'用户姓名'
,
dataIndex
:
'userName'
,
key
:
'userName'
,
width
:
100
,
//
width: 100,
render
:
item
=>
(
<
div
ref
=
{
r
=>
{
...
...
@@ -173,7 +173,7 @@ const UserManage = () => {
title
:
'所在机构'
,
dataIndex
:
'OUName'
,
key
:
'OUName'
,
width
:
15
0
,
width
:
23
0
,
filters
:
orgFilters
,
onFilter
:
(
value
,
record
)
=>
record
.
OUName
===
value
,
},
...
...
@@ -181,14 +181,14 @@ const UserManage = () => {
title
:
'手机号码'
,
dataIndex
:
'phone'
,
key
:
'phone'
,
width
:
1
2
0
,
width
:
1
5
0
,
ellipsis
:
true
,
},
{
title
:
'钉钉账户'
,
dataIndex
:
'ddid'
,
key
:
'ddid'
,
width
:
1
0
0
,
width
:
1
5
0
,
render
:
record
=>
{
if
(
record
)
{
return
(
...
...
@@ -206,7 +206,7 @@ const UserManage = () => {
title
:
'微信账户'
,
dataIndex
:
'wxid'
,
key
:
'wxid'
,
width
:
1
0
0
,
width
:
1
4
0
,
render
:
record
=>
{
if
(
record
)
{
return
(
...
...
@@ -224,7 +224,7 @@ const UserManage = () => {
title
:
'操作'
,
key
:
'action'
,
fixed
:
'right'
,
width
:
2
1
0
,
width
:
2
5
0
,
align
:
'center'
,
render
:
record
=>
(
<
Space
size
=
"middle"
>
...
...
src/pages/userCenter/UserManage.less
View file @
9d4878eb
...
...
@@ -27,7 +27,7 @@
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
//
display: block;
display: block;
}
}
.ant-pagination-prev,.ant-pagination-next{
...
...
src/pages/userCenter/roleManage/RoleManage.jsx
View file @
9d4878eb
...
...
@@ -203,7 +203,7 @@ const SiteManage = () => {
itemRole
.
title
=
itemRole
.
visibleTitle
||
''
;
itemRole
.
key
=
itemRole
.
visibleTitle
+
itemRole
.
visibleValue
||
''
;
itemRole
.
groupflag
=
itemRole
.
visibleTitle
;
itemRole
.
icon
=
mulu
?
<
UnorderedListOutlined
/>
:
''
;
//
itemRole.icon = mulu ? <UnorderedListOutlined /> : '';
itemRole
.
roleList
.
map
(
i
=>
{
i
.
title
=
i
.
roleName
;
i
.
key
=
i
.
roleID
;
...
...
@@ -308,7 +308,7 @@ const SiteManage = () => {
return
(
<
PageContainer
>
<
Row
gutter=
{
0
}
>
<
Col
span=
{
mulu
?
5
:
0
}
>
<
Col
span=
{
mulu
?
4
:
0
}
>
<
Card
className=
{
styles
.
cardBox
}
>
<
Spin
tip=
"loading...."
...
...
@@ -356,27 +356,27 @@ const SiteManage = () => {
confirmModal=
{
groupModal
}
/>
</
Card
>
<
div
>
{
/*
<div>
{mulu && (
<Tooltip title="隐藏角色栏" className={styles.hide}>
<DoubleLeftOutlined onClick={() => handleHide()} />
</Tooltip>
)}
</
div
>
</div>
*/
}
</
Col
>
<
Col
span=
{
mulu
?
0
:
1
}
>
{
/* {
mulu && (
{
/*
<Col span={mulu ? 0 : 1}>
{mulu && (
<Tooltip title="隐藏角色栏" className={styles.hide}>
<DoubleLeftOutlined onClick={() => handleHide()} />
</Tooltip>
)}
*/
}
)}
{!mulu && (
<Tooltip title="显示角色栏" className={styles.hide}>
<DoubleRightOutlined onClick={() => handleHide()} />
</Tooltip>
)}
</
Col
>
<
Col
span=
{
mulu
?
19
:
23
}
>
</Col>
*/
}
<
Col
span=
{
mulu
?
20
:
23
}
>
<
Card
style=
{
{
marginBottom
:
'10px'
,
minWidth
:
'870px'
}
}
>
<
Row
align=
"middle"
>
<
Col
span=
{
1
}
>
搜索
</
Col
>
...
...
src/pages/userCenter/roleManage/RoleManage.less
View file @
9d4878eb
.cardBox{
min-height: calc(100vh -
80
px);
max-height: calc(100vh -
80
px);
min-height: calc(100vh -
74
px);
max-height: calc(100vh -
74
px);
overflow-y: scroll;
margin-right:
2
0px;
margin-right:
1
0px;
}
.ant-tree-node-content-wrapper-open{
display: flex;
...
...
@@ -28,8 +28,8 @@
}
.cardBoxR{
min-width: 870px;
min-height: calc(100vh - 1
72
px);
max-height: calc(100vh - 1
72
px);
min-height: calc(100vh - 1
58
px);
max-height: calc(100vh - 1
58
px);
overflow-y: scroll;
}
:global{
...
...
@@ -58,3 +58,6 @@
vertical-align: 0.125em;
color:#1890FF;
}
.ant-card-body {
padding: 20px 10px;
}
src/pages/userCenter/siteManage/SiteManage.jsx
View file @
9d4878eb
...
...
@@ -237,7 +237,7 @@ const SiteManage = () => {
return
(
<
PageContainer
>
<
Row
>
<
Col
span=
{
mulu
?
5
:
0
}
>
<
Col
span=
{
mulu
?
4
:
0
}
>
<
Card
className=
{
classnames
({
[
styles
.
cardBox
]:
true
,
...
...
@@ -271,33 +271,32 @@ const SiteManage = () => {
confirmModal=
{
editModal
}
/>
</
Card
>
<
div
>
{
/*
<div>
{mulu && (
<Tooltip title="隐藏站点" className={styles.hide}>
<DoubleLeftOutlined onClick={() => handleHide()} />
</Tooltip>
)}
{
/* {
!mulu && (
{!mulu && (
<Tooltip title="显示站点" className={styles.hide}>
<DoubleRightOutlined onClick={() => handleHide()} />
</Tooltip>
)}
*/
}
</
div
>
)}
</div>
*/
}
</
Col
>
<
Col
span=
{
mulu
?
0
:
1
}
>
{
/* {
mulu && (
{
/*
<Col span={mulu ? 0 : 1}>
{mulu && (
<Tooltip title="隐藏站点" className={styles.hide}>
<DoubleLeftOutlined onClick={() => handleHide()} />
</Tooltip>
)}
*/
}
)}
{!mulu && (
<Tooltip title="显示站点" className={styles.hide}>
<DoubleRightOutlined onClick={() => handleHide()} />
</Tooltip>
)}
</
Col
>
<
Col
span=
{
mulu
?
19
:
23
}
>
</Col> */
}
<
Col
span=
{
mulu
?
20
:
23
}
>
<
Card
style=
{
{
marginBottom
:
'10px'
,
minWidth
:
'600px'
}
}
>
<
Row
align=
"middle"
>
<
Col
span=
{
1
}
>
搜索
</
Col
>
...
...
src/pages/userCenter/siteManage/SiteManage.less
View file @
9d4878eb
.cardBox{
min-height: calc(100vh -
80
px);
max-height: calc(100vh -
80
px);
min-height: calc(100vh -
74
px);
max-height: calc(100vh -
74
px);
overflow: auto;
margin-right:
2
0px;
margin-right:
1
0px;
}
.siteTitle{
font-size: 16px;
...
...
@@ -12,8 +12,8 @@
border-bottom: 1px solid #ccc;
}
.cardBoxR{
min-height: calc(100vh - 1
72
px);
max-height: calc(100vh - 1
72
px);
min-height: calc(100vh - 1
58
px);
max-height: calc(100vh - 1
58
px);
min-width: 600px;
overflow-y: scroll;
}
...
...
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