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
cda846bd
Commit
cda846bd
authored
Jun 01, 2020
by
单奇雲
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
闪烁
parent
f639f934
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
6 deletions
+22
-6
PointsPool.js
mods/components/3dviewConvertor/view/PointsPool.js
+1
-0
View3D.js
mods/components/3dviewConvertor/view/View3D.js
+1
-0
marker3DFactory.js
...components/3dviewConvertor/view/points/marker3DFactory.js
+20
-6
No files found.
mods/components/3dviewConvertor/view/PointsPool.js
View file @
cda846bd
...
...
@@ -60,6 +60,7 @@ class PointsPool extends Component {
onMarkersCreated
=
(
type
,
{
markersCache
})
=>
{
this
.
markerList
[
type
]
=
markersCache
;
let
stagePilot
=
this
.
props
.
stagePilot
;
debugger
;
// if(markersCache&&stagePilot) {
// // console.log(this.markerList)
// console.log(markersCache)
...
...
mods/components/3dviewConvertor/view/View3D.js
View file @
cda846bd
...
...
@@ -1362,6 +1362,7 @@ class View3D extends Component {
...
desigerConf
,
enableAnimator
:
true
,
enableOutline
:
true
,
enableObjOutline
:
true
,
enableCSS2D
:
true
,
onCreated
:
this
.
onGraphCreated
,
afterRender
:
this
.
afterRender
...
...
mods/components/3dviewConvertor/view/points/marker3DFactory.js
View file @
cda846bd
...
...
@@ -76,7 +76,6 @@ export default function marker3DFactory(WrappedComponent = 'div', options){
}
},
mouseout
:
(
marker
)
=>
{
console
.
log
(
'2222'
)
if
(
marker
.
object2DPipe
){
marker
.
object2DPipe
.
pipeNode
.
visible
=
false
;
marker
.
object2DPipe
.
pipeNode
.
elementVisible
=
false
;
...
...
@@ -140,11 +139,26 @@ export default function marker3DFactory(WrappedComponent = 'div', options){
markerCreated
=
({
markersCache
})
=>
{
this
.
markersCache
=
markersCache
;
markersCache
.
eachValue
(
item
=>
{
const
obj
=
item
.
node
;
const
boh
=
new
BaseObjHelper
({
obj
});
obj
.
baseObjHelper
=
boh
;
this
.
setTopCardConf
(
obj
,
item
.
extData
);
this
.
stagePilot
=
this
.
props
.
stagePilot
;
this
.
outlineHelper
=
this
.
stagePilot
?
this
.
stagePilot
.
outlineHelper
:
undefined
;
markersCache
.
eachValue
(
obj
=>
{
this
.
setTopCardConf
(
obj
,
obj
.
extData
);
if
(
obj
.
extData
.
type
===
"riskSource"
){
this
.
setTwinkleConf
(
obj
);
}
});
}
setTwinkleConf
=
(
obj
)
=>
{
const
{
twinkle
,
frequency
}
=
obj
.
extData
;
let
pulsePeriod
=
(
twinkle
&&
frequency
!=
0
?
1
/
frequency
:
null
)
let
color
=
twinkle
&&
frequency
!=
0
?
'#FF0000'
:
null
;
if
(
!
obj
.
baseObjHelper
.
outlineHelper
){
obj
.
baseObjHelper
.
setOutlineHelper
(
this
.
outlineHelper
);
}
obj
.
baseObjHelper
.
style
.
outlineColor
=
color
;
pulsePeriod
&&
obj
.
baseObjHelper
.
outlineHelper
.
setConfig
({
pulsePeriod
:
pulsePeriod
.
toFixed
(
2
)
});
}
...
...
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