Merge branch 'developer' of http://172.16.10.76/station/amos-station-module-view into developer

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

@@ -143,7 +143,8 @@ class View3D extends Component {
         type: 'region',
         btnType: 'isOk',
         isback: false
-      }
+      },
+      isOutterView: true //控制进入层级后是否显示marker
     };
 
     getObjFromNet(view3dFile, (objs, asyncModels) => {
@@ -275,6 +276,7 @@ class View3D extends Component {
         this.initModelDisplay();
         this.outlineFactory.toggleOutline([]);//清除选中
         this.lensLevel = LENS_LEVEL.ROOT;
+        this.setState({ isOutterView: true });//恢复marker显示
       }
     });
   };
@@ -1699,7 +1701,8 @@ class View3D extends Component {
       errorAreaId,
       rightHeight,
       treeDataList,
-      promptData
+      promptData,
+      isOutterView
     } = this.state;
     const { dimension, hiddenScreenSaver, editModelChange } = this.props;
     const graphicProps = {
@@ -1793,12 +1796,12 @@ class View3D extends Component {
           >
             {startAsyncLoad && this.multLoadWorkerObjContent(asyncModels)}
             {isEditMode && pageType === 'region' ? '' :
-            <PointsPool markers={markers} isEditMode={isEditMode} selectPoints={selectPoints} updateMarker={this.updateMarker} planStarted={alarmStarted} stagePilot={this.stagePilot}  positionCtl={this.positionCtl} addMarker={this.addMarker} ref={node => this.pointsPool = node} />}
+            isOutterView && <PointsPool markers={markers} isEditMode={isEditMode} selectPoints={selectPoints} updateMarker={this.updateMarker} planStarted={alarmStarted} stagePilot={this.stagePilot}  positionCtl={this.positionCtl} addMarker={this.addMarker} ref={node => this.pointsPool = node} />}
             {fireTruckRoute && <FatLine {...lineData.fatLineConf} linePath={JSON.parse(fireTruckRoute)} visible={showFireTruckRoute} />}
             <FlameFire position={firePosition} width={10} height={20} depth={8} sliceSpacing={1} visible={planStarted} />
             {isEditMode && this.renderAreas()}
             {this.renderPolygonRegion(exceptionAreas)}
-            {startLoadExceptionArea && <ExceptionArea markers={exceptionMarkers} handleExceptModel={this.handleExceptModel} focusObject={this.focusObject} />}
+            {isOutterView && startLoadExceptionArea && <ExceptionArea markers={exceptionMarkers} handleExceptModel={this.handleExceptModel} focusObject={this.focusObject} />}
           </A3DDesigner>
         </div>
         { isEditMode &&

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

@@ -392,6 +392,7 @@ export const flyToSubView = (instance,obj,LENS_LEVEL) =>{
     // 镜头切换
     fitView && instance.cameraFactory.fitView(fitView);//视角调整为最近视角
     instance.lensLevel = LENS_LEVEL.SUB;
+    instance.setState({ isOutterView: false });
   } else {
     instance.focusObject(obj);
   }