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
3d5d149c
Commit
3d5d149c
authored
Jun 19, 2020
by
张博
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
getErrorarea
parent
edf9b6f5
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
View3D.js
mods/components/3dviewConvertor/view/View3D.js
+2
-3
ExceptionArea.js
...nents/3dviewConvertor/view/exceptionArea/ExceptionArea.js
+3
-2
No files found.
mods/components/3dviewConvertor/view/View3D.js
View file @
3d5d149c
...
@@ -575,7 +575,7 @@ class View3D extends Component {
...
@@ -575,7 +575,7 @@ class View3D extends Component {
});
});
}
}
};
};
getErrorAreaPoint
(
riskSourceId
)
{
getErrorAreaPoint
=
(
riskSourceId
)
=>
{
const
{
markers
}
=
this
.
state
;
const
{
markers
}
=
this
.
state
;
let
arrays
=
[
'riskSource'
,
'patrol'
,
'impEquipment'
,
'monitorEquipment'
];
let
arrays
=
[
'riskSource'
,
'patrol'
,
'impEquipment'
,
'monitorEquipment'
];
initView3DAction
(
''
,
riskSourceId
,
true
).
then
(
d
=>
{
initView3DAction
(
''
,
riskSourceId
,
true
).
then
(
d
=>
{
...
@@ -1644,7 +1644,6 @@ class View3D extends Component {
...
@@ -1644,7 +1644,6 @@ class View3D extends Component {
const
{
isPointSave
,
isAreaSave
}
=
this
.
state
;
const
{
isPointSave
,
isAreaSave
}
=
this
.
state
;
if
(
type
===
'into_except_model'
){
//进入耳朵模式
if
(
type
===
'into_except_model'
){
//进入耳朵模式
this
.
props
.
editModelChange
(
true
);
//隐藏全景统计
this
.
props
.
editModelChange
(
true
);
//隐藏全景统计
this
.
getErrorAreaPoint
(
areaId
);
this
.
setState
({
this
.
setState
({
sideControlShow
:
true
,
//显示耳朵
sideControlShow
:
true
,
//显示耳朵
isShowActionBar
:
false
,
//隐藏工具栏
isShowActionBar
:
false
,
//隐藏工具栏
...
@@ -1896,7 +1895,7 @@ class View3D extends Component {
...
@@ -1896,7 +1895,7 @@ class View3D extends Component {
{
isEditMode
&&
this
.
renderAreas
()}
{
isEditMode
&&
this
.
renderAreas
()}
{
this
.
renderPolygonRegion
(
exceptionAreas
)}
{
this
.
renderPolygonRegion
(
exceptionAreas
)}
{
errorAreaId
&&
this
.
selectPolygonRegion
(
exceptionAreas
,
errorAreaId
)}
{
errorAreaId
&&
this
.
selectPolygonRegion
(
exceptionAreas
,
errorAreaId
)}
{
isOutterView
&&
startLoadExceptionArea
&&
<
ExceptionArea
markers
=
{
exceptionMarkers
}
handleExceptModel
=
{
this
.
handleExceptModel
}
focusObject
=
{
this
.
focusObject
}
/>
}
{
isOutterView
&&
startLoadExceptionArea
&&
<
ExceptionArea
markers
=
{
exceptionMarkers
}
handleExceptModel
=
{
this
.
handleExceptModel
}
focusObject
=
{
this
.
focusObject
}
getErrorAreaPoint
=
{
this
.
getErrorAreaPoint
}
/>
}
<
/A3DDesigner
>
<
/A3DDesigner
>
<
/div
>
<
/div
>
{
isEditMode
&&
{
isEditMode
&&
...
...
mods/components/3dviewConvertor/view/exceptionArea/ExceptionArea.js
View file @
3d5d149c
...
@@ -48,7 +48,7 @@ class ExceptionArea extends Component {
...
@@ -48,7 +48,7 @@ class ExceptionArea extends Component {
this
.
props
.
handleExceptModel
&&
this
.
props
.
handleExceptModel
(
'into_except_model'
,
extData
.
id
);
this
.
props
.
handleExceptModel
&&
this
.
props
.
handleExceptModel
(
'into_except_model'
,
extData
.
id
);
this
.
props
.
focusObject
&&
this
.
props
.
focusObject
(
node
);
this
.
props
.
focusObject
&&
this
.
props
.
focusObject
(
node
);
//
this.props.getErrorAreaPoint && this.props.getErrorAreaPoint(extData.id);
this
.
props
.
getErrorAreaPoint
&&
this
.
props
.
getErrorAreaPoint
(
extData
.
id
);
}
}
...
@@ -102,7 +102,8 @@ class ExceptionArea extends Component {
...
@@ -102,7 +102,8 @@ class ExceptionArea extends Component {
ExceptionArea
.
propTypes
=
{
ExceptionArea
.
propTypes
=
{
markers
:
PropTypes
.
array
,
markers
:
PropTypes
.
array
,
handleExceptModel
:
PropTypes
.
func
,
handleExceptModel
:
PropTypes
.
func
,
focusObject
:
PropTypes
.
func
focusObject
:
PropTypes
.
func
,
getErrorAreaPoint
:
PropTypes
.
func
};
};
export
default
ExceptionArea
;
export
default
ExceptionArea
;
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