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
9d998c56
Commit
9d998c56
authored
May 26, 2020
by
吴江
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
规则修改适配
parent
0c28219d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
9 deletions
+5
-9
3dService.js
mods/components/3dviewConvertor/services/3dService.js
+4
-7
MaskContent.js
mods/components/3dviewConvertor/view/MaskContent.js
+1
-1
View3D.js
mods/components/3dviewConvertor/view/View3D.js
+0
-1
No files found.
mods/components/3dviewConvertor/services/3dService.js
View file @
9d998c56
...
@@ -26,14 +26,11 @@ export const getObjFromNet = (url, callback) => {
...
@@ -26,14 +26,11 @@ export const getObjFromNet = (url, callback) => {
* @param {string} type
* @param {string} type
*/
*/
export
const
initView3DAction
=
(
type
,
riskSourceId
)
=>
{
export
const
initView3DAction
=
(
type
,
riskSourceId
)
=>
{
let
param
=
{};
if
(
!
riskSourceId
)
{
if
(
riskSourceId
)
{
riskSourceId
=
""
;
param
=
{
type
,
riskSourceId
};
}
}
else
{
param
=
{
type
};
const
url
=
formatUrl
(
FscSerUrl
.
view3dInitUrl
,
{
type
,
riskSourceId
});
}
const
url
=
formatUrl
(
FscSerUrl
.
view3dInitUrl
,
param
);
return
commonGet
(
url
);
return
commonGet
(
url
);
};
};
...
...
mods/components/3dviewConvertor/view/MaskContent.js
View file @
9d998c56
...
@@ -114,7 +114,7 @@ class MaskContent extends Component {
...
@@ -114,7 +114,7 @@ class MaskContent extends Component {
<
TopMsg
alarmStart
=
{
alarmStart
}
/
>
<
TopMsg
alarmStart
=
{
alarmStart
}
/
>
{
!
isShowActionBar
&&
<
ModelHeader
headerName
=
{
headerName
}
handleExceptModel
=
{
this
.
handleExceptModel
}
/>
}
{
!
isShowActionBar
&&
<
ModelHeader
headerName
=
{
headerName
}
handleExceptModel
=
{
this
.
handleExceptModel
}
/>
}
{
isShowActionBar
&&
<
ActionBar
activeAction
=
{
activeAction
}
onActionItemClick
=
{(
e
)
=>
this
.
actionBarClick
(
e
)}
animationProps
=
{
controlAnimation
}
/>
}
{
isShowActionBar
&&
<
ActionBar
activeAction
=
{
activeAction
}
onActionItemClick
=
{(
e
)
=>
this
.
actionBarClick
(
e
)}
animationProps
=
{
controlAnimation
}
/>
}
{
/*{alarmStarted && <LayerPool animationProps={layerPoolAnimation} planStart={planStart} planQuit={planQuit} planStarted={planStarted} />}*/
}
{
alarmStarted
&&
<
LayerPool
animationProps
=
{
layerPoolAnimation
}
planStart
=
{
planStart
}
planQuit
=
{
planQuit
}
planStarted
=
{
planStarted
}
/>
}
<
/div
>
<
/div
>
);
);
}
}
...
...
mods/components/3dviewConvertor/view/View3D.js
View file @
9d998c56
...
@@ -787,7 +787,6 @@ class View3D extends Component {
...
@@ -787,7 +787,6 @@ class View3D extends Component {
renderAreas
=
()
=>
{
renderAreas
=
()
=>
{
this
.
areas
=
[];
this
.
areas
=
[];
this
.
getAreas
(
this
.
state
.
treeData
);
this
.
getAreas
(
this
.
state
.
treeData
);
console
.
log
(
this
.
areas
)
return
this
.
areas
;
return
this
.
areas
;
}
}
onRegionCreated
=
(
polygonRegion
,
item
)
=>
{
onRegionCreated
=
(
polygonRegion
,
item
)
=>
{
...
...
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