Commit 5d420329 authored by tangwei's avatar tangwei

修改弹出

parent ebd7ad1c
...@@ -1522,14 +1522,16 @@ class View3D extends Component { ...@@ -1522,14 +1522,16 @@ class View3D extends Component {
alarmPoint.position = pointPosition; alarmPoint.position = pointPosition;
alarmPoint.title = item.pointName; alarmPoint.title = item.pointName;
alarmPoint.sourceId = item.sourceId; alarmPoint.sourceId = item.sourceId;
if(pointAttrs.levelStr==='impEqu_04'){
alarmPoint.levelStr='impEqu_04';
}
alarmPoint.twinkle = true; alarmPoint.twinkle = true;
alarmPoint.type = pointType === 3 ? 'patrol' : ((pointType === 2)||(pointType === 6)) ? 'dynamicRingData' : 'impEquipment'; alarmPoint.type = pointType === 3 ? 'patrol' : ((pointType === 2)||(pointType === 6)) ? 'dynamicRingData' : 'impEquipment';
let points = []; let points = [];
points.push(alarmPoint); points.push(alarmPoint);
debugger
markers[alarmPoint.type] = points; markers[alarmPoint.type] = points;
if(pointAttrs.levelStr==='impEqu_04'){
markers["name"]='impEqu_04';
}
//console.log(markers); //console.log(markers);
......
...@@ -55,7 +55,7 @@ export default function markerFactory(WrappedComponent = 'div', options){ ...@@ -55,7 +55,7 @@ export default function markerFactory(WrappedComponent = 'div', options){
*/ */
onMarkerDblClick = (marker, e) => { onMarkerDblClick = (marker, e) => {
debugger debugger
if(marker.name==='impEqu_04' ||marker.extData.levelStr==='impEqu_04'){ if(marker.extData.levelStr==='impEqu_04'){
return ; return ;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment