冲突

amos.config.js

@@ -47,7 +47,7 @@
           delayTime: 10 // 屏保出现时间(单位：秒) 10s
         },
         //三维模型配置 yinan 沂南站 shm 上海庙站  sn 苏南 hainan 海南站
-        view3dFile:'/mods/components/3dviewConvertor/threeres/models/shm/index_dev.json',
+        view3dFile:'/mods/components/3dviewConvertor/threeres/models/yinan-new/index_dev.json',
       }
     }
   };

mods/components/3dviewConvertor/consts/imgStatic.js

@@ -100,6 +100,15 @@ export default {
 
     fire: require('../assets/convertor/3dview/markers/fire.png'),
     fireDetection: require('../assets/convertor/3dview/markers/fireDetector.png'),
+
+
+//重点设备模式
+impEquipmentMode_monitorEquipment: require('../assets/convertor/3dview/markers/IeqMode-monitorEquipment.png'),
+impEquipmentMode_impEquipment: require('../assets/convertor/3dview/markers/IeqMode-impEquipment.png'),
+impEquipmentMode_hydrant: require('../assets/convertor/3dview/markers/IeqMode-hydrant.png'),
+impEquipmentMode_pool: require('../assets/convertor/3dview/markers/IeqMode-pool.png'),//
+impEquipmentMode_fireChamber: require('../assets/convertor/3dview/markers/IeqMode-fireChamber.png'),//
+impEquipmentMode_fireCar: require('../assets/convertor/3dview/markers/IeqMode-fireCar.png'),
   },
   color: {
     hydrant: {color: '#f12525'},
@@ -187,18 +196,13 @@ export default {
   },
 };
 
-export const markerTitleBgMapper = {
-  impEquipmentMode: require('../assets/convertor/3dview/prePlan/shapan-qipao2.svg'),
-  quanjing: require('../assets/convertor/3dview/prePlan/shapan-qipao2.png')
-}
-
 export const marker3DIoncMapper = {
   riskSource_0: require('../assets/convertor/3dview/markers/risk-0.png'),
-  riskSource_1: require('../assets/convertor/3dview/markers/risk-1.png'),
-  riskSource_2: require('../assets/convertor/3dview/markers/risk-2.png'),
-  riskSource_3: require('../assets/convertor/3dview/markers/risk-3.png'),
-  riskSource_4: require('../assets/convertor/3dview/markers/risk-4.png'),
-  riskSource_5: require('../assets/convertor/3dview/markers/risk-5.png'),
+    riskSource_1: require('../assets/convertor/3dview/markers/risk-1.png'),
+    riskSource_2: require('../assets/convertor/3dview/markers/risk-2.png'),
+    riskSource_3: require('../assets/convertor/3dview/markers/risk-3.png'),
+    riskSource_4: require('../assets/convertor/3dview/markers/risk-4.png'),
+    riskSource_5: require('../assets/convertor/3dview/markers/risk-5.png'),
   risk_0: '/mods/components/3dviewConvertor/threeres/markers/risk-0.png',
   risk_1: '/mods/components/3dviewConvertor/threeres/markers/risk-1.png',
   risk_2: '/mods/components/3dviewConvertor/threeres/markers/risk-2.png',
@@ -206,10 +210,11 @@ export const marker3DIoncMapper = {
   risk_4: '/mods/components/3dviewConvertor/threeres/markers/risk-4.png',
   risk_5: '/mods/components/3dviewConvertor/threeres/markers/risk-5.png',
 
-  patrol_0: require('../assets/convertor/3dview/markers/pa-0.png'),
-  patrol_1: require('../assets/convertor/3dview/markers/pa-1.png'),
-  patrol_2: require('../assets/convertor/3dview/markers/pa-2.png'),
-  patrol_3: require('../assets/convertor/3dview/markers/pa-3.png'),
+  patrol_1: '/mods/components/3dviewConvertor/threeres/markers/patrol-1.png',
+  patrol_2: '/mods/components/3dviewConvertor/threeres/markers/patrol-2.png',
+  patrol_3: '/mods/components/3dviewConvertor/threeres/markers/patrol-3.png',
+  patrol_4: '/mods/components/3dviewConvertor/threeres/markers/patrol-4.png',
+  patrol_5: '/mods/components/3dviewConvertor/threeres/markers/patrol-5.png',
 
   person_0: '/mods/components/3dviewConvertor/threeres/markers/person-0.png',
 
@@ -227,15 +232,6 @@ export const marker3DIoncMapper = {
   impEquipmentMode_fireChamber: require('../assets/convertor/3dview/markers/IeqMode-fireChamber.png'),//
   impEquipmentMode_fireCar: require('../assets/convertor/3dview/markers/IeqMode-fireCar.png'),
 
-  hydrant: require('../assets/convertor/3dview/markers/hydrant.png'),
-  pool: require('../assets/convertor/3dview/markers/pool.png'),
-  fireCar: require('../assets/convertor/3dview/markers/fireCar.png'),
-  fireEquipment: require('../assets/convertor/3dview/markers/fireEquip.png'),
-  fireFoamRoom: require('../assets/convertor/3dview/markers/fireFoam.png'),
-  fireChamber: require('../assets/convertor/3dview/markers/fireChamber.png'),
-  impEquipment: require('../assets/convertor/3dview/markers/impEquip.png'),
-  monitorEquipment: require('../assets/convertor/3dview/markers/monitorEquip.png'),
-  video: require('../assets/convertor/3dview/markers/video.png'),
 
 };
 

mods/components/3dviewConvertor/threeres/models/yinan-new/index_dev.json

 {
   "sceneName": "station-yinan",
-  "basePath": "/threeres/models/yinan/",
+  "basePath": "/mods/components/3dviewConvertor/threeres/models/yinan-new/",
   "models": [
     { "objName": "ground.obj", "mtlName": "ground.mtl", "modelLevel": "Park" },
-    { "objName": "helper-text.obj", "mtlName": "helper-text.mtl", "modelLevel": "Stuff" }
+    { "objName": "helper-text.obj", "mtlName": "helper-text.mtl", "modelLevel": "Stuff" },
+    { "objName": "maps.obj", "mtlName": "maps.mtl", "modelLevel": "Building" }
   ],
   "version": "1.0.0"
 }

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

@@ -97,7 +97,9 @@ class PointsPool extends Component {
   updateMarkers = (data) => {
     this.props.updateMarker(data);
   }
-
+  addMarker=(data)=>{
+    this.props.addMarker(data)
+  }
   render() {
     const { markers, ...rest } = this.props;
     let hideDetector = false;
@@ -106,11 +108,14 @@ class PointsPool extends Component {
     }
     return (
       <Shuttle>
-        <RiskPoint
+       <RiskPoint
           {...rest}
           markers={markers.riskSource}
           onCreated={(val) => this.onMarkersCreated('riskSource', val)}
           isEditMode={this.props.isEditMode}
+          addMarker={this.addMarker}
+          stagePilot={this.props.stagePilot}
+          positionCtl={this.props.positionCtl}
         />
         {/* <PatrolPoint
           {...rest}

mods/components/3dviewConvertor/view/moduleEditComponent/PointLeftTree.js

@@ -197,7 +197,7 @@ class PointLeftTree extends Component {
               <Select  onChange={this.onSelectChange} defaultValue={pointType} className='leftSelect'>
                 {
                   pointTypeArr.map(item => {
-                    return (<Option value={item.code}>{item.name}</Option>)
+                    return (<Option value={item.code} >{item.name}</Option>)
                   })
                 }
               </Select>

mods/components/3dviewConvertor/view/moduleEditComponent/RightEditPointPanel.js

@@ -93,8 +93,8 @@ class RightEditPointPanel extends Component {
   }
 
   render() {
-    let { rules, form,pointTypeArr,pointType ,detailData} = this.state;
-    let { pageType } = this.props;
+    let { rules, form,pointTypeArr,pointType ,detailData,} = this.state;
+    let { pageType,positionxyz } = this.props;
     let radio = detailData.isIndoor ? "prop1":"prop2"
     let position = (detailData.position3d) && detailData.position3d.split(",")
     const formItemLayout = {
@@ -164,17 +164,17 @@ class RightEditPointPanel extends Component {
                     <div className='position'>
                       <div className='positionItem'>
                       <FormItem label="X"  field="positionX" {...formItemLayout}>
-                      <Input value={position && position[0]}  />
+                      <Input value={positionxyz && positionxyz[0]}  />
                       </FormItem>
                       </div>
                       <div className='positionItem'>
                         <FormItem label="Y"  field="positionY" {...formItemLayout}>
-                        <Input value={position && position[1]}  />
+                        <Input value={positionxyz && positionxyz[1]}  />
                         </FormItem>
                       </div>
                       <div className='positionItem'>
                         <FormItem label="Z"  field="positionZ" {...formItemLayout}>
-                        <Input value={position && position[2]}  />
+                        <Input value={positionxyz && positionxyz[2]}  />
                         </FormItem>
                       </div>
                     </div>

mods/components/3dviewConvertor/view/moduleEditComponent/RightEditRegionPanel.js

@@ -76,7 +76,6 @@ class RightEditRegionPanel extends Component {
   handleSubmit = (e) => {
     // e.preventDefault();
     this.form.validate((valid, dataValues, errors) => {
-   alert(JSON.stringify(dataValues))
       console.log('返回内容:', dataValues, valid, errors);
       if (valid) {
         //AmosAlert.success('结果', JSON.stringify(dataValues));

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

@@ -70,18 +70,22 @@ export default function marker3DFactory(WrappedComponent = 'div', options){
           if(marker.object2DPipe){
             marker.object2DPipe.pipeNode.visible = true;
             marker.object2DPipe.pipeNode.elementVisible = true;
+            marker.object2DPipe.toggleDisplay(true);
           }
           if(marker.extData.type === 'riskSource'){
             marker.node.baseObjHelper.title = marker.extData.name;
+            marker.object2DPipe && marker.object2DPipe.toggleDisplay(true);
           }
         },
         mouseout: (marker) => {
           if(marker.object2DPipe){
             marker.object2DPipe.pipeNode.visible = false;
             marker.object2DPipe.pipeNode.elementVisible = false;
+            marker.object2DPipe.toggleDisplay(false);
           }
           if(marker.extData.type === 'riskSource'){
             marker.node.baseObjHelper.title = marker.extData.title;
+            marker.object2DPipe.toggleDisplay(false);
           }
         }
       };
@@ -97,7 +101,13 @@ export default function marker3DFactory(WrappedComponent = 'div', options){
     componentWillReceiveProps = nextProps => {
       this.setState({ planStarted: nextProps.planStarted });
     }
-
+    onEditorChangeDone = (evt) => {
+      if (evt && evt.target && evt.target.object){
+        const marker = evt.target.object;
+        //alert(marker.position.toArray());//(marker.extData
+       this.props.addMarker(marker)
+      }
+    }
     componentWillUnmount() {
       this.objAnchorHelper && this.objAnchorHelper.destroy();
     }
@@ -122,7 +132,7 @@ export default function marker3DFactory(WrappedComponent = 'div', options){
         return false
       }
       tirggerPlanTopic(CONSTS.plan_detail, { type: marker.extData.type, data: marker.extData });
-      
+
       if (isClick) {
         this.setState({ isClick: false }); //将isClick 变成false，将不会执行处理事件
         // this.pdRef && this.pdRef.onOpenClick(marker);
@@ -139,6 +149,13 @@ export default function marker3DFactory(WrappedComponent = 'div', options){
 
     markerCreated = ({ markersCache }) => {
       this.markersCache = markersCache;
+      this.props.positionCtl && this.props.positionCtl.addListener('changeDone', this.onEditorChangeDone);
+      // 拖拽过程即刻改变line
+      this.props.positionCtl &&this.props.positionCtl.addListener('objectChange', this.onEditorChange);
+      // 绑定 positionCtl
+      this.props.positionCtl && this.markersCache.eachValue(item => {
+        this.props.positionCtl.addObjects(item.node);
+      });
       this.stagePilot = this.props.stagePilot;
       this.outlineHelper = this.stagePilot ? this.stagePilot.outlineHelper : undefined;
       markersCache.eachValue(obj=>{
@@ -185,7 +202,7 @@ export default function marker3DFactory(WrappedComponent = 'div', options){
         imgHeight: 128,
         // image: markerTitleBgMapper['quanjing']
       };
-      if(type === 'riskSource'){ 
+      if(type === 'riskSource'){
         cardTitle = '风险值' + title
       }else{
         cardTitle = title ? title : name;

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

@@ -95,9 +95,9 @@ export default function markerFactory(WrappedComponent = 'div', options){
         return <MarkerIcon {...extData} markerType={markerType} />;
       }
     }
-    markerCreated = ({ markersCache }) => {
-      this.markersCache = markersCache;
-    };
+ markerCreated = ({ markersCache }) => {
+    this.markersCache = markersCache;
+  };
     render() {
       const { markers } = this.props;
       const { planStarted } = this.state;