1.修改缺陷

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

@@ -65,26 +65,6 @@ class PointsPool extends Component {
       if (extData.isTableDb) {//控制安全执行类表双击最佳视角
         this.props.focusObject && this.props.focusObject(mc.node);
       }
-      if (extData.hasOwnProperty('visible')){
-        let visible = extData.visible;
-        if (visible) {
-          if (extData.type === 'fireCar') {
-            mc.visible = visible;
-            mc.object2DPipe.pipeNode.visible = false;
-            mc.object2DPipe.pipeNode.elementVisible = false;
-          } else {
-            mc.show();
-          }
-        } else {
-          if (extData.type === 'fireCar') {
-            mc.visible = visible;
-            mc.object2DPipe.pipeNode.visible = false;
-            mc.object2DPipe.pipeNode.elementVisible = false;
-          } else {
-            mc.hide();
-          }
-        }
-      }
     });
   }
 

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

@@ -118,7 +118,7 @@ class View3D extends Component {
       alarmStarted: false,
       //编辑模式
       drawing: false,//画线状态
-      selectArea: '',//选中区域
+      selectArea: {},//选中区域
       selectPoints: '',//选中点
       treeData: [],//左树
       pointTypeArr: [],
@@ -858,7 +858,7 @@ class View3D extends Component {
         }
       });
       this.setState({
-        selectArea: '',
+        selectArea: {},
         selectPoints,
         showRightPanel: true
       });
@@ -916,6 +916,7 @@ class View3D extends Component {
   onRegionCreated = (polygonRegion,item) => {
     this.polygonRegion[item.id] = polygonRegion;
   }
+
   saveRoutePath =(data)=>{
     saveAreaDataAction(data).then(d => {
       message.success('保存成功！');
@@ -929,31 +930,35 @@ class View3D extends Component {
       message.error('保存失败！');
     });
   }
+
   changeRoutePath = ( routePathNode ) => {
 
     this.state.routePathData.push(routePathNode);
   }
+
   //保存区域绑定
   saveAreaData = () => {
-    let { routePathData } = this.state;
-    this.setState({ isAreaSave: false });
+    const { routePathData } = this.state;
     saveAreaDataAction(routePathData).then(d => {
-      message.success('保存成功！');
       this.a3dRef.changeDrawState(PEN_STATE.CLEARED);//清除当前路径
-      // 结束绘制
-      this.setState({
-        drawing: false
+      this.setState({ isAreaSave: false, drawing: false,treeData: [] },()=>{
+        message.success('保存成功！');
+        this.getAreaTree();
       });
-      getAreaTreeAction().then(data => {
-        this.setState({
-          treeData: data || [],
-          routePathData: []
-        });
-      });
-    }, eer => {
+    }, err => {
       message.error('保存失败！');
     });
   }
+
+  getAreaTree = ()=>{
+    getAreaTreeAction().then(data => {
+      this.setState({
+        treeData: data || [],
+        routePathData: []
+      });
+    });
+  }
+
   savePointDataBack = async()=>{
     await this.savePointData();
     this.handleOutExceptModel();
@@ -1023,7 +1028,6 @@ class View3D extends Component {
   deletePointBind = () => {
     let { selectPoints ,pointType } = this.state;
     if (selectPoints && !selectPoints.isRegion) {
-
       let pointParams = [];
       pointParams.push({
         pointId: selectPoints.id,
@@ -1079,30 +1083,26 @@ class View3D extends Component {
 
   //删除区域
   deleteAreaBind = () => {
-    let { selectArea } = this.state;
-    if (selectArea) {
+    const { selectArea, routePathData = [] } = this.state;
+    if (selectArea && selectArea.id) {
       getPointsByRegionIdAction(selectArea.id).then(d => {
         if (d && d.length === 0){
-          this.state.routePathData.push({
-            riskSourceId: selectArea.id,
-            routePath: ''
-          });
-          //var tree = new Object();
-          //tree.children = treeData;
-          //this.removeTreeDataRoutePathByChildId(selectArea.id,tree);
-          //this.getAreas(tree.children);
-          this.setState({
-            routePathData: this.state.routePathData,
-            //treeData: tree.children,
-            selectArea: ''
-          });
-          this.setState({ promptData: {
+          if (!routePathData.some(r=> r.riskSourceId === selectArea.id)){
+            routePathData.push({
+              riskSourceId: selectArea.id,
+              routePath: ''
+            });
+          }
+          const promptData = {
             promptvisible: true,
             promptContent: '确定将选中删除？',
             type: 'region',
             btnType: 'isOk',
             isback: false
-          }
+          };
+          this.setState({
+            routePathData,
+            promptData
           });
         } else {
           message.danger('请先清除点的绑定再进行删除！');
@@ -1160,7 +1160,7 @@ class View3D extends Component {
     this.setState( {
       treeDataList: [],
       dragItem: '',
-      selectArea: '',
+      selectArea: {},
       selectPoints: ''
     } );
     this.stagePilot.positionCtl.clearDrag();//清除已有选中
@@ -1183,7 +1183,7 @@ class View3D extends Component {
           treeData: data || [],
           pageType: 'point',
           showRightPanel: false ,
-          selectArea: ''
+          selectArea: {}
         });
       });
       this.enableCamera();
@@ -1195,7 +1195,7 @@ class View3D extends Component {
       pointType,
       treeData: [],
       treeDataList: [],
-      selectArea: '',
+      selectArea: {},
       selectPoints: '',
       dragItem: ''
     });
@@ -1631,7 +1631,7 @@ class View3D extends Component {
       isEditMode: false, //推出编辑模式
       errorAreaId: '',
       dragItem: '',
-      selectArea: '',
+      selectArea: {},
       selectPoints: '',
       showRightPanel: false,
       routePathData: [],

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

@@ -247,19 +247,9 @@ export const parseLevelFilter = (instance, topic, data) => {
         case 'fireResource':
           (instance.markerList[pointLevel] || []).forEach(mc => {
             if (visible) {
-              if (mc.extData.type === 'fireCar') {
-                mc.node.visible = visible;
-                mc.object2DPipe.pipeNode.show();
-              } else {
-                mc.visible = true;
-              }
+              mc.visible = true;
             } else {
-              if (mc.extData.type === 'fireCar') {
-                mc.node.visible = visible;
-                mc.object2DPipe.pipeNode.hide();
-              } else {
-                mc.visible = false;
-              }
+              mc.visible = false;
             }
           });
           break;

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

@@ -82,7 +82,8 @@ SideControl.propTypes = {
   write: PropTypes.func,
   toStr: PropTypes.func,
   animationProps: PropTypes.object,
-  errorAreaId: PropTypes.number
+  errorAreaId: PropTypes.string,
+  activeAction: PropTypes.array
 };
 
 export default SideControl;