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
837f551e
Commit
837f551e
authored
Nov 13, 2020
by
Maofei94
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 人员选择
parent
03d16e7a
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
21 additions
and
9 deletions
+21
-9
index.js
src/pages/mobileConfig/index.js
+1
-1
LeftPart.less
src/pages/mobileConfig/menuconfig/LeftPart.less
+1
-1
MenuConfig.jsx
src/pages/mobileConfig/menuconfig/MenuConfig.jsx
+1
-3
RoleManage.jsx
src/pages/userCenter/roleManage/RoleManage.jsx
+8
-2
RoleManage.less
src/pages/userCenter/roleManage/RoleManage.less
+8
-0
SiteManage.jsx
src/pages/userCenter/siteManage/SiteManage.jsx
+2
-2
No files found.
src/pages/mobileConfig/index.js
View file @
837f551e
...
...
@@ -7,7 +7,7 @@ import SiteConfig from './SiteConfig';
import
MenuConfig
from
'./menuconfig/MenuConfig'
;
const
{
TabPane
}
=
Tabs
;
const
MobileConfigPage
=
props
=>
{
const
[
activeKey
,
setActiveKey
]
=
useState
(
'
1
'
);
// tabs活动页
const
[
activeKey
,
setActiveKey
]
=
useState
(
'
0
'
);
// tabs活动页
const
[
miniTitle
,
setMiniTitle
]
=
useState
(
''
);
const
[
flag
,
setFlag
]
=
useState
(
1
);
useEffect
(()
=>
{
...
...
src/pages/mobileConfig/menuconfig/LeftPart.less
View file @
837f551e
.contentContainer{
// min-height: calc(100vh - 194
px);
min-height: calc(100vh - 300
px);
display: flex;
.menuContainer{
min-width: 300px;
...
...
src/pages/mobileConfig/menuconfig/MenuConfig.jsx
View file @
837f551e
...
...
@@ -10,9 +10,7 @@ const MenuConfig = props => {
<
ProCard
colSpan=
"400px"
>
<
LeftPart
/>
</
ProCard
>
<
ProCard
>
<
AddForm
/>
</
ProCard
>
<
ProCard
>
{
/* <AddForm /> */
}
</
ProCard
>
</
ProCard
>
);
};
...
...
src/pages/userCenter/roleManage/RoleManage.jsx
View file @
837f551e
...
...
@@ -67,11 +67,13 @@ const SiteManage = () => {
// });
// }, [flag]);
useEffect
(()
=>
{
setSpinLoading
(
true
);
getUserRelationList
({
userID
:
82
,
_version
:
9999
,
_dc
:
Date
.
now
(),
}).
then
(
res
=>
{
setSpinLoading
(
false
);
let
arr
=
res
.
roleList
;
let
arr2
=
transTree2
(
arr
);
console
.
log
(
arr2
,
'arr2'
);
...
...
@@ -229,6 +231,8 @@ const SiteManage = () => {
onSelect=
{
e
=>
handleTreeSelect
(
e
)
}
treeData=
{
treeData
}
blockNode
autoExpandParent
defaultExpandAll
/>
</
Spin
>
<
AddModal
...
...
@@ -250,8 +254,8 @@ const SiteManage = () => {
/>
</
Card
>
</
Col
>
<
Col
lg=
{
18
}
md=
{
24
}
>
<
Card
className=
{
styles
.
cardBox
}
>
<
Col
lg=
{
18
}
>
<
Card
style=
{
{
marginBottom
:
'10px'
}
}
>
<
Row
align=
"middle"
>
<
Col
span=
{
1
}
>
搜索
</
Col
>
<
Col
span=
{
8
}
>
...
...
@@ -264,6 +268,8 @@ const SiteManage = () => {
/>
</
Col
>
</
Row
>
</
Card
>
<
Card
className=
{
styles
.
cardBoxR
}
>
{
ouid
&&
(
<
ListCard
ouid=
{
ouid
}
...
...
src/pages/userCenter/roleManage/RoleManage.less
View file @
837f551e
.cardBox{
min-height: calc(100vh - 200px);
max-height: calc(100vh - 200px);
overflow-y: scroll;
}
.ant-tree-node-content-wrapper-open{
display: flex;
...
...
@@ -22,4 +24,9 @@
// flex-wrap: wrap;
justify-content: space-around;
align-items: center;
}
.cardBoxR{
min-height: calc(100vh - 292px);
max-height: calc(100vh - 292px);
overflow-y: scroll;
}
\ No newline at end of file
src/pages/userCenter/siteManage/SiteManage.jsx
View file @
837f551e
...
...
@@ -207,7 +207,7 @@ const SiteManage = () => {
<
PageContainer
>
<
GridContent
>
<
Row
gutter=
{
12
}
>
<
Col
lg=
{
6
}
sm=
{
6
}
>
<
Col
lg=
{
6
}
>
<
Card
className=
{
styles
.
cardBox
}
>
<
Spin
tip=
"loading...."
...
...
@@ -235,7 +235,7 @@ const SiteManage = () => {
/>
</
Card
>
</
Col
>
<
Col
lg=
{
18
}
sm=
{
18
}
>
<
Col
lg=
{
18
}
>
<
Card
style=
{
{
marginBottom
:
'10px'
}
}
>
<
Row
align=
"middle"
>
<
Col
span=
{
1
}
>
搜索
</
Col
>
...
...
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