修改

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

@@ -98,7 +98,8 @@ class MaskContent extends Component {
         { sideControlShow && <SideControl multiple={multiple} onItemClick={onItemClick} layerConfig={layerConfig} animationProps={controlAnimation} />}
         { sideControlShow && <DataPane animationProps={datapaneAnim} />}
         <TopMsg alarmStart={alarmStart} />
-        <ActionBar onActionItemClick={(e) => this.actionBarClick(e)} animationProps={controlAnimation}/>
+        {this.props.isEditMode?'':<ActionBar onActionItemClick={(e) => this.actionBarClick(e)} animationProps={controlAnimation}/>}
+        
         {/* <RulesLayer />
         {alarmStarted && <LayerPool animationProps={layerPoolAnimation} planStart={planStart} planQuit={planQuit} planStarted={planStarted} />} 
         <Explain visible={showExplain} onExplainClose={onExplainClose} />*/}

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

@@ -109,6 +109,7 @@ class PointsPool extends Component {
           {...rest}
           markers={markers.riskSource}
           onCreated={(val) => this.onMarkersCreated('riskSource', val)}
+          isEditMode={this.props.isEditMode}
         />
         {/* <PatrolPoint
           {...rest}
@@ -119,47 +120,56 @@ class PointsPool extends Component {
           {...rest}
           markers={markers.patrol}
           onCreated={(val) => this.onMarkersCreated('patrol', val)}
+          isEditMode={this.props.isEditMode}
         />
         <PersonPoint3D
           {...rest}
           markers={markers.person}
           onCreated={(val) => this.onMarkersCreated('person', val)}
+          isEditMode={this.props.isEditMode}
         />
         <EquipmentPoint
           {...rest}
           markers={markers.impEquipment}
           onCreated={(val) => this.onMarkersCreated('impEquipment', val)}
+          isEditMode={this.props.isEditMode}
         />
         <FireResourcePoint
           {...rest}
           markers={markers.pool}
           onCreated={(val) => this.onMarkersCreated('pool', val)}
+          isEditMode={this.props.isEditMode}
         />
         <FireResourcePoint
           {...rest}
           markers={markers.hydrant}
           onCreated={(val) => this.onMarkersCreated('hydrant', val)}
+          isEditMode={this.props.isEditMode}
         />
         <FireResourcePoint
           {...rest}
           markers={markers.fireEquipment}
           onCreated={(val) => this.onMarkersCreated('fireEquipment', val)}
+          isEditMode={this.props.isEditMode}
         />
         <FireResourcePoint
           {...rest}
           markers={markers.fireChamber}
           onCreated={(val) => this.onMarkersCreated('fireChamber', val)}
+          isEditMode={this.props.isEditMode}
         />
         <FireResourcePoint
           {...rest}
           markers={markers.fireFoamRoom}
           onCreated={(val) => this.onMarkersCreated('fireFoamRoom', val)}
+          isEditMode={this.props.isEditMode}
         />
         {!hideDetector ?
           <FireResourcePoint
             {...rest}
             markers={markers.fireDetection}
             onCreated={(val) => this.onMarkersCreated('fireDetection', val)}
+            isEditMode={this.props.isEditMode}
           />
           : ''
         }
@@ -167,16 +177,19 @@ class PointsPool extends Component {
           {...rest}
           markers={markers.monitorEquipment}
           onCreated={(val) => this.onMarkersCreated('monitorEquipment', val)}
+          isEditMode={this.props.isEditMode}
         />
         <MonitorPoint
           {...rest}
           markers={markers.video}
           onCreated={(val) => this.onMarkersCreated('video', val)}
+          isEditMode={this.props.isEditMode}
         />
         <FirePoint
           {...rest}
           markers={markers.fire}
           onCreated={(val) => this.onMarkersCreated('fire', val)}
+          isEditMode={this.props.isEditMode}
         />
         {/*<FireResourcePoint
           {...rest}
@@ -187,16 +200,19 @@ class PointsPool extends Component {
           {...rest}
           markers={markers.fireCar}
           onCreated={(val) => this.onMarkersCreated('fireCar', val)}
+          isEditMode={this.props.isEditMode}
         />
         <PointStatistics
           {...rest}
           markers={markers.statistics}
           onCreated={(val) => this.onMarkersCreated('statistics', val)}
+          isEditMode={this.props.isEditMode}
         />
         <ImpEquipmentMode
           {...rest}
           markers={markers.impEquipmentMode}
           onCreated={(val) => this.onMarkersCreated('impEquipmentMode', val)}
+          isEditMode={this.props.isEditMode}
         />
       </Shuttle>
     );

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

@@ -999,6 +999,12 @@ class View3D extends Component {
       })
     }
   }
+  quitEditMode = () => {
+    this.setState({
+      editFlag: false
+    })
+    this.props.editModelChange(false)
+  }
 
   editButtonClick = () => {
     let { editFlag } = this.state;
@@ -1311,6 +1317,7 @@ class View3D extends Component {
                 planStart={this.planStart}
                 planQuit={this.planQuit}
                 onActionItemClick={this.onActionItemClick}
+                isEditMode={editFlag}
               />
             }
             modelContentProps={modelContentProps}
@@ -1322,7 +1329,7 @@ class View3D extends Component {
             positionCtlProps={positionCtlProps}
           >
             {startAsyncLoad && <WorkerObjContent objs={asyncModels} onWorkerMessage={this.onWorkerLoading} enableLoading afterInit={this.onAfterWorkerInit} />}
-            {editFlag&&pageType == 'region'?'':<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} isEditMode={editFlag}/>}
             {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()}
@@ -1365,7 +1372,7 @@ class View3D extends Component {
               <span className='editTitle'>
                 <span className='titleText'>编辑模式</span>
               </span>
-              <span className='quipBtn'></span>
+              <span className='quipBtn' onClick={this.quitEditMode}></span>
             </div>
             <div className='bottomBox'>
               <span className={`editAreaBtn ${pageType == 'region'?'selected':'noSelect'}`} onClick={this.changeAreaPoint.bind(this,'region')}></span>

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

@@ -38,7 +38,7 @@ export default function markerFactory(WrappedComponent = 'div', options){
     }
 
     componentDidMount() {
-
+      console.log(this.props)
     }
 
     componentWillReceiveProps = nextProps => {
@@ -46,6 +46,9 @@ export default function markerFactory(WrappedComponent = 'div', options){
     }
 
     onMarkerClick = (marker, e) => {
+      if (this.props.isEditMode) {
+        return false
+      }
       clearTimeout(this.time);
       tirggerPlanTopic(CONSTS.plan_detail, { type: marker.extData.type, data: marker.extData });
       if (marker.extData.markerType === 'fire' && void 0 !== marker.extData.show) {
@@ -56,6 +59,9 @@ export default function markerFactory(WrappedComponent = 'div', options){
     }
 
     onMarkerDblClick = (marker, e) => {
+      if (this.props.isEditMode) {
+        return false
+      }
       clearTimeout(this.time);
       tirggerPlanTopic(CONSTS.plan_detail, { type: marker.extData.type, data: marker.extData });
       if (marker.extData.markerType === 'fire' && void 0 !== marker.extData.show) {