删除风险点，树形显示

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

@@ -197,6 +197,12 @@ impEquipmentMode_fireCar: require('../assets/convertor/3dview/markers/IeqMode-fi
 };
 
 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'),
   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',

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

@@ -86,12 +86,19 @@ class View3D extends Component {
       fireEquipmentPosition: [],
       contingencyPlanId: '',
       markers: {
-        patrol: [],
-        risk: [],
-        video: [],
-        person: [],
-        data: [],
-        room: []
+        riskSource:[],//风险点 - riskSource；
+        patrol:[],//巡检点 -
+        impEquipment:[],//重点设备 -
+        monitorEquipment:[],//探测器 -
+        video:[],//摄像头 -
+        fireEquipment:[],//消防设备 -
+        person:[],
+        pool:[],
+        hydrant:[],
+        fireChamber:[],
+        fireCar:[],
+        fire:[],
+        fireDetection:[]
       },
       markerType: null,
       planStarted: false,
@@ -531,8 +538,6 @@ class View3D extends Component {
   getPointList = () => {
     let { markers } = this.state
     getPointListAction().then(data => {
-      // console.log(data);
-      console.log(JSON.stringify(data))
       for (let i = 0; i < data.length;i++){
         markers[data[i].type].push(data[i])
       }
@@ -729,6 +734,11 @@ class View3D extends Component {
   }
   //选中区域变化
   selectItemChange = (selectArea) => {
+    this.a3dRef.changeDrawState(PEN_STATE.CLEARED);//清除当前路径
+      // 结束绘制
+      this.setState({
+        drawing: false
+      });
     this.setState({
       selectArea,
       showRightPanel: true
@@ -818,7 +828,8 @@ class View3D extends Component {
 
   //保存点绑定
   savePointData = () => {
-    let { markers ,pointTypeArr} = this.state;
+    let { markers ,pointTypeArr,pointType} = this.state;
+    console.log(markers)
     let paramsArr = [];
     for ( let key in markers ){
       let item = markers[key];
@@ -830,10 +841,11 @@ class View3D extends Component {
         });
       }
     }
+
     savePointListAction(paramsArr).then(data => {
-      getPointTreeAction(pointTypeArr[0].code || '').then(data => {
+      getPointTreeAction(pointType).then(data => {
+
         this.setState({
-          pointType: pointTypeArr[0].code || '',
           treeData: data || [],
           pageType: 'point',
           showRightPanel: false
@@ -845,7 +857,7 @@ class View3D extends Component {
   }
   // 删除点绑定
   deletePointBind = () => {
-    let { selectPoints ,pointTypeArr,markers} = this.state;
+    let { selectPoints ,pointTypeArr,pointType,markers} = this.state;
     if (selectPoints) {
       let pointParams = [];
       pointParams.push({
@@ -855,10 +867,30 @@ class View3D extends Component {
       })
 
       savePointListAction(pointParams).then(data => {
-        getPointTreeAction(pointTypeArr[0].code || '').then(data => {
-          this.getPointList()
+        getPointTreeAction(pointType).then(data => {
+          getPointListAction().then(data => {
+            let newMarkers ={
+              riskSource:[],//风险点 - riskSource；
+              patrol:[],//巡检点 -
+              impEquipment:[],//重点设备 -
+              monitorEquipment:[],//探测器 -
+              video:[],//摄像头 -
+              fireEquipment:[],//消防设备 -
+              person:[],
+              pool:[],
+              hydrant:[],
+              fireChamber:[],
+              fireCar:[],
+              fire:[],
+              fireDetection:[]
+            }
+            for (let i = 0; i < data.length;i++){
+              newMarkers[data[i].type].push(data[i])
+            }
+            this.setState({markers:newMarkers})
+          })
           this.setState({
-            pointType: pointTypeArr[0].code || '',
+
             treeData: data || [],
             pageType: 'point',
             showRightPanel: false
@@ -947,7 +979,7 @@ class View3D extends Component {
   drop = (event) => {
     event.preventDefault();
     let { dragItem,markers } = this.state;
-    console.log(dragItem);
+    //alert(JSON.stringify(dragItem));
     if (dragItem) {
       if (dragItem.isBind) {
         this.tipMsg = '只能放置未绑定的标记点'
@@ -974,6 +1006,7 @@ class View3D extends Component {
         return false;
       }
       let uid = UUID.uuidFast();
+      let type = dragItem.type;
       let addPointParam = {
         type: dragItem.type,
         position,
@@ -982,11 +1015,11 @@ class View3D extends Component {
         key: `${dragItem.type}-${dragItem.id}`,
         title: dragItem.name,
         label: dragItem.name,
-        level: '1',
-        levelStr: 'level_2'
+        level: dragItem.level,
+        levelStr: dragItem.levelStr,
       };
-      markers.riskSource.push(addPointParam);
-
+      markers[`${type}`].push(addPointParam);
+      console.log(markers)
       this.setState({
         markers
       });

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

@@ -23,13 +23,21 @@ export default function markerFactory(WrappedComponent = 'div', options){
       super(props);
       this.markerEvents = {
         click: this.onMarkerClick,
-        dblclick: this.onMarkerDblClick
+        dblclick: this.onMarkerDblClick,
         // mouseover: (marker) => {
         //   marker.redraw(this.renderMarkerHover);
         // },
         // mouseout: (marker) => {
         //   marker.redraw(this.renderMarker);
         // }
+        mouseover: (marker, evt) => {
+          console.log('mouseover', marker, evt);
+          marker.object2DPipe && marker.object2DPipe.toggleDisplay(true);
+        },
+        mouseout: (marker, evt) => {
+          console.log('mouseout', marker, evt);
+          marker.object2DPipe && marker.object2DPipe.toggleDisplay(false);
+        }
       };
     }
 
@@ -84,7 +92,9 @@ export default function markerFactory(WrappedComponent = 'div', options){
         return <MarkerIcon {...extData} markerType={markerType} />;
       }
     }
-
+    markerCreated = ({ markersCache }) => {
+      this.markersCache = markersCache;
+    };
     render() {
       const { markers } = this.props;
       const { planStarted } = this.state;
@@ -96,6 +106,7 @@ export default function markerFactory(WrappedComponent = 'div', options){
             markers={deepCopy(markers)}
             events={this.markerEvents}
             render={this.renderMarker}
+            onCreated={this.markerCreated}
           />
           {!planStarted && <PointDialog style={dialogStyle} ref={node => this.pdRef = node} />}
         </WrappedComponent>