1.树形图调整

pqs9000/src/main/webapp/WEB-INF/views/include/deviceTree.jsp

@@ -32,7 +32,7 @@
 <%--			</button>--%>
 <%--			<button type="button" id="resetB"--%>
 <%--				class="btn-primary"--%>
-<%--				onclick=""--%>
+<%--				onclick="resetTree()"--%>
 <%--				style="padding: 0 5px; height: 25px; width: 55px; border-radius: 4px; border: 1px solid;display:none;">--%>
 <%--				<i class="glyphicon glyphicon-refresh"></i>重置--%>
 <%--			</button>--%>

pqs9000/src/main/webapp/jspJS/utils/deviceTree.js

@@ -275,61 +275,6 @@ function closeHigh() {
 // 模糊搜索name满足条件的节点
 function searchNode(value) {
 
-	// if (value == ""){
-	// 	resetTree()
-	// 	return;
-	// }
-	var treeObj = $.fn.zTree.getZTreeObj("tree");
-	var allNodes = treeObj.getNodes();
-	treeObj.hideNodes(allNodes);
-	var nodes = treeObj.getNodesByParamFuzzy("name", value);// 获取搜索的节点
-
-	closeHigh();
-
-	treeObj.expandAll(false);// 展开第一层节点
-	treeObj.expandNode(treeObj.getNodes()[0], true);
-
-	// 高亮并展开搜索到的节点
-	for (var i = 0; i < nodes.length; i++) {
-		if(nodes[i].nodeType == 5){
-			treeObj.showNode(nodes[i].getParentNode().getParentNode().getParentNode().getParentNode().getParentNode());
-			treeObj.showNode(nodes[i].getParentNode().getParentNode().getParentNode().getParentNode());
-			treeObj.showNode(nodes[i].getParentNode().getParentNode().getParentNode());
-			treeObj.showNode(nodes[i].getParentNode().getParentNode());
-			treeObj.showNode(nodes[i].getParentNode());
-			treeObj.showNode(nodes[i]);
-		}else if(nodes[i].nodeType == 4){
-			treeObj.showNode(nodes[i].getParentNode().getParentNode().getParentNode().getParentNode());
-			treeObj.showNode(nodes[i].getParentNode().getParentNode().getParentNode());
-			treeObj.showNode(nodes[i].getParentNode().getParentNode());
-			treeObj.showNode(nodes[i].getParentNode());
-			treeObj.showNode(nodes[i]);
-			treeObj.showNode(nodes[i].children);
-		}else if(nodes[i].nodeType == 3){
-			var a = nodes[i].getParentNode().getParentNode().getParentNode();
-			treeObj.showNode(nodes[i].getParentNode().getParentNode().getParentNode());
-			treeObj.showNode(nodes[i].getParentNode().getParentNode());
-			treeObj.showNode(nodes[i].getParentNode());
-			treeObj.showNode(nodes[i]);
-			treeObj.showNode(nodes[i].children);
-		}else if(nodes[i].nodeType == 2){
-			treeObj.showNode(nodes[i].getParentNode().getParentNode());
-			treeObj.showNode(nodes[i].getParentNode());
-			treeObj.showNode(nodes[i]);
-			treeObj.showNode(nodes[i].children);
-		}else if(nodes[i].nodeType == 1){
-			treeObj.showNode(nodes[i].getParentNode());
-			treeObj.showNode(nodes[i]);
-			treeObj.showNode(nodes[i].children);
-		}else if(nodes[i].nodeType == 0){
-			treeObj.showNode(nodes[i]);
-			treeObj.showNode(nodes[i].children);
-		}
-		nodes[i].highlight = true;
-		treeObj.updateNode(nodes[i]); // 更新节点，让高亮生效
-		treeObj.expandNode(nodes[i].getParentNode(), true);
-	}
-
 	var hiddenNodes = [];
 	var ztreeObj = $.fn.zTree.getZTreeObj("tree");
 	var keyword=$("#search_value").val();
@@ -345,21 +290,18 @@ function searchNode(value) {
 
 	closeHigh();
 
-	treeObj.expandAll(false);// 展开第一层节点
-	treeObj.expandNode(treeObj.getNodes()[0], true);
-
 	// 高亮并展开搜索到的节点
 	for (var i = 0; i < nodes.length; i++) {
 		nodes[i].highlight = true;
 		treeObj.updateNode(nodes[i]); // 更新节点，让高亮生效
+		if(nodes[i].nodeType == 3){
+			treeObj.expandNode(nodes[i], true);
+		}else {
 			treeObj.expandNode(nodes[i].getParentNode(), true);
 		}
+	}
 	treeObj.selectNode(nodes[0]);
 
-//	treeObj.expandAll(true);
-
-    // $("#serchB").css("display", "none");
-    // $("#resetB").css("display", "");
 }
 /**
  * 查找子结点，如果匹配模糊查询的关键字则返回false，否则返回true
@@ -408,9 +350,9 @@ function searchParent(pNode,keyword){
 	return isexit;
 }
 
-  //查找不符合条件的结点
+//查找不符合条件的结点
-  //返回true表示需要隐藏，返回false表示不需要隐藏 。
+//返回true表示需要隐藏，返回false表示不需要隐藏 。
-  function filterFunc(node){
+function filterFunc(node){
 	var keyword=$("#search_value").val();
 	//如果当前结点或其子节点匹配模糊查询的关键字，则该结点不隐藏
 	if(node.name.indexOf(keyword)!=-1){
@@ -429,7 +371,7 @@ function searchParent(pNode,keyword){
 		}
 	}
 	return true;
-  }
+}
 
 /*******************************************************************************
  * zTree操作deviceTree代码段结束
@@ -471,6 +413,7 @@ function valueChange(value) {
 		closeHigh();
 		resetTree();
 	}else{
+		initTree(treeAllData);
 		searchNode(value);
 	}
 }