xiugai

src/view/3dview/ModuleEdit.js

@@ -84,7 +84,8 @@ class ModuleEdit extends Component {
         fireEquipment: []
       },
       editFlag: false,//编辑模式
-      showRightPanel: false //是否显示右侧详情
+      showRightPanel: false, //是否显示右侧详情
+      simpleTipVisible: false  //简单提示
     };
     this.nativeProps = {
       onMouseDown: this.onMouseDown,
@@ -194,11 +195,12 @@ class ModuleEdit extends Component {
     this.setState({ totalDelta });
   }
 
-  onGraphCreated = ({ cameraFactory, sceneFactory, outlineFactory, r3d }) => {
+  onGraphCreated = ({ cameraFactory, sceneFactory, outlineFactory, r3d, stagePilot  }) => {
     this.cameraFactory = cameraFactory;
     this.sceneFactory = sceneFactory;
     this.outlineFactory = outlineFactory;
     this.r3d = r3d;
+    this.stagePilot = stagePilot;
 
     // 重新设置 outline 风格
     this.outlineFactory.outlineConfig = {
@@ -212,6 +214,7 @@ class ModuleEdit extends Component {
       sceneFactory,
       cameraEffect: desigerHelperConfig.cameraEffect
     });
+
   };
 
   onAllDone = objGroup => {
@@ -504,10 +507,10 @@ class ModuleEdit extends Component {
       treeData.map((item) => {
         if (item.isRegion && item.isBind) {
           if (item.children&&item.children.length > 0) {
-            this.areas.push(<PolygonRegion  points={JSON.parse(item.routePath)} />) 
+            this.areas.push(<PolygonRegion  points={JSON.parse(item.routePath)} onCreated={this.onRegionCreated}/>) 
             {this.getAreas(item.children)}
           }
-          this.areas.push(<PolygonRegion  points={JSON.parse(item.routePath)} />) 
+          this.areas.push(<PolygonRegion  points={JSON.parse(item.routePath)}  onCreated={this.onRegionCreated}/>) 
         } else {
           if (item.children&&item.children.length > 0) {
             {this.getAreas(item.children)}
@@ -522,6 +525,13 @@ class ModuleEdit extends Component {
     // console.log(this.areas)
     return this.areas;
   }
+  onRegionCreated = (polygonRegion, item) => {
+    console.log(polygonRegion)
+    console.log(item)
+    // console.log(polygonRegion.pointInPolygon)
+    this.polygonRegion = polygonRegion;
+    // console.log(e)
+  }
   //保存区域绑定
   saveAreaData = () => {
     let { treeData, routePathData, pageType } = this.state;
@@ -624,7 +634,17 @@ class ModuleEdit extends Component {
   drop = (event) => {
     event.preventDefault();
     let { dragItem,markers }=this.state;
-    console.log(event.clientX)
+    console.log(dragItem)
+    if(dragItem) {
+      if (dragItem.isBind) {
+        this.tipMsg = '只能放置未绑定的标记点'
+        this.setState({
+          simpleTipVisible: true
+        })
+        return false;
+      }
+
+    }
     const objs = this.a3dRef.pickerCoordinate(event.clientX, event.clientY, null, true);
     let position;
     if (objs.length > 0){
@@ -632,11 +652,12 @@ class ModuleEdit extends Component {
       position = objs[0].point;
     }
     // [0,0,0]
-    // const isInside = me.polygonRegion.pointInPolygon(p)
+    const isInside = this.polygonRegion.pointInPolygon([position.x,position.y,position.z])
     console.log(this.polygonRegion)
     console.log(objs)
     console.log(position)
     console.log(position.x)
+    console.log(isInside)
     if (dragItem) {
       let uid = UUID.uuidFast()
       let addPointParam = {
@@ -680,11 +701,18 @@ class ModuleEdit extends Component {
     this.getPointList();
     }
   }
+  simpleTipOk = () => {
+    this.setState({
+      simpleTipVisible: false
+    })
+  }
+  
 
   render() {
     const { fireEquipmentPosition, drawing, objs, markers, pageType, pointType, pointTypeArr, editFlag, showRightPanel, selectPoints, selectArea } = this.state;
     console.log(this.state)
     console.log(this.props)
+    console.log(this)
     const { dimension } = this.props;
     const graphicProps = {
       ...dimension,
@@ -695,11 +723,6 @@ class ModuleEdit extends Component {
       onCreated: this.onGraphCreated,
       afterRender: this.afterRender
     };
-    // const modelContentProps = {
-    //   onAllDone: this.onAllDone,
-    //   onComplete: this.onComplete
-    // };
-
     let firePosition = null;
     if (fireEquipmentPosition && fireEquipmentPosition.length > 0) {
       firePosition = {
@@ -736,10 +759,9 @@ class ModuleEdit extends Component {
             enablePen
             nativeProps={this.nativeProps}
             penProps={penProps}
-            
-            
+            enablePositionCtl
           >
-            <PointsPoolEditPage markers={markers} updateMarker={this.updateMarker}  />
+            <PointsPoolEditPage markers={markers} updateMarker={this.updateMarker} stagePilot={this.stagePilot}  />
             {this.renderAreas()}
           </A3DDesigner> 
         </div>
@@ -795,6 +817,15 @@ class ModuleEdit extends Component {
             </div>
           </div>
         }
+        <Modal
+          className='moduleEditMadel simpleTip'
+          header="基本模态框"
+          visible={this.state.simpleTipVisible}
+          noDefaultHeader
+          // onCancel={this.simpleTipCancel}
+          onOk = {this.simpleTipOk}
+          content={<div>内容区域...</div>}
+        />
       </div>
       
     );

src/view/3dview/PointsPoolEditPage.js

@@ -61,6 +61,14 @@ class PointsPoolEditPage 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 => stagePilot.positionCtl.objects.push(item.node) )
+    }
+    
     (markersCache || []).forEach(mc => {
       const extData = mc.getExtData();
       if (extData.hasOwnProperty('visible')){

src/view/3dview/moduleEditPoints/index.js

@@ -16,7 +16,7 @@ class BasicPoint extends Component {
 /**
  * 风险
  */
-export const RiskPoint = markerFactory(BasicPoint,
+export const RiskPoint = marker3DFactory(BasicPoint,
   {
     markerType: 'riskSource'
   }
@@ -25,7 +25,7 @@ export const RiskPoint = markerFactory(BasicPoint,
 /**
  * 巡检
  */
-export const PatrolPoint = markerFactory(BasicPoint,
+export const PatrolPoint = marker3DFactory(BasicPoint,
   {
     markerType: 'risk'
   }
@@ -34,7 +34,7 @@ export const PatrolPoint = markerFactory(BasicPoint,
 /**
  * 人员
  */
-export const PersonPoint = markerFactory(BasicPoint,
+export const PersonPoint = marker3DFactory(BasicPoint,
   {
     markerType: 'person'
   }
@@ -43,7 +43,7 @@ export const PersonPoint = markerFactory(BasicPoint,
 /**
  * 监控
  */
-export const MonitorPoint = markerFactory(BasicPoint,
+export const MonitorPoint = marker3DFactory(BasicPoint,
   {
     markerType: 'video'
   }
@@ -52,7 +52,7 @@ export const MonitorPoint = markerFactory(BasicPoint,
 /**
  * 探测点
  */
-export const ProbePoint = markerFactory(BasicPoint,
+export const ProbePoint = marker3DFactory(BasicPoint,
   {
     markerType: 'monitorEquipment'
   }
@@ -61,13 +61,13 @@ export const ProbePoint = markerFactory(BasicPoint,
 /**
  * 消防资源
  */
-export const FireResourcePoint = markerFactory(BasicPoint,
+export const FireResourcePoint = marker3DFactory(BasicPoint,
   {
     markerType: 'fireResource'
   }
 );
 
-export const EquipmentPoint = markerFactory(BasicPoint,
+export const EquipmentPoint = marker3DFactory(BasicPoint,
   {
     markerType: 'impEquipment'
   }
@@ -114,14 +114,14 @@ export const WorkerMen3D = marker3DFactory(BasicPoint,
 /**
  * 人员 3D
  */
-export const FirePoint = markerFactory(BasicPoint,
+export const FirePoint = marker3DFactory(BasicPoint,
   {
     markerType: 'fire'
   }
 );
 
 
-export const PointStatistics = markerFactory(BasicPoint,
+export const PointStatistics = marker3DFactory(BasicPoint,
   {
     markerType: 'statistics'
   }

src/view/3dview/moduleEditPoints/marker3DFactory.js

 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { utils } from 'amos-tool';
+import { utils, deepCopy } from 'amos-tool';
 import { Markers } from 'amos-3d/lib/designer';
 import { CONSTS } from 'CONSTS/storageConsts';
 import PointDialog from './PointDialog';
@@ -92,7 +92,7 @@ export default function marker3DFactory(WrappedComponent = 'div', options){
         <WrappedComponent>
           <Markers
             {...rest}
-            markers={result}
+            markers={deepCopy(result)}
             events={this.markerEvents}
           />
           { !planStarted && <PointDialog style={dialogStyle} ref={node => this.pdRef = node} />}