Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-station-module-view
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
station
amos-station-module-view
Commits
28f1cb4b
Commit
28f1cb4b
authored
Jun 10, 2020
by
张博
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
7641b3fe
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
50 additions
and
49 deletions
+50
-49
actionbar.scss
mods/components/3dviewConvertor/styles/actionbar.scss
+39
-39
View3D.js
mods/components/3dviewConvertor/view/View3D.js
+0
-0
PointLeftTree.js
...3dviewConvertor/view/moduleEditComponent/PointLeftTree.js
+0
-0
RightEditRegionPanel.js
...onvertor/view/moduleEditComponent/RightEditRegionPanel.js
+2
-1
marker3DFactory.js
...components/3dviewConvertor/view/points/marker3DFactory.js
+9
-9
No files found.
mods/components/3dviewConvertor/styles/actionbar.scss
View file @
28f1cb4b
.action-pane-data
{
.action-pane-data
{
position
:
absolute
;
bottom
:
5%
;
left
:
50%
;
transform
:
translateX
(
-50%
);
.action-list
{
height
:
40px
;
padding
:
0
1rem
;
border-radius
:
6px
;
background
:rgba
(
216
,
216
,
216
,
0
.24
)
;
border
:
1px
solid
rgba
(
146
,
149
,
151
,
1
)
;
.action-list
{
height
:
40px
;
padding
:
0
1rem
;
background-color
:
rgba
(
216
,
216
,
216
,
0
.24
)
;
border
:
1px
solid
rgba
(
146
,
149
,
151
,
1
);
border-radius
:
6px
;
.action-item
{
float
:
left
;
width
:
40px
;
height
:
38px
;
text-align
:
center
;
cursor
:
pointer
;
border
:
1px
solid
rgba
(
146
,
149
,
151
,
1
);
.action-item
{
float
:
left
;
width
:
40px
;
height
:
38px
;
text-align
:
center
;
cursor
:
pointer
;
border
:
1px
solid
rgba
(
146
,
149
,
151
,
1
);
.action-item-title
{
color
:
#e0e0e0
;
position
:
absolute
;
top
:
-20
px
;
white-space
:
nowrap
;
width
:
51px
;
-webkit-transform-origin-x
:
0
;
-webkit-transform
:
scale
(
0
.80
)
;
text-align
:
center
;
}
.action-item-title
{
position
:
absolute
;
top
:
-20px
;
width
:
51
px
;
color
:
#e0e0e0
;
text-align
:
center
;
white-space
:
nowrap
;
-webkit-transform-origin-x
:
0
;
-webkit-transform
:
scale
(
0
.8
)
;
}
.action-item-content
{
text-align
:
center
;
position
:
relative
;
width
:
100%
;
height
:
100%
;
.action-item-content
{
position
:
relative
;
width
:
100%
;
height
:
100%
;
text-align
:
center
;
.action-item-icon
{
margin
:
8px
;
width
:
21px
;
height
:
21px
;
position
:
relative
;
}
}
.action-item-icon
{
position
:
relative
;
width
:
21px
;
height
:
21px
;
margin
:
8px
;
}
}
}
.action-active
{
background
:
linear-gradient
(
180deg
,
rgba
(
0
,
96
,
154
,
0
.8
)
0%
,
rgba
(
0
,
54
,
105
,
0
.5
)
100%
);
}
.action-active
{
background
:
linear-gradient
(
180deg
,
rgba
(
0
,
96
,
154
,
0
.8
)
0%
,
rgba
(
0
,
54
,
105
,
0
.5
)
100%
);
}
}
}
mods/components/3dviewConvertor/view/View3D.js
View file @
28f1cb4b
This diff is collapsed.
Click to expand it.
mods/components/3dviewConvertor/view/moduleEditComponent/PointLeftTree.js
View file @
28f1cb4b
This diff is collapsed.
Click to expand it.
mods/components/3dviewConvertor/view/moduleEditComponent/RightEditRegionPanel.js
View file @
28f1cb4b
...
...
@@ -87,7 +87,6 @@ class RightEditRegionPanel extends Component {
this
.
form
.
validate
((
valid
,
dataValues
,
errors
)
=>
{
console
.
log
(
'返回内容:'
,
dataValues
,
valid
,
errors
);
if
(
valid
)
{
let
routePathData
=
[
{
riskSourceId
:
detailData
.
id
,
routePath
:
JSON
.
stringify
({
...
...
@@ -104,8 +103,10 @@ class RightEditRegionPanel extends Component {
})
}
this
.
props
.
changeRoutePath
(
routePathDataNode
);
this
.
props
.
closeRightPanel
()
}
else
{
console
.
log
(
'error submit!!'
);
this
.
props
.
closeRightPanel
()
return
false
;
}
});
...
...
mods/components/3dviewConvertor/view/points/marker3DFactory.js
View file @
28f1cb4b
...
...
@@ -199,7 +199,7 @@ export default function marker3DFactory(WrappedComponent = 'div', options){
}
buildMarkerOptions
=
(
markers
,
markerType
,
defaultParams
=
{})
=>
{
console
.
log
(
markers
)
console
.
log
(
markers
)
;
const
{
isEditMode
}
=
this
.
props
;
if
(
!
utils
.
isEmpty
(
markers
)){
markers
.
forEach
(
m
=>
{
...
...
@@ -209,17 +209,17 @@ export default function marker3DFactory(WrappedComponent = 'div', options){
position
=
Object
.
values
(
m
.
position
);
}
for
(
let
k
of
Object
.
keys
(
defaultParams
))
{
if
((
markerType
===
'riskSource'
||
markerType
===
'patrol'
)
&&
k
!
=
'useModel'
&&
!
isEditMode
){
if
((
markerType
===
'riskSource'
||
markerType
===
'patrol'
)
&&
k
!=
=
'useModel'
&&
!
isEditMode
){
m
[
k
]
=
formatUrl
(
defaultParams
[
k
],
{
url
:
`
${
markerType
}
-
${
m
.
level
}
`
});
}
else
if
((
markerType
===
'riskSource'
||
markerType
===
'patrol'
)
&&
k
!
=
'useModel'
&&
isEditMode
){
if
(
markerType
===
'riskSource'
){
}
else
if
((
markerType
===
'riskSource'
||
markerType
===
'patrol'
)
&&
k
!=
=
'useModel'
&&
isEditMode
){
if
(
markerType
===
'riskSource'
){
m
[
k
]
=
formatUrl
(
defaultParams
[
k
],
{
url
:
`
${
markerType
}
-4`
});
}
else
{
}
else
{
m
[
k
]
=
formatUrl
(
defaultParams
[
k
],
{
url
:
`
${
markerType
}
-1`
});
}
}
else
if
(
markerType
===
'fireResource'
&&
k
!
=
'useModel'
&&
isEditMode
&&
urlMapper
[
m
.
type
]){
m
[
k
]
=
formatUrl
(
defaultParams
[
k
],
{
url
:
`
${
urlMapper
[
m
.
type
].
file
}
`
});
}
else
{
}
else
if
(
markerType
===
'fireResource'
&&
k
!=
=
'useModel'
&&
isEditMode
&&
urlMapper
[
m
.
type
]){
m
[
k
]
=
formatUrl
(
defaultParams
[
k
],
{
url
:
`
${
urlMapper
[
m
.
type
].
file
}
`
});
}
else
{
m
[
k
]
=
defaultParams
[
k
];
}
}
...
...
@@ -236,7 +236,7 @@ export default function marker3DFactory(WrappedComponent = 'div', options){
};
render
()
{
const
{
markers
,
isEditMode
,
...
rest
}
=
this
.
props
;
const
{
markers
,
isEditMode
,
...
rest
}
=
this
.
props
;
const
{
planStarted
}
=
this
.
state
;
let
dialogStyle
=
{
zIndex
:
1000
};
...
...
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