xiugai

mods/components/3dviewConvertor/view/PointsPool.js

@@ -59,6 +59,15 @@ class PointsPool extends Component {
 
   onMarkersCreated = (type, { markersCache }) => {
     this.markerList[type] = markersCache;
+    let stagePilot = this.props.stagePilot;
+    // if(markersCache&&stagePilot) {
+    //   // console.log(this.markerList)
+    //   console.log(markersCache)
+    //   // console.log(this.props)
+    //   markersCache.eachValue(item => {
+    //     item.node._userData = { ...item.extData };
+    //     stagePilot.positionCtl.objects.push(item.node); })
+    // }
     (markersCache || []).forEach(mc => {
       const extData = mc.getExtData();
       if (extData.hasOwnProperty('visible')){

mods/components/3dviewConvertor/view/View3D.js

@@ -1280,7 +1280,7 @@ class View3D extends Component {
             disabledEdit
             defaultLoading={false}
             ref={node => (this.a3dRef = node)}
-            baseObjs={objs}
+            baseObjs={{}}
             maskContent={
               <MaskContent
                 planStarted={planStarted}
@@ -1305,7 +1305,7 @@ class View3D extends Component {
             positionCtlProps={positionCtlProps}
           >
             {startAsyncLoad && <WorkerObjContent objs={asyncModels} onWorkerMessage={this.onWorkerLoading} enableLoading afterInit={this.onAfterWorkerInit} />}
-            <PointsPool markers={markers} updateMarker={this.updateMarker} planStarted={alarmStarted} stagePilot={this.stagePilot} />
+            {editFlag&&pageType == 'region'?'':<PointsPool markers={markers} updateMarker={this.updateMarker} planStarted={alarmStarted} stagePilot={this.stagePilot} />}
             {fireTruckRoute && <FatLine {...lineData.fatLineConf} linePath={JSON.parse(fireTruckRoute)} visible={showFireTruckRoute} />}
             <FlameFire position={firePosition} width={10} height={20} depth={8} sliceSpacing={1} visible={planStarted} />
             {this.renderAreas()}

mods/components/3dviewConvertor/view/points/markerFactory.js

@@ -7,6 +7,7 @@ import MarkerIcon from './MarkerIcon';
 import { tirggerTransTopic, tirggerPlanTopic } from './../dataProcessor';
 import FireMarkerIcon from './markers/FireMarkerIcon';
 import StatisticsMarkerIcon from './markers/StatisticsMarkerIcon'
+import { utils, deepCopy } from 'amos-tool';
 
 export default function markerFactory(WrappedComponent = 'div', options){
   const { markerType } = options;
@@ -79,12 +80,14 @@ export default function markerFactory(WrappedComponent = 'div', options){
     }
 
     render() {
+      const { markers } = this.props;
       const { planStarted } = this.state;
       let dialogStyle = { zIndex: 1000 };
       return (
         <WrappedComponent>
           <Markers
             {...this.props}
+            markers={deepCopy(markers)}
             events={this.markerEvents}
             render={this.renderMarker}
           />