.

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

@@ -933,27 +933,28 @@ class View3D extends Component {
 
       savePointListAction(pointParams).then(data => {
         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.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({
 
             treeData: data || [],
@@ -1539,7 +1540,7 @@ class View3D extends Component {
     const me = this;
     const { markers } = me;
     const isInside = me.polygonRegion && extData.parentId && me.polygonRegion[extData.parentId].pointInPolygon([position.x,position.y,position.z]);
-    if (isInside){
+    // if (isInside){
       markers[extData.type].forEach(e => {
         if (e.id === extData.id){
           e.position = `${position[0]},${position[1]},${position[2]}`;
@@ -1553,9 +1554,9 @@ class View3D extends Component {
         showRightPanel: true,
         selectPoints: extData
       });
-    } else {
-      message.error('不能放置非所在区域');
-    }
+    // } else {
+    //   message.error('不能放置非所在区域');
+    // }
   }
 
   render() {