删除区域

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

@@ -781,14 +781,13 @@ class View3D extends Component {
   //选中点变化
   selectPointChange = (selectPoints) => {
     if(selectPoints.isRegion){
-      this.setState({selectArea:selectPoints})
+      this.setState({selectArea:selectPoints,selectPoints})
     }else{
       this.dragItemChange(selectPoints)
       this.setState({
         selectArea:'',
         selectPoints,
         showRightPanel: true,
-        selectPoints
       });
     }
 
@@ -904,6 +903,10 @@ class View3D extends Component {
         position3d: item.position.length > 1 ? `${item.position[0]},${item.position[1]},${item.position[2]}` : null
       };
     });
+    this.savePointList(pointType,paramsArr);
+  }
+
+  savePointList = (pointType,paramsArr) => {
     savePointListAction(paramsArr).then(
       data => {
         getPointTreeAction(pointType).then(
@@ -918,9 +921,8 @@ class View3D extends Component {
         message.success('保存成功');
       },error => message.error('保存失败')
     );
-
-
   }
+  
   // 删除点绑定
   deletePointBind = () => {
     let { selectPoints ,pointTypeArr,pointType,markers} = this.state;
@@ -931,41 +933,40 @@ class View3D extends Component {
         pointId: selectPoints.id,
         pointType: selectPoints.type,
         position3d: ``
-      })
-
-      savePointListAction(pointParams).then(data => {
-        getPointTreeAction(pointType).then(data => {
-          this.getPointList(pointType,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({
+      });
+      this.savePointAndRefreshMarker(pointType,pointParams);
+    }else if(selectPoints && selectPoints.isRegion && selectPoints.children){
+      AmosAlert.confirm('提示', '是否删除该区域下所有点?', {
+        callback: (flag) => {
+          if (flag){
+            let pointParams = [];
+            pointParams = selectPoints.children.filter(e => e.position3d && e.position3d.length > 0).map(item=>{
+              return {
+                pointId: item.id,
+                pointType: item.type,
+                position3d: ''
+              };
+            });
+            this.savePointAndRefreshMarker(pointType,pointParams);
+          } else {
+            
+          }
+        }
+      });
+    }
+  }
 
-            treeData: data || [],
-            pageType: 'point',
-            showRightPanel: false
-          });
+  savePointAndRefreshMarker = (pointType,pointParams) => {
+    savePointListAction(pointParams).then(data => {
+      getPointTreeAction(pointType).then(data => {
+        this.getPointList(pointType,data);
+        this.setState({
+          treeData: data || [],
+          pageType: 'point',
+          showRightPanel: false
         });
-      })
-    }
+      });
+    });
   }
 
   //删除区域
@@ -1108,7 +1109,6 @@ class View3D extends Component {
   }
 
   drop = (event) => {
-    console.log('drop');
     event.preventDefault();
     this.setState({ isPointSave: false });
     let { dragItem,markers } = this.state;

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

@@ -181,7 +181,7 @@ class PointLeftTree extends Component {
     console.log('onSelect', info);
     let selectItem = info.node.props.dataRef;
     this.setState({ selectedKeys });
-    this.props.selectPointChange(selectItem)
+    this.props.selectPointChange(selectItem);
   }
   render() {
       let { treeData, checkedPointsKeys,pointTypeArr,pointType } = this.state;