Merge remote-tracking branch 'origin/master'

src/utils/common.js

@@ -183,11 +183,6 @@ export function handleTree(data, id, parentId, children, rootId) {
 			//返回每一项的子级数组
 			return father[id] === child[parentId]
 		});
-
-        if(child[parentId]==1158){
-			console.log("qxj branchArr",branchArr);
-		}
-
 		branchArr.length > 0 ? father.children = branchArr : '';
 		//返回第一层
 		return father[parentId] === rootId;