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
d03cd9fe
Commit
d03cd9fe
authored
Dec 01, 2022
by
皮倩雯
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: '巡检反馈支持业务划分支持多选'
parent
932f4bec
Pipeline
#64723
passed with stages
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
11 deletions
+17
-11
PerviewPrase.jsx
.../bsmanager/base/tablemanager/filedConfig/PerviewPrase.jsx
+1
-1
maintenance.jsx
...s/bsmanager/patrolMaintenance/maintenance/maintenance.jsx
+1
-2
AddModal.jsx
...s/bsmanager/patrolMaintenance/patrolFeedback/AddModal.jsx
+5
-1
patrolFeedback.jsx
...nager/patrolMaintenance/patrolFeedback/patrolFeedback.jsx
+7
-4
schemeDetail.jsx
...latformCenter/messageManage/schemeDetail/schemeDetail.jsx
+3
-3
No files found.
src/pages/bsmanager/base/tablemanager/filedConfig/PerviewPrase.jsx
View file @
d03cd9fe
...
...
@@ -16,7 +16,7 @@ const PerviewPrase = props => {
overflow
:
'hidden'
,
}
}
width=
"1800px"
style=
{
{
marginTop
:
'-80px'
}
}
style=
{
{
marginTop
:
'-80px'
,
width
:
'75%'
}
}
destroyOnClose
maskClosable=
{
false
}
footer=
{
...
...
src/pages/bsmanager/patrolMaintenance/maintenance/maintenance.jsx
View file @
d03cd9fe
...
...
@@ -324,9 +324,9 @@ const maintenance = () => {
onClick=
{
add
}
type=
"primary"
style=
{
{
marginLeft
:
'30px'
,
verticalAlign
:
'middle'
,
marginTop
:
'10px'
,
marginRight
:
'20px'
,
}
}
>
<
span
style=
{
{
marginTop
:
'-2px'
}
}
>
新增
</
span
>
...
...
@@ -335,7 +335,6 @@ const maintenance = () => {
icon=
{
<
OrderedListOutlined
className=
{
styles
.
icon
}
/>
}
onClick=
{
sort
}
style=
{
{
marginLeft
:
'30px'
,
verticalAlign
:
'middle'
,
marginTop
:
'10px'
,
}
}
...
...
src/pages/bsmanager/patrolMaintenance/patrolFeedback/AddModal.jsx
View file @
d03cd9fe
...
...
@@ -81,6 +81,8 @@ const AddModal = props => {
console
.
log
(
res
.
data
);
if
(
!
res
.
data
.
businessGroup
)
{
form
.
setFieldsValue
({
businessGroup
:
'区域巡检'
});
}
else
{
form
.
setFieldsValue
({
businessGroup
:
res
.
data
.
businessGroup
.
split
(
','
)
});
}
let
aa
=
JSON
.
parse
(
res
.
data
.
mappingFields
);
getGetTaskSyncField
(
aa
);
// 获取字段名数据
...
...
@@ -319,6 +321,8 @@ const AddModal = props => {
}
});
});
console
.
log
(
obj
);
obj
.
businessGroup
=
obj
.
businessGroup
.
toString
();
if
(
type
==
'add'
)
{
CM_Feedback_OperatePatrolFeedback
({
...
obj
,
...
...
@@ -682,7 +686,7 @@ const AddModal = props => {
</
Col
>
<
Col
span=
{
23
}
>
<
Item
label=
"业务划分"
name=
"businessGroup"
labelCol=
{
{
span
:
4
}
}
>
<
Select
placeholder=
"请选择业务划分"
showSearch
>
<
Select
placeholder=
"请选择业务划分"
showSearch
mode=
"multiple"
allowClear
>
<
Option
key=
"区域巡检"
value=
"区域巡检"
>
区域巡检
</
Option
>
...
...
src/pages/bsmanager/patrolMaintenance/patrolFeedback/patrolFeedback.jsx
View file @
d03cd9fe
...
...
@@ -151,7 +151,7 @@ const patrolFeedback = () => {
title
:
'字段集'
,
dataIndex
:
'fields'
,
key
:
'fields'
,
width
:
5
0
,
width
:
8
0
,
align
:
'center'
,
},
// {
...
...
@@ -223,6 +223,12 @@ const patrolFeedback = () => {
area
.
push
(
i
);
}
else
if
(
i
.
businessGroup
===
'DMA巡检'
)
{
dma
.
push
(
i
);
}
else
if
(
i
.
businessGroup
===
'区域巡检,DMA巡检'
||
i
.
businessGroup
===
'DMA巡检,区域巡检'
)
{
area
.
push
(
i
);
dma
.
push
(
i
);
}
else
{
other
.
push
(
i
);
}
...
...
@@ -416,7 +422,6 @@ const patrolFeedback = () => {
onClick=
{
add
}
type=
"primary"
style=
{
{
marginLeft
:
'30px'
,
verticalAlign
:
'middle'
,
marginTop
:
'10px'
,
}
}
...
...
@@ -427,7 +432,6 @@ const patrolFeedback = () => {
icon=
{
<
OrderedListOutlined
className=
{
styles
.
icon
}
/>
}
onClick=
{
sort
}
style=
{
{
marginLeft
:
'30px'
,
verticalAlign
:
'middle'
,
marginTop
:
'10px'
,
}
}
...
...
@@ -437,7 +441,6 @@ const patrolFeedback = () => {
<
Button
icon=
{
<
DeleteOutlined
className=
{
styles
.
icon
}
/>
}
style=
{
{
marginLeft
:
'30px'
,
verticalAlign
:
'middle'
,
marginTop
:
'10px'
,
}
}
...
...
src/pages/platformCenter/messageManage/schemeDetail/schemeDetail.jsx
View file @
d03cd9fe
...
...
@@ -916,8 +916,8 @@ const EditModal = props => {
onClick=
{
currentTrench
.
isWEBShow
?
()
=>
{
pictruePreview
();
}
pictruePreview
();
}
:
''
}
fallback=
"data:image/png;base64,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"
...
...
@@ -1106,7 +1106,7 @@ const EditModal = props => {
<
Row
>
<
Col
span=
{
24
}
>
<
div
style=
{
{
marginTop
:
'1rem'
,
display
:
'flex'
,
justifyContent
:
'flex-end'
}
}
>
<
Button
htmlType=
"button"
onClick=
{
back
}
style=
{
{
marginRight
:
'2
rem
'
}
}
>
<
Button
htmlType=
"button"
onClick=
{
back
}
style=
{
{
marginRight
:
'2
0px
'
}
}
>
返回
</
Button
>
<
Button
type=
"primary"
htmlType=
"submit"
>
...
...
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