bug

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

@@ -67,7 +67,7 @@ export default {
     search: require('../assets/convertor/3dview/datapanel/search.png'),
     smilingFace: require('../assets/convertor/3dview/datapanel/smilingFace.png'),
     user: require('../assets/convertor/3dview/datapanel/user.png'),
-    searchPane: require('../assets/convertor/3dview/actionbars/chaxun.png'),
+    searchPane: require('../assets/convertor/3dview/actionbars/chaxun.png')
   },
   markers: {
     riskSource_0: require('../assets/convertor/3dview/markers/risk-0.png'),

mods/components/3dviewConvertor/styles/pointsDetails.scss

@@ -48,7 +48,7 @@
   .carousel-img {
     width: 100%;
     height: 100%;
-    padding: 5px
+    padding: 5px;
   }
 
   .carousel-indicators {
@@ -138,9 +138,7 @@
     float: left;
     width: 131px;//9.84%;
     height: 40px;
-    //background: $biz-table-title-color;//#333;
     background: rgba(25, 86, 147, 1);
-   // border-left: 1px solid $core-border-color;
     box-sizing: border-box;
     flex: 1;
   }

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

@@ -56,7 +56,7 @@ class MaskContent extends Component {
       this.setState({ activeAction: type });
     }
     this.props.onActionItemClick && this.props.onActionItemClick(type, label, showLabel);
-    if(type === "search"){
+    if (type === 'search'){
       this.changeSearchPaneVisible();
     }
   }
@@ -69,6 +69,7 @@ class MaskContent extends Component {
   handleExceptModel =(type)=>{
     this.initViewModel();
     this.props.handleExceptModel && this.props.handleExceptModel(type);
+    this.props.focusPosition(this.toCameraPosition(record.position));
   }
 
   initViewModel = ()=>{

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

@@ -93,7 +93,7 @@ class PointsPool extends Component {
     }
     return (
       <Shuttle>
-       <RiskPoint
+        <RiskPoint
           {...rest}
           markers={markers.riskSource}
           onCreated={(val) => this.onMarkersCreated('riskSource', val)}
@@ -136,12 +136,18 @@ class PointsPool extends Component {
           markers={markers.pool}
           onCreated={(val) => this.onMarkersCreated('pool', val)}
           isEditMode={this.props.isEditMode}
+          addMarker={this.addMarker}
+          stagePilot={this.props.stagePilot}
+          selectPoints={this.props.selectPoints}
         />
         <FireResourcePoint
           {...rest}
           markers={markers.hydrant}
           onCreated={(val) => this.onMarkersCreated('hydrant', val)}
           isEditMode={this.props.isEditMode}
+          addMarker={this.addMarker}
+          stagePilot={this.props.stagePilot}
+          selectPoints={this.props.selectPoints}
         />
         <FireResourcePoint
           {...rest}
@@ -157,12 +163,18 @@ class PointsPool extends Component {
           markers={markers.fireChamber}
           onCreated={(val) => this.onMarkersCreated('fireChamber', val)}
           isEditMode={this.props.isEditMode}
+          addMarker={this.addMarker}
+          stagePilot={this.props.stagePilot}
+          selectPoints={this.props.selectPoints}
         />
         <FireResourcePoint
           {...rest}
           markers={markers.fireFoamRoom}
           onCreated={(val) => this.onMarkersCreated('fireFoamRoom', val)}
           isEditMode={this.props.isEditMode}
+          addMarker={this.addMarker}
+          stagePilot={this.props.stagePilot}
+          selectPoints={this.props.selectPoints}
         />
         {!hideDetector ?
           <FireResourcePoint
@@ -204,6 +216,9 @@ class PointsPool extends Component {
           markers={markers.fireCar}
           onCreated={(val) => this.onMarkersCreated('fireCar', val)}
           isEditMode={this.props.isEditMode}
+          addMarker={this.addMarker}
+          stagePilot={this.props.stagePilot}
+          selectPoints={this.props.selectPoints}
         />
         <PointStatistics
           {...rest}

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

 import React, { Component } from 'react';
-import { Modal ,Button} from 'amos-framework';
+import { Modal } from 'amos-framework';
+
 class PromptModal extends Component {
   constructor(props) {
     super(props);
-    this.state = {
-
-    };
+    this.state = {};
   }
-  cancel = ()=>{
-    const {isback} =this.props.promptData
-    this.props.closePromptModal()
-    if(isback){
-      this.props.handleOutExceptModel()
+  cancel = () => {
+    const { isback } = this.props.promptData;
+    this.props.closePromptModal();
+    if (isback) {
+      this.props.handleOutExceptModel();
     }
-  }
-  saveData=()=>{
-    const {isback,type} =this.props.promptData
-    if(isback){
-      this.props.handleOutExceptModel()
+  };
+  saveData = () => {
+    const { isback, type } = this.props.promptData;
+    if (isback) {
+      this.props.handleOutExceptModel();
     }
-    this.props.closePromptModal()
-    if(type=='region')
-    {
-      this.props.saveAreaData()
-    }else{
-      this.props.savePointData()
+    this.props.closePromptModal();
+    if (type === 'region') {
+      this.props.saveAreaData();
+    } else {
+      this.props.savePointData();
     }
-
-  }
+  };
   render() {
-const {promptData} =this.props
+    const { promptData } = this.props;
     return (
-        <Modal
-          visible={promptData.promptvisible}
-          className={'pormpt-modal'}
-          content={<div className ='prompt-content'>
-                    <div>{promptData.promptContent}</div>
-                    {promptData.btnType =='isOk'?
-                    <div className='prompt-buttons'>
-                      <span className={'promptOk'} onClick={this.saveData} />
-                      <span className={'promptNo'} onClick={this.cancel} />
-                    </div>:
-                    <div className='prompt-buttons'>
-                      <span className={'promptSave'} onClick={this.saveData} />
-                      <span className={'promptCancel'} onClick={this.cancel} />
-                    </div>
-                    }
-                   </div>
-                  }
-          noDefaultFooter
-          noDefaultHeader
-          destroyContent
-          onCancel={this.cancel}
-          closable={false}
-        />
+      <Modal
+        visible={promptData.promptvisible}
+        className={'pormpt-modal'}
+        content={
+          <div className="prompt-content">
+            <div>{promptData.promptContent}</div>
+            {promptData.btnType == 'isOk' ? (
+              <div className="prompt-buttons">
+                <span className={'promptOk'} onClick={this.saveData} />
+                <span className={'promptNo'} onClick={this.cancel} />
+              </div>
+            ) : (
+              <div className="prompt-buttons">
+                <span className={'promptSave'} onClick={this.saveData} />
+                <span className={'promptCancel'} onClick={this.cancel} />
+              </div>
+            )}
+          </div>
+        }
+        noDefaultFooter
+        noDefaultHeader
+        destroyContent
+        onCancel={this.cancel}
+        closable={false}
+      />
     );
   }
 }

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

@@ -98,7 +98,8 @@ class View3D extends Component {
         fireChamber: [],
         fireCar: [],
         fire: [],
-        fireDetection: []
+        fireDetection: [],
+        fireFoamRoom: []
       },
       markerType: null,
       planStarted: false,
@@ -510,7 +511,7 @@ class View3D extends Component {
     const me = this;
     if (!obj.isForceParent) {
       obj.on('click', evt => {
-        if (this.state.isEditMode == false) {
+        if (this.state.isEditMode === false) {
           console.log('obj click:', evt);
           // this.focusPosition(evt.pickedPosition);
           me.outlineFactory.toggleOutline(evt.object);
@@ -575,8 +576,22 @@ class View3D extends Component {
   getPointList = (pointType,treeData) => {
     this.clearMarkers();
     if (treeData){
-      let markers = {};
-      markers[pointType] = [];
+      let markers = {
+        riskSource: [],//风险点
+        patrol: [],//巡检点
+        impEquipment: [],//重点设备
+        monitorEquipment: [],//探测器
+        video: [],//摄像头
+        fireEquipment: [],//消防设备
+        person: [],
+        pool: [],
+        hydrant: [],
+        fireChamber: [],
+        fireCar: [],
+        fire: [],
+        fireDetection: [],
+        fireFoamRoom: []
+      };
       this.getPointLoop( { markers }, pointType, treeData);
       this.setState({ markers });
     }
@@ -909,20 +924,42 @@ class View3D extends Component {
   //保存点绑定
   savePointData = () => {
 
-    let { markers, pointType, isPointSave } = this.state;
+    let { markers, pointType } = this.state;
     this.setState({ isPointSave: false });
-    let paramsArr = [];
-    paramsArr = markers[pointType].filter(e=> e.isEdit).map(item=>{
-      return {
-        pointId: item.id,
-        pointType: item.type,
-        position3d: item.position.length > 1 ? `${item.position[0]},${item.position[1]},${item.position[2]}` : null
-      };
-    });
-    this.savePointList(pointType,paramsArr);
+
+    if (pointType === 'fireEquipment') {
+      let typeArr = ['fireEquipment','pool','hydrant','fireChamber','fireCar','fireFoamRoom'];
+      for (let i = 0;i < typeArr.length;i++){
+        let paramsArr = [];
+        if (markers[typeArr[i]].length > 0){
+          paramsArr = markers[typeArr[i]].filter(e=> e.isEdit).map(item=>{
+            return {
+              pointId: item.id,
+              pointType: item.type,
+              position3d: item.position.length > 1 ? `${item.position[0]},${item.position[1]},${item.position[2]}` : null
+            };
+          });
+          if (i === 0){
+            this.savePointList(pointType,paramsArr);
+          } else {
+            this.savePointList(pointType,paramsArr,true);
+          }
+        }
+      }
+    } else {
+      let paramsArr = [];
+      paramsArr = markers[pointType].filter(e=> e.isEdit).map(item=>{
+        return {
+          pointId: item.id,
+          pointType: item.type,
+          position3d: item.position.length > 1 ? `${item.position[0]},${item.position[1]},${item.position[2]}` : null
+        };
+      });
+      this.savePointList(pointType,paramsArr);
+    }
   }
 
-  savePointList = (pointType,paramsArr) => {
+  savePointList = (pointType,paramsArr,isfirst = true) => {
     savePointListAction(paramsArr).then(
       data => {
         getPointTreeAction(pointType).then(
@@ -934,8 +971,12 @@ class View3D extends Component {
             });
           }
         );
-        message.success('保存成功');
-      },error => message.error('保存失败')
+        isfirst && message.success('保存成功');
+
+      },error =>{
+      isfirst && message.error('保存失败');
+
+    }
     );
   }
 
@@ -1190,7 +1231,7 @@ class View3D extends Component {
         id: dragItem.id,
         type: dragItem.type
       };
-      markers[`${type}`] = markers[`${type}`].filter(e => e.id !== dragItem.id );
+      markers[`${type}`] = markers[`${type}`] && markers[`${type}`].filter(e => e.id !== dragItem.id );
       markers[`${type}`].push(addPointParam);
       this.setState({
         markers: deepCopy(markers),
@@ -1572,7 +1613,7 @@ class View3D extends Component {
   addMarker=({ extData, position })=>{
     const me = this;
     const { markers } = me.state;
-    const isInside = me.polygonRegion && extData.parentId && me.polygonRegion[extData.parentId].pointInPolygon([position.x,position.y,position.z]);
+    //const isInside = me.polygonRegion && extData.parentId && me.polygonRegion[extData.parentId].pointInPolygon([position.x,position.y,position.z]);
     // if (isInside){
     markers[extData.type].forEach(e => {
       if (e.id === extData.id){
@@ -1716,7 +1757,7 @@ class View3D extends Component {
             <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} />}
+            {startLoadExceptionArea && <ExceptionArea markers={exceptionMarkers} handleExceptModel={this.handleExceptModel} focusPosition={this.focusPosition} />}
           </A3DDesigner>
         </div>
         { isEditMode &&

mods/components/3dviewConvertor/view/exceptionArea/ExceptionArea.js

@@ -44,10 +44,13 @@ class ExceptionArea extends Component {
   }
 
   onMarkerClick = (marker) => {
+    console.log(marker);
     const { extData } = marker;
     this.props.handleExceptModel && this.props.handleExceptModel('into_except_model',extData.id);
+    this.props.focusPosition(this.toCameraPosition(extData.position));
   }
 
+
   setTopCardConf = (obj,{ safetyIndex })=>{
     obj.baseObjHelper.titleConfig = {
       // 顶牌平面参数
@@ -71,6 +74,16 @@ class ExceptionArea extends Component {
     obj.baseObjHelper.title = safetyIndex;
   }
 
+  toCameraPosition = (item) => {
+    if (item && item.x){
+      return { x: item.x , y: item.y + 200 , z: item.z + 200 };
+    } else if (item && item[0]){
+      return { x: item[0] , y: item[1] + 200 , z: item[2] + 200 };
+    } else {
+      return;
+    }
+
+  }
   markerCreated = ({ markersCache }) => {
     this.markersCache = markersCache;
     markersCache.eachValue(item=>{
@@ -97,7 +110,8 @@ class ExceptionArea extends Component {
 
 ExceptionArea.propTypes = {
   markers: PropTypes.array,
-  handleExceptModel: PropTypes.func
+  handleExceptModel: PropTypes.func,
+  focusPosition: PropTypes.func
 };
 
 export default ExceptionArea;

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

@@ -28,7 +28,7 @@ const createMarkerLabel = text => {
 };
 const urlMapper = {
   fireCar: { file: 'fire-car', label: '消防车' },
-  fireEquipment: { file: 'fireEquip', label: '消防车' },
+  fireEquipment: { file: 'pool', label: '消防' },
   fireFoamRoom: { file: 'fireFoam', label: '泡沫间' },
   fireChamber: { file: 'fireChamber', label: '消防室' },
   hydrant: { file: 'hydrant', label: '消防栓' },

mods/components/3dviewConvertor/view/searchPane/paramsHeader.js

@@ -4,7 +4,7 @@ import { Button, Input, Select, Group } from 'amos-framework';
 import { SingleQueryEnum } from 'amos-processor/lib/config/queryEnum';
 import { trim } from 'amos-tool';
 import { DatePicker } from 'amos-antd';
-import moment from "moment";
+import moment from 'moment';
 import imgStatic from './../../consts/imgStatic';
 import {
   getImpEquipmentAction,
@@ -16,9 +16,9 @@ const Option = Select.Option;
 
 const MsgTypeEnum = [{ id: 'protal', name: '巡检' }, { id: 'equiment', name: '设备' }, { id: 'risk', name: '风险' }];
 const groupStyle = { display: 'unset', width: '100%' };
-const selectStyle = { width: '25%', minWidth: '20%', marginRight:'14px' };
-const inputStyle = { width: '30%', minWidth: '20%', height: '28px', marginRight:'14px' };
-const datePickerStyle = { width: '30%', minWidth: '20%', height: '28px', marginRight:'14px' };
+const selectStyle = { width: '25%', minWidth: '20%', marginRight: '14px' };
+const inputStyle = { width: '30%', minWidth: '20%', height: '28px', marginRight: '14px' };
+const datePickerStyle = { width: '30%', minWidth: '20%', height: '28px', marginRight: '14px' };
 const enterkey = 13;
 /**
  *
@@ -45,7 +45,7 @@ class paramsHeader extends Component {
       impEquiList: [],
       filter: [],
       recordFilter: [],
-      statusList: [],
+      statusList: []
     };
   }
 
@@ -61,10 +61,10 @@ class paramsHeader extends Component {
         msgTextValue: undefined,
         recordTextValue: undefined,
         filter: [],
-        recordFilter: [],
-      })
+        recordFilter: []
+      });
     }
-}
+  }
 
   onChange = (e) => {
     this.setState({ value: e.target.value });
@@ -74,9 +74,9 @@ class paramsHeader extends Component {
     let showRiskLevel = false;
     let showImpEquiList = false;
 
-    if(value === 'riskSource'){
+    if (value === 'riskSource'){
       showRiskLevel = true;
-    }else if(value === 'monitorEquipment'){
+    } else if (value === 'monitorEquipment'){
       showImpEquiList = true;
     }
     this.setState({ showRiskLevel, showImpEquiList });
@@ -85,8 +85,8 @@ class paramsHeader extends Component {
 
   onPamarmsChange = (name,value) => {
     let { filter } = this.state;
-    if(name === 'time'){
-      value = value == null ? '' : moment(value).format("YYYY-MM-DD");
+    if (name === 'time'){
+      value = value == null ? '' : moment(value).format('YYYY-MM-DD');
     }
     if (value) {
       const flag = filter.some(e => {
@@ -99,19 +99,19 @@ class paramsHeader extends Component {
     } else {
       filter = filter.filter(e => e.name !== name);
     }
-    if(name === 'inputText'){
+    if (name === 'inputText'){
       this.setState({ textValue: value,filter });
-    }else if(name === 'title'){
+    } else if (name === 'title'){
       this.setState({ msgTextValue: value,filter });
-    }else{
+    } else {
       this.setState({ filter }, this.props.paramsOnChange(filter));
     }
   }
 
   paramsTypeonChange = (name,value,type,key) => {
-    let {recordFilter} = this.state;
-    if(name === 'checkTime'){
-      value = value == null ? '' : moment(value).format("YYYY-MM-DD");
+    let { recordFilter } = this.state;
+    if (name === 'checkTime'){
+      value = value == null ? '' : moment(value).format('YYYY-MM-DD');
     }
     if (value) {
       const flag = recordFilter.some(e => {
@@ -125,16 +125,15 @@ class paramsHeader extends Component {
     } else {
       recordFilter = recordFilter.filter(e => e.name !== name);
     }
-    debugger;
-    if(name === 'contingencyName'){
-      this.setState({recordTextValue:value,recordFilter})
-    }else if(name === 'pointName'){
-      if(key === 'record'){
-        this.setState({ recordTextValue:value,recordFilter });
-      }else{
+    if (name === 'contingencyName'){
+      this.setState({ recordTextValue: value,recordFilter });
+    } else if (name === 'pointName'){
+      if (key === 'record'){
+        this.setState({ recordTextValue: value,recordFilter });
+      } else {
         this.setState({ trajectoryTextValue: value,recordFilter });
       }
-    }else{//不为input时直接查询
+    } else {//不为input时直接查询
       this.setState({ recordFilter }, this.props.paramsOnChange(recordFilter));
     }
   }
@@ -142,8 +141,8 @@ class paramsHeader extends Component {
   //检索
   getSearchContent = () => {
     const { showRiskLevel, showImpEquiList, impEquiList,filter  } = this.state;
-    let levelStyle = { width: '20%', minWidth: '15%', height: '28px', marginRight:'14px' };
-    let implStyle = { width: '35%', minWidth: '20%', height: '28px', marginRight:'14px' };
+    let levelStyle = { width: '20%', minWidth: '15%', height: '28px', marginRight: '14px' };
+    let implStyle = { width: '35%', minWidth: '20%', height: '28px', marginRight: '14px' };
     return (<Group style={groupStyle}>
       <Select
         key="searchType"
@@ -160,7 +159,7 @@ class paramsHeader extends Component {
           onChange={(e) => this.onPamarmsChange('inputText',e.target.value)}
           placeholder="输入关键字"
         />
-        <img className="params-input-img" src={imgStatic.datapane.searchPane} alt="" onClick={() => this.props.paramsOnChange(filter)}/>
+        <img className="params-input-img" src={imgStatic.datapane.searchPane} alt="" onClick={() => this.props.paramsOnChange(filter)} />
       </div>
       {
         showRiskLevel &&
@@ -171,7 +170,7 @@ class paramsHeader extends Component {
           renderOption={item => <Option className='modalSelectOption' key={item.key} value={item.key}>{item.label}</Option>}
           defaultOption={<Option className='modalSelectOption'>全部</Option>}
           onChange={(v) => this.onPamarmsChange('dataLevel',v)}
-      />
+        />
       }
       {
         showImpEquiList &&
@@ -182,7 +181,7 @@ class paramsHeader extends Component {
           renderOption={item => <Option className='modalSelectOption' key={item.name} value={item.name}>{item.name}</Option>}
           defaultOption={<Option className='modalSelectOption'>全部</Option>}
           onChange={(v) => this.onPamarmsChange('impEquipment',v)}
-      />
+        />
       }
     </Group>);
 
@@ -207,7 +206,7 @@ class paramsHeader extends Component {
           onChange={(e) => this.onPamarmsChange('title',e.target.value)}
           placeholder="输入关键字"
         />
-        <img className="params-input-img1" src={imgStatic.datapane.searchPane} alt="" onClick={() => this.props.paramsOnChange(filter)}/>
+        <img className="params-input-img1" src={imgStatic.datapane.searchPane} alt="" onClick={() => this.props.paramsOnChange(filter)} />
       </div>
       <DatePicker
         key="time"
@@ -216,7 +215,7 @@ class paramsHeader extends Component {
         placeholder="时间"
         format="YYYY/MM/DD"
         onChange={(v) => this.onPamarmsChange('time',v)}
-        />
+      />
 
     </Group>);
 
@@ -230,7 +229,7 @@ class paramsHeader extends Component {
         key="recordImpl"
         style={selectStyle}
         data={impEquiList}
-        renderOption={item => <Option key={item.id+item.name} value={item.id}>{item.name}</Option>}
+        renderOption={item => <Option key={item.id + item.name} value={item.id}>{item.name}</Option>}
         defaultOption={<Option>重点设备</Option>}
         onChange={(v) => this.paramsTypeonChange('equipmentId', v , SingleQueryEnum.EQUAL)}
       />
@@ -241,7 +240,7 @@ class paramsHeader extends Component {
           onChange={(e) => this.paramsTypeonChange('contingencyName', e.target.value, SingleQueryEnum.LIKE,'record')}
           placeholder="输入关键字"
         />
-        <img className="params-input-img1" src={imgStatic.datapane.searchPane} alt="" onClick={()=> this.props.paramsOnChange(recordFilter)}/>
+        <img className="params-input-img1" src={imgStatic.datapane.searchPane} alt="" onClick={()=> this.props.paramsOnChange(recordFilter)} />
       </div>
       <DatePicker
         key="createTime"
@@ -250,7 +249,7 @@ class paramsHeader extends Component {
         placeholder="时间"
         format="YYYY/MM/DD"
         onChange={(v) => this.paramsTypeonChange('createTime', v, SingleQueryEnum.EQUAL)}
-        />
+      />
     </Group>);
   }
 
@@ -273,7 +272,7 @@ class paramsHeader extends Component {
           onChange={(e) => this.paramsTypeonChange('pointName', e.target.value, SingleQueryEnum.LIKE)}
           placeholder="输入关键字"
         />
-        <img className="params-input-img1" src={imgStatic.datapane.searchPane} alt="" onClick={()=>this.props.paramsOnChange(recordFilter)}/>
+        <img className="params-input-img1" src={imgStatic.datapane.searchPane} alt="" onClick={()=>this.props.paramsOnChange(recordFilter)} />
       </div>
       <DatePicker
         key="createTime"
@@ -282,19 +281,19 @@ class paramsHeader extends Component {
         placeholder="时间"
         format="YYYY/MM/DD"
         onChange={(v) => this.paramsTypeonChange('beginDate', v, SingleQueryEnum.EQUAL)}
-        />
+      />
     </Group>);
   }
 
   getContent = () =>{
     const { activeKey } = this.props;
-    if(activeKey === 'search'){
+    if (activeKey === 'search'){
       return this.getSearchContent();
-    }else if(activeKey === 'message'){
+    } else if (activeKey === 'message'){
       return this.getMessageContent();
-    }else if(activeKey === 'record'){
+    } else if (activeKey === 'record'){
       return this.getRecordContent();
-    }else{
+    } else {
       return this.getTrajectoryContent();
     }
   }