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
d05d6c72
Commit
d05d6c72
authored
Aug 06, 2021
by
shaoan123
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
解决GIS配置里面关联人员错误的bug
parent
e3a32324
Pipeline
#32625
passed with stages
in 30 minutes 57 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
38 additions
and
37 deletions
+38
-37
VisibleRoleModal.jsx
...projectManage/components/RolseSelect/VisibleRoleModal.jsx
+28
-26
AddModal.jsx
...s/platformCenter/schemeConfig/projectMessage/AddModal.jsx
+0
-2
solutionConfig.jsx
...formCenter/schemeConfig/solutionConfig/solutionConfig.jsx
+10
-9
No files found.
src/pages/platformCenter/messageManage/projectManage/components/RolseSelect/VisibleRoleModal.jsx
View file @
d05d6c72
...
...
@@ -34,39 +34,41 @@ const VisibleRoleModal = props => {
useEffect
(()
=>
{
let
isUnmount
=
false
console
.
log
(
'selectValue'
,
selectValue
);
if
(
selectValue
)
{
setSelectRole
(
selectValue
)
RoleGroupList
().
then
(
async
res
=>
{
let
tree
=
[]
let
leafs
=
[]
res
.
data
&&
res
.
data
.
roleList
.
map
((
item
,
index
)
=>
{
tree
.
push
({
name
:
item
.
visibleTitle
,
id
:
index
,
children
:
item
.
roleList
.
map
((
roleItem
)
=>
{
leafs
.
push
({
name
:
roleItem
.
roleName
,
id
:
roleItem
.
roleID
,
})
const
leafNode
=
{
name
:
roleItem
.
roleName
,
id
:
roleItem
.
roleID
,
children
:
[]
}
return
leafNode
}
RoleGroupList
().
then
(
async
res
=>
{
let
tree
=
[]
let
leafs
=
[]
res
.
data
&&
res
.
data
.
roleList
.
map
((
item
,
index
)
=>
{
tree
.
push
({
name
:
item
.
visibleTitle
,
id
:
index
,
children
:
item
.
roleList
.
map
((
roleItem
)
=>
{
leafs
.
push
({
name
:
roleItem
.
roleName
,
id
:
roleItem
.
roleID
,
})
const
leafNode
=
{
name
:
roleItem
.
roleName
,
id
:
roleItem
.
roleID
,
children
:
[]
}
return
leafNode
})
})
if
(
!
isUnmount
)
{
setDataTree
(
tree
)
setDataLeafs
(
leafs
)
}
})
if
(
!
isUnmount
)
{
setDataTree
(
tree
)
setDataLeafs
(
leafs
)
return
()
=>
isUnmount
=
true
;
}
)
}
return
()
=>
isUnmount
=
true
;
)
},
[
selectValue
])
...
...
src/pages/platformCenter/schemeConfig/projectMessage/AddModal.jsx
View file @
d05d6c72
...
...
@@ -128,8 +128,6 @@ const AddModal = props => {
pipeArr
.
push
(
item
.
ServiceName
.
split
(
"."
)[
0
])
})
}
console
.
log
(
'pipeArr'
,
pipeArr
);
console
.
log
(
'baseMap'
,
baseMap
);
setPipeArr
(
pipeArr
)
setBaseMap
(
baseMap
)
form
.
setFieldsValue
({
...
...
src/pages/platformCenter/schemeConfig/solutionConfig/solutionConfig.jsx
View file @
d05d6c72
...
...
@@ -6,7 +6,7 @@ import {
PlusOutlined
}
from
'@ant-design/icons'
;
import
{
deleteConfig
,
setServiceType
,
SetServiceConfig
,
GetMaplayerByTerminalType
deleteConfig
,
setServiceType
,
SetServiceConfig
,
GetMaplayerByTerminalType
}
from
'@/services/webConfig/api'
;
import
{
UserAddOutlined
...
...
@@ -57,7 +57,7 @@ const VectorData = props => {
<
Space
>
<
Space
>
<
div
onClick=
{
()
=>
pickRole
(
record
)
}
style=
{
{
cursor
:
'pointer'
}
}
>
<
VisibleRoleModal
onSubmit=
{
onPushSubmit
}
title=
{
"关联角色"
}
initValues
={
record
.
roles
!=
null
?
record
.
roles
.
split
(","):
[]}
operate=
{
<
UserAddOutlined
/>
}
/>
<
VisibleRoleModal
onSubmit=
{
onPushSubmit
}
title=
{
"关联角色"
}
initValues
=
{
record
.
roles
!=
null
?
record
.
roles
.
split
(
","
)
:
[]
}
operate=
{
<
UserAddOutlined
/>
}
/>
</
div
>
</
Space
>
</
Space
>
...
...
@@ -117,7 +117,7 @@ const VectorData = props => {
render
:
(
text
,
record
,
index
)
=>
(
<
Space
>
<
div
onClick=
{
()
=>
pickRole
(
record
)
}
style=
{
{
cursor
:
'pointer'
}
}
>
<
VisibleRoleModal
onSubmit=
{
onPushSubmit
}
title=
{
"关联角色"
}
initValues
={
record
.
roles
!=
null
?
record
.
roles
.
split
(","):
[]}
operate=
{
<
UserAddOutlined
/>
}
/>
<
VisibleRoleModal
onSubmit=
{
onPushSubmit
}
selectValue=
{
[]
}
title=
{
"关联角色"
}
initValues=
{
record
.
roles
!=
null
?
record
.
roles
.
split
(
","
)
:
[]
}
operate=
{
<
UserAddOutlined
/>
}
/>
</
div
>
</
Space
>
),
...
...
@@ -168,16 +168,17 @@ const VectorData = props => {
else
{
prompt
(
'fail'
,
'关联角色失败'
)
}
}).
catch
(
err
=>
{
}).
catch
(
err
=>
{
prompt
(
'fail'
,
'网络请求失败'
)
})
}
}
//获取角色
const
pickRole
=
(
record
)
=>
{
console
.
log
(
'recird'
,
record
);
setRecord
(
record
)
}
//设置web方案
...
...
@@ -420,8 +421,8 @@ const VectorData = props => {
isBaseMap
:
false
})
Promise
.
all
([
schemeConfigQueryRequest
,
webSchemeQueryRequest
]).
then
(
res
=>
{
console
.
log
(
'res'
,
res
);
if
(
res
[
0
].
msg
===
"Ok"
&&
res
[
0
].
data
.
phone
)
{
console
.
log
(
'res'
,
res
);
if
(
res
[
0
].
msg
===
"Ok"
&&
res
[
0
].
data
.
phone
)
{
let
arr
=
[]
res
[
0
].
data
.
phone
.
optionalLayer
.
layers
.
map
((
item
,
index
)
=>
{
if
(
item
.
isDefault
)
{
...
...
@@ -437,7 +438,7 @@ const VectorData = props => {
setHandStatus
(
arr
)
}
if
(
res
[
1
].
msg
===
"Ok"
&&
res
[
1
].
data
.
web
)
{
if
(
res
[
1
].
msg
===
"Ok"
&&
res
[
1
].
data
.
web
)
{
let
arr
=
[]
res
[
1
].
data
.
web
.
optionalLayer
.
layers
.
map
((
item
,
index
)
=>
{
if
(
item
.
type
===
"pipenet"
)
{
...
...
@@ -452,7 +453,7 @@ const VectorData = props => {
setWebStatus
(
arr
)
}
setCheckLoading
(
false
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
setCheckLoading
(
false
)
})
...
...
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