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
259dd299
Commit
259dd299
authored
Nov 04, 2022
by
皮倩雯
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: '优化维保模板时间周期选择交互'
parent
97efbef3
Pipeline
#63182
passed with stages
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
103 additions
and
8 deletions
+103
-8
fieldEditor.jsx
...s/bsmanager/base/tablemanager/filedConfig/fieldEditor.jsx
+1
-1
AddModal.jsx
...ages/bsmanager/patrolMaintenance/maintenance/AddModal.jsx
+79
-5
patrolFeedback.jsx
...nager/patrolMaintenance/patrolFeedback/patrolFeedback.jsx
+23
-2
No files found.
src/pages/bsmanager/base/tablemanager/filedConfig/fieldEditor.jsx
View file @
259dd299
...
...
@@ -3454,7 +3454,7 @@ const AddModal = props => {
labelCol=
{
{
span
:
4
}
}
rules=
{
[{
required
:
true
,
message
:
'请输入控制规则'
}]
}
>
{
/* <TextArea placeholder="示例
:
{表名.是否缴费} = ‘是’ and {表名.缴费金额} > 1000" /> */
}
{
/* <TextArea placeholder="示例
:
{表名.是否缴费} = ‘是’ and {表名.缴费金额} > 1000" /> */
}
<
div
style=
{
{
border
:
'2px solid #6A98FA'
,
minHeight
:
'34px'
,
lineHeight
:
'34px'
,
textAlign
:
'center'
}
}
onClick=
{
editRule
}
><
span
>
{
form
.
getFieldsValue
().
configName
}
</
span
></
div
>
</
Item
>
</>
...
...
src/pages/bsmanager/patrolMaintenance/maintenance/AddModal.jsx
View file @
259dd299
...
...
@@ -17,6 +17,7 @@ import {
Space
,
Radio
,
Switch
,
TreeSelect
,
}
from
'antd'
;
import
{
PlusOutlined
,
...
...
@@ -71,6 +72,51 @@ const AddModal = props => {
const
[
form
]
=
Form
.
useForm
();
const
{
Item
}
=
Form
;
const
{
TextArea
}
=
Input
;
const
{
TreeNode
}
=
TreeSelect
;
const
[
characteristics1
,
setCharacteristics1
]
=
useState
([
{
name
:
'一日一次'
,
ID
:
0
,
},
{
name
:
'一周一次'
,
ID
:
1
,
},
{
name
:
'半月一次'
,
ID
:
2
,
},
{
name
:
'一月一次'
,
ID
:
3
,
},
{
name
:
'季度一次'
,
ID
:
4
,
},
{
name
:
'半年一次'
,
ID
:
5
,
},
{
name
:
'一年一次'
,
ID
:
6
,
},
{
name
:
'小时类'
,
ID
:
7
,
children
:
[
'1小时一次'
,
'2小时一次'
,
'3小时一次'
,
'4小时一次'
,
'6小时一次'
,
'8小时一次'
,
'12小时一次'
,
],
},
]);
useEffect
(()
=>
{
if
(
visible
)
{
...
...
@@ -374,6 +420,20 @@ const AddModal = props => {
setVisibleChecked1
(
e
);
};
const
mapTreeSelect
=
org
=>
{
if
(
org
.
children
)
{
return
(
<
TreeNode
value=
{
org
.
name
}
title=
{
org
.
name
}
disabled
>
{
org
.
children
.
map
(
item
=>
mapTreeSelect
(
item
))
}
</
TreeNode
>
);
}
if
(
org
.
name
)
{
return
<
TreeNode
value=
{
org
.
name
}
title=
{
org
.
name
}
/>;
}
return
<
TreeNode
value=
{
org
}
title=
{
org
}
key=
{
org
}
/>;
};
return
(
<
Drawer
title=
"巡维保计划配置"
...
...
@@ -450,10 +510,17 @@ const AddModal = props => {
</
Col
>
<
Col
span=
{
24
}
>
<
Item
label=
"执行周期"
name=
"docycle"
labelCol=
{
{
span
:
5
}
}
>
<
Select
placeholder=
"选择计划执行周期"
>
<
Option
value=
"2小时一次"
>
2小时一次
</
Option
>
<
Option
value=
"6小时一次"
>
6小时一次
</
Option
>
<
Option
value=
"12小时一次"
>
12小时一次
</
Option
>
<
TreeSelect
showSearch
dropdownStyle=
{
{
maxHeight
:
400
,
overflow
:
'auto'
}
}
placeholder=
"请选择表名 "
allowClear
treeDefaultExpandAll
showCheckedStrategy
>
{
characteristics1
.
map
(
i
=>
mapTreeSelect
(
i
))
}
</
TreeSelect
>
{
/* <Select placeholder="选择计划执行周期">
<Option value="一日一次">一日一次</Option>
<Option value="一周一次">一周一次</Option>
<Option value="半月一次">半月一次</Option>
...
...
@@ -461,7 +528,14 @@ const AddModal = props => {
<Option value="季度一次">季度一次</Option>
<Option value="半年一次">半年一次</Option>
<Option value="一年一次">一年一次</Option>
</
Select
>
<Option value="1小时一次">1小时一次</Option>
<Option value="2小时一次">2小时一次</Option>
<Option value="3小时一次">3小时一次</Option>
<Option value="4小时一次">4小时一次</Option>
<Option value="6小时一次">6小时一次</Option>
<Option value="8小时一次">8小时一次</Option>
<Option value="12小时一次">12小时一次</Option>
</Select> */
}
</
Item
>
</
Col
>
<
Col
span=
{
24
}
>
...
...
src/pages/bsmanager/patrolMaintenance/patrolFeedback/patrolFeedback.jsx
View file @
259dd299
...
...
@@ -52,10 +52,31 @@ const patrolFeedback = () => {
title
:
'反馈表'
,
dataIndex
:
'tableName'
,
key
:
'tableName'
,
width
:
4
00
,
width
:
2
00
,
onCell
:
()
=>
({
style
:
{
maxWidth
:
400
,
maxWidth
:
200
,
overflow
:
'hidden'
,
whiteSpace
:
'nowrap'
,
textOverflow
:
'ellipsis'
,
cursor
:
'pointer'
,
},
}),
align
:
'center'
,
render
:
record
=>
(
<
Tooltip
placement=
"topLeft"
title=
{
record
}
>
{
record
}
</
Tooltip
>
),
},
{
title
:
'关联事件表'
,
dataIndex
:
'relationEvent'
,
key
:
'relationEvent'
,
width
:
200
,
onCell
:
()
=>
({
style
:
{
maxWidth
:
200
,
overflow
:
'hidden'
,
whiteSpace
:
'nowrap'
,
textOverflow
:
'ellipsis'
,
...
...
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