冲突

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

@@ -1556,7 +1556,7 @@ class View3D extends Component {
     });
   }
   handleExceptModel =(type,areaId)=>{
-    let { isPointSave } = this.state;
+    let { isPointSave,isAreaSave } = this.state;
     this.clearMarkers();
     if (type === 'into_except_model'){//进入耳朵模式
       this.props.editModelChange(true);//隐藏全景统计
@@ -1596,7 +1596,6 @@ class View3D extends Component {
           this.handleOutExceptModel();
         }
       }
-
     }
   }