合并

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BuildingTreeServiceImpl.java

@@ -517,7 +517,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 							tpRoomNoMapper.delete(tpRoomNoQueryWrapper);
 						}
 				}
-			}
+			  }
 			}
 			//删除所有楼层
 			tpLevelMapper.delete(tpLevel);

VUECODE/smart-property-manage/src/views/building/buildingdata/index.vue

@@ -106,9 +106,6 @@ export default {
         return
         }   
           this.$router.go(0)
-           
-          //  this.suo()
-
       }).catch(() => {
         console.log('error addNode')
       })
@@ -125,9 +122,23 @@ export default {
       console.log('当前节点',data.id)
       console.log('当前名称',data.name)
       console.log('当前类型',data.type)
+      // if(data.type=='phase'){
+      //   his.$message({
+      //       type: 'info',
+      //       message: '不可删除根节点'
+      //     }); 
+      //     return
+      // }
       this.$store.dispatch('DeleteNode', this.treeQuery).then((res) => {
+        if(res.code=='1'){
+          this.$message({
+          showClose: true,
+          message: res.message,
+          type: 'warning'
+        }) 
+        return 
+        }
          location.reload()
-        // this.liste=[]    
       }).catch(() => {
         console.log('error addNode')
       })