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

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

@@ -53,6 +53,7 @@ class PointsPool extends Component {
   }
 
   onMarkersCreated = (type, { markersCache }) => {
+
     this.markerList[type] = markersCache;
     (markersCache || []).forEach(mc => {
       const extData = mc.getExtData();

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

@@ -14,15 +14,20 @@ class PromptModal extends Component {
     }
   };
   saveData = () => {
-    const { isback, type } = this.props.promptData;
-    if (isback) {
-      this.props.handleOutExceptModel();
-    }
+    const { isback, type,pointType,pointParams } = this.props.promptData;
+
     this.props.closePromptModal();
     if (type === 'region') {
       this.props.saveAreaData();
     } else {
-      this.props.savePointData();
+      if (isback){
+        this.props.savePointData();
+      } else {
+        this.props.savePointAndRefreshMarker(pointType,pointParams);
+      }
+    }
+    if (isback) {
+      this.props.handleOutExceptModel();
     }
   };
   render() {
@@ -34,7 +39,7 @@ class PromptModal extends Component {
         content={
           <div className="prompt-content">
             <div>{promptData.promptContent}</div>
-            {promptData.btnType == 'isOk' ? (
+            {promptData.btnType === 'isOk' ? (
               <div className="prompt-buttons">
                 <span className={'promptOk'} onClick={this.saveData} />
                 <span className={'promptNo'} onClick={this.cancel} />

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

@@ -987,7 +987,17 @@ class View3D extends Component {
         pointType: selectPoints.type,
         position3d: ``
       });
-      this.savePointAndRefreshMarker(pointType,pointParams);
+      this.setState({ promptData: {
+        promptvisible: true,
+        promptContent: '确定将选中删除?',
+        type: 'point',
+        btnType: 'isOk',
+        isback: false,
+        pointType,
+        pointParams
+      }
+      });
+      //this.savePointAndRefreshMarker(pointType,pointParams);
     } else if (selectPoints && selectPoints.isRegion && selectPoints.children){
       let pointParams = [];
       pointParams = selectPoints.children.filter(e => e.position3d && e.position3d.length > 0).map(item=>{
@@ -997,13 +1007,15 @@ class View3D extends Component {
           position3d: ''
         };
       });
-      this.savePointAndRefreshMarker(pointType,pointParams);
+      //this.savePointAndRefreshMarker(pointType,pointParams);
       this.setState({ promptData: {
         promptvisible: true,
         promptContent: '是否删除该区域下所有点?',
         type: 'point',
         btnType: 'isOk',
-        isback: false
+        isback: false,
+        pointType,
+        pointParams
       }
       });
     }
@@ -1143,12 +1155,13 @@ class View3D extends Component {
     this.setState({
       pointType,
       treeData: [],
+      treeDataList: [],
       selectArea: '',
       selectPoints: '',
       dragItem: ''
     });
     getPointTreeAction(pointType).then(data => {
-      //alert(JSON.stringify(data))
+      this.generateList(data);
       this.getPointList(pointType,data);
       this.setState({
         pointType,
@@ -1202,6 +1215,7 @@ class View3D extends Component {
     }
     const isInside = this.polygonRegion[dragItem.parentId].pointInPolygon([position.x,position.y,position.z]);
     console.log(isInside);
+
     if (dragItem) {
       if (isInside === false) {
         message.danger('只能放置在当前区域');
@@ -1267,28 +1281,6 @@ class View3D extends Component {
       });
     }
   }
-
-
-  changeMarkerType = (item, isCancel) => {
-    const { markers } = this.state;
-    if (item.isLine) {
-      this.setState({
-        toggleRoad: !isCancel
-      });
-    } else {
-      if (isCancel) {
-        markers[item.type] = [];
-        this.setState({
-          markers
-        });
-      } else {
-        // if (totalDelta < mousewheelCount) {
-        this.asyncLoadMarkerData(item.type);
-
-      }
-    }
-  };
-
   asyncLoadMarkerData = (markerType, riskSourceId) => {
     const { markers } = this.state;
     this.setState({ showMap: false });
@@ -1729,6 +1721,7 @@ class View3D extends Component {
         <PromptModal promptData={promptData}
           saveAreaData={this.saveAreaData}
           handleOutExceptModel={this.handleOutExceptModel}
+          savePointAndRefreshMarker={(pointType,pointParams)=>this.savePointAndRefreshMarker(pointType,pointParams)}
           savePointData={this.savePointData}
           closePromptModal={this.closePromptModal}
         />

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

@@ -86,8 +86,7 @@ class AreaLeftTree extends Component {
       expandedKeys,
       autoExpandParent: false
     });
-  };
-
+  }
 
   onTreeSelect = (selectedKeys, info) => {
     console.log('onSelect', info);
@@ -96,12 +95,11 @@ class AreaLeftTree extends Component {
       selectedKeys
     });
     this.props.selectItemChange(selectItem);
-  };
-
-  renderTreeNodes = data => {
-    const { searchValue } = this.state;
+  }
+  renderTreeNodes = (data) => {
+    let { searchValue } = this.state;
     if (data.length > 0) {
-      return data.map(item => {
+      return data.map((item) => {
         const index = item.name.indexOf(searchValue);
         const beforeStr = item.name.substr(0, index);
         const afterStr = item.name.substr(index + searchValue.length);
@@ -128,14 +126,12 @@ class AreaLeftTree extends Component {
             <TreeNode
               title={
                 <div>
-                  {' '}
                   {
-                    <span>
-                      {' '}
-                      {title}{' '}
-                      <span className="icon">
-                        {' '}
-                        {item.isBind ? '' :
+                    <span >
+                      {title}
+                      <span className='icon'>
+                        {
+                        item.isBind ? '' :
                         <img
                           src={moduleEditIcon.editBtn}
                           alt=""
@@ -145,17 +141,17 @@ class AreaLeftTree extends Component {
                             this.props.startDrow(item);
                           }}
                         />
-                        }{' '}
-                        {item.isBind ? <img src={moduleEditIcon.bindedTip} alt="" /> : item.routePath ? <img src={moduleEditIcon.noSaveTip} alt="" /> : <img src={moduleEditIcon.noSaveTip} alt="" />}{' '}
-                      </span>{' '}
+                        }
+                        {item.isBind ? <img src={moduleEditIcon.bindedTip} alt="" /> : item.routePath ? <img src={moduleEditIcon.noSaveTip} alt="" /> : <img src={moduleEditIcon.noSaveTip} alt="" />}
+                      </span>
                     </span>
-                  }{' '}
+                  }
                 </div>
               }
               key={item.id}
               dataRef={item}
             >
-              {this.renderTreeNodes(item.children)}{' '}
+              {this.renderTreeNodes(item.children)}
             </TreeNode>
           );
         }

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

@@ -66,9 +66,8 @@ class PointLeftTree extends Component {
     this.setState({ pointType: value });
     this.props.pointTypeChange(value);
   }
-  onSearchChange = e => {
+  onSearchChange = (e,value) => {
     const { treeDataList,treeData } = this.state;
-    const value = e.target.value;
     const expandedKeys = treeDataList
      .map(item => {
        if (item.title.indexOf(value) > -1) {

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

@@ -2,13 +2,13 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { utils } from 'amos-tool';
 import { Markers } from 'amos-3d/lib/designer';
-import { BaseObjHelper } from 'base-r3d/lib/factory';
 import formatUrl from 'amos-processor/lib/utils/urlFormat';
 import { CONSTS } from './../../consts/storageConsts';
 import PointDialog from './PointDialog';
 import { tirggerPlanTopic } from './../dataProcessor';
 import { marker3DIoncMapper, markerTitleBgMapper } from './../../consts/imgStatic';
-import MarkerIcon from './MarkerIcon';
+import { eventTopics, isPointEvent , isLevelFilter } from './../consts';
+import { parseMarkers, parseLevelFilter } from '../dataProcessor';
 
 const getIcon = (markerType, level) => {
   // return marker3DIoncMapper[`${markerType}_${level}`];
@@ -18,17 +18,17 @@ const getIcon = (markerType, level) => {
   return marker3DIoncMapper[`${markerType}`];
 };
 
-const createMarkerLabel = text => {
-  const div = document.createElement('div');
-  div.style.position = 'absolute';
-  div.style.marginTop = '-3rem';
-  div.className = 'three-ui-anchor';
-  div.innerText = text;
-  return div;
-};
+// const createMarkerLabel = text => {
+//   const div = document.createElement('div');
+//   div.style.position = 'absolute';
+//   div.style.marginTop = '-3rem';
+//   div.className = 'three-ui-anchor';
+//   div.innerText = text;
+//   return div;
+// };
 const urlMapper = {
   fireCar: { file: 'fire-car', label: '消防车' },
-  fireEquipment: { file: 'pool', label: '消防' },
+  fireEquipment: { file: 'fireEquip', label: '消防设备' },
   fireFoamRoom: { file: 'fireFoam', label: '泡沫间' },
   fireChamber: { file: 'fireChamber', label: '消防室' },
   hydrant: { file: 'hydrant', label: '消防栓' },
@@ -47,6 +47,7 @@ export default function marker3DFactory(WrappedComponent = 'div', options) {
 
     constructor(props) {
       super(props);
+      this.markerList = {};
       this.markerEvents = {
         click: this.onMarkerClick,
         // dblclick: this.onMarkerDblClick,
@@ -83,12 +84,23 @@ export default function marker3DFactory(WrappedComponent = 'div', options) {
     componentWillMount = () => {
       this.setState({ planStarted: this.props.planStarted });
     };
-
+    componentDidMount() {
+      this.props.subscribe(eventTopics.base3d_view, (topic, data) => {
+        if (isPointEvent(topic)){
+          parseMarkers(this, topic, data);
+        } else if (isLevelFilter(topic)) {
+          parseLevelFilter(this, topic, data);
+        }
+      });
+      this.props.subscribe('base3d.fromws1.showFireTruckRoute', (topic, data) => {
+        parseMarkers(this, topic, data);
+      });
+    }
     componentWillReceiveProps = nextProps => {
       if (nextProps.isEditMode) {
         this.markersCache.eachValue(obj => {
           // this.setTopCardConf(obj, obj.extData);
-          if (nextProps.selectPoints.type == obj.extData.type && nextProps.selectPoints.id == obj.extData.id) {
+          if (nextProps.selectPoints.type === obj.extData.type && nextProps.selectPoints.id === obj.extData.id) {
             this.setTwinkleConf(obj);
           }
         });
@@ -150,16 +162,15 @@ export default function marker3DFactory(WrappedComponent = 'div', options) {
       this.outlineHelper = this.stagePilot ? this.stagePilot.outlineHelper : undefined;
       markersCache.eachValue(obj => {
         this.setTopCardConf(obj, obj.extData);
-        if (obj.extData.type === 'riskSource' && markerType != 'impEquipmentMode' && !isEditMode) {
+        if (obj.extData.type === 'riskSource' && markerType !== 'impEquipmentMode' && !isEditMode) {
           this.setTwinkleConf(obj);
         }
       });
     };
-
     setTwinkleConf = obj => {
       const { twinkle, frequency } = obj.extData;
-      let pulsePeriod = twinkle && frequency != 0 ? 1 / frequency : null;
-      let color = twinkle && frequency != 0 ? '#FF0000' : null;
+      let pulsePeriod = twinkle && frequency !== 0 ? 1 / frequency : null;
+      let color = twinkle && frequency !== 0 ? '#FF0000' : null;
       if (!obj.baseObjHelper.outlineHelper) {
         obj.baseObjHelper.setOutlineHelper(this.outlineHelper);
       }

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

@@ -260,14 +260,18 @@ class SearchPane extends Component {
     }
 
   }
+  closeModal(){
+    this.props.changeSearchPaneVisible();
+    this.setState({ activeKey: 'search' },()=>this.paramsOnChange([]));
 
+  }
   render() {
     const { dataList,activeKey,retrieveType,totalCount,msgDataList,recordDataList,trajectoryDataList } = this.state;
     return (
       <div>
         { this.props.visible && <div className="search-pane-bg" /> }
         { this.props.visible && <SidePane className="search-pane">
-          <div className="search-pane-close" onClick={this.props.changeSearchPaneVisible()}>
+          <div className="search-pane-close" onClick={()=>this.closeModal()}>
             <Icon icon="close" />
           </div>
           <Tabs

mods/components/3dviewConvertor/view/sideControl/index.js

@@ -3,8 +3,7 @@ import PropTypes from 'prop-types';
 import { SidePane } from 'amos-framework';
 import { Store } from 'amos-tool';
 import BizControlPane from './BizControlPane';
-import InnateControlPane from './InnateControlPane';
-import { viewController, bizControls } from './../conf';
+import { bizControls } from './../conf';
 
 const loginUserName = Store.lsTool.read('userName');
 const filterUser = ['tianbo', 'opera1', 'opera2'];
@@ -54,7 +53,7 @@ class SideControl extends Component {
   };
 
   render() {
-    const { layerConfig, animationProps  } = this.props;
+    const { animationProps  } = this.props;
     let _bizControls = bizControls;
     if (filterUser.includes(loginUserName)) {
       let target = _bizControls.find(item => item.key === 'fireResource-point');