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
93474318
Commit
93474318
authored
1 year ago
by
皮倩雯
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: '角色管理bug修复'
parent
312aa015
Pipeline
#78925
passed with stages
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
43 additions
and
4 deletions
+43
-4
AddModal.jsx
...ages/bsmanager/patrolMaintenance/maintenance/AddModal.jsx
+29
-3
RoleManage.jsx
src/pages/userCenter/roleManage/RoleManage.jsx
+14
-1
No files found.
src/pages/bsmanager/patrolMaintenance/maintenance/AddModal.jsx
View file @
93474318
...
...
@@ -863,7 +863,20 @@ const AddModal = props => {
</
Col
>
{
form
.
getFieldsValue
().
accountName
?
(
<
Col
span=
{
24
}
>
<
Item
label=
"父业务模板"
name=
"parentId"
labelCol=
{
{
span
:
5
}
}
>
<
Item
label=
{
<
span
>
<
Tooltip
title=
"针对组合设备的反馈模板方式,可独立配置模板并挂接父子关系,批量反馈"
>
<
InfoCircleOutlined
style=
{
{
color
:
'rgb(24, 144, 255)'
,
marginLeft
:
'5px'
,
marginTop
:
'3px'
}
}
/>
</
Tooltip
>
父业务模板
</
span
>
}
name=
"parentId"
labelCol=
{
{
span
:
5
}
}
>
<
Select
placeholder=
"选择父业务模板"
showSearch
allowClear
>
{
parentList
?
parentList
.
map
((
item
,
index
)
=>
(
...
...
@@ -877,8 +890,21 @@ const AddModal = props => {
</
Col
>
)
:
(
<
Col
span=
{
24
}
>
<
Item
label=
"父业务模板"
name=
"parentId"
labelCol=
{
{
span
:
5
}
}
>
<
Select
placeholder=
"请先选择维保设备"
disabled
>
<
Item
label=
{
<
span
>
<
Tooltip
title=
"针对组合设备的反馈模板方式,可独立配置模板并挂接父子关系,批量反馈"
>
<
InfoCircleOutlined
style=
{
{
color
:
'rgb(24, 144, 255)'
,
marginLeft
:
'5px'
,
marginTop
:
'3px'
}
}
/>
</
Tooltip
>
父业务模板
</
span
>
}
name=
"parentId"
labelCol=
{
{
span
:
5
}
}
>
<
Select
placeholder=
"选择父业务模板"
disabled
>
{
parentList
?
parentList
.
map
((
item
,
index
)
=>
(
<
Option
key=
{
index
.
ID
}
value=
{
item
.
ID
}
>
...
...
This diff is collapsed.
Click to expand it.
src/pages/userCenter/roleManage/RoleManage.jsx
View file @
93474318
...
...
@@ -284,7 +284,20 @@ const SiteManage = () => {
{
afterStr
}
</
div
>
)
:
(
<
div
className=
{
styles
.
titleTop
}
>
{
i
.
title
}
</
div
>
<
div
className=
{
styles
.
titleTop
}
>
{
i
.
title
}
{
i
.
description
&&
(
<
Tooltip
title=
{
i
.
description
}
>
<
InfoCircleOutlined
style=
{
{
color
:
'rgb(24, 144, 255)'
,
marginLeft
:
'5px'
,
marginTop
:
'3px'
,
}
}
/>
</
Tooltip
>
)
}
</
div
>
)
}
<
div
className=
{
styles
.
tip
}
>
{
i
.
roleID
&&
(
...
...
This diff is collapsed.
Click to expand it.
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