From 963dc1f56c2b81f026b70671fa210052647e6848 Mon Sep 17 00:00:00 2001
From: default <default@DESKTOP-7FEGRP2>
Date: Wed, 21 Nov 2018 14:23:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8B=93=E6=89=91?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8A=9F=E8=83=BD=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=88=96=E8=8A=82=E7=82=B9=E7=BB=84=E6=97=B6?=
 =?UTF-8?q?=E5=85=88=E5=88=87=E6=8D=A2=E7=B1=BB=E5=9E=8B=E6=89=8D=E8=83=BD?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebRoot/page/systemManage/topoManage/topoManageIndex.jsp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/WebRoot/page/systemManage/topoManage/topoManageIndex.jsp b/WebRoot/page/systemManage/topoManage/topoManageIndex.jsp
index f963248..b08fa95 100644
--- a/WebRoot/page/systemManage/topoManage/topoManageIndex.jsp
+++ b/WebRoot/page/systemManage/topoManage/topoManageIndex.jsp
@@ -66,6 +66,13 @@
 		})
 	
 		function selectNodeAndNodeGroup(index) {
+			$('#chooseIndex').val(index);
+			var nodeType = $('input[name="topoNodeType'+index+'"]:checked').val();
+			if(nodeType==1){
+				$("#chooseType").val(1);
+			}else{
+				$("#chooseType").val(0);
+			}
 			var groupId = $('#nodeGroupId'+index).val();//选中节点组
 			var nodeId = $('#nodeId'+index).val();//选中ip	
 			var url = "<%=path%>/nodeGroupManage/nodeGroupManage!executeAction.do?action=toSelectNodeAndNodeGroup&type=topoManage&groupId="+groupId+"&nodeId="+nodeId; //转向网页的地址;

From cd418ea458e6949cad81041be292b109b7261c4b Mon Sep 17 00:00:00 2001
From: default <default@DESKTOP-7FEGRP2>
Date: Wed, 21 Nov 2018 15:57:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?update=20=20=20topo=E9=85=8D=E7=BD=AEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../systemManage/topoManage/topoManageIndex.jsp | 17 +++++++++--------
 .../web/actions/sysManage/TopoManageAction.java |  4 ++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/WebRoot/page/systemManage/topoManage/topoManageIndex.jsp b/WebRoot/page/systemManage/topoManage/topoManageIndex.jsp
index b08fa95..91dd899 100644
--- a/WebRoot/page/systemManage/topoManage/topoManageIndex.jsp
+++ b/WebRoot/page/systemManage/topoManage/topoManageIndex.jsp
@@ -30,17 +30,18 @@
 	
 	<script type="text/javascript">
 		//页面初始化 回显节点对应信息
+		// type 1 为节点组  2 为节点 3为 空  4为 topo图
 		$(function(){
 			$("input[name^='topoNodeType']:checked").each(function(index,data){
 				var radioValue=$(data).val();
-				if(radioValue==1){
+				if(radioValue==2){
 					$("#topoInfo"+index).hide();
 					$("#chooseGroupNode"+index).show();
 					$("#topoNodeOne"+index).show();
 					$("#topoNodeTwo"+index).show();
 					$("#chooseType").val(1);
 					$('#chooseIndex').val(index);
-				}else if(radioValue==2){
+				}else if(radioValue==1){
 					$("#topoInfo"+index).hide();
 					$("#chooseGroupNode"+index).show();
 					$("#topoNodeOne"+index).hide();
@@ -68,7 +69,7 @@
 		function selectNodeAndNodeGroup(index) {
 			$('#chooseIndex').val(index);
 			var nodeType = $('input[name="topoNodeType'+index+'"]:checked').val();
-			if(nodeType==1){
+			if(nodeType==2){
 				$("#chooseType").val(1);
 			}else{
 				$("#chooseType").val(0);
@@ -116,7 +117,7 @@
 				$("#topoNodeTwo"+index).hide();
 				$("#chooseType").val(0);
 				$('#chooseIndex').val(index);
-			}else if(value==2){
+			}else if(value==1){
 				$("#topoInfo"+index).hide();
 				$("#chooseGroupNode"+index).show();
 				$("#topoNodeOne"+index).hide();
@@ -147,7 +148,7 @@
 				var data={};
 				topoManageInfo.nodeId=$('#topoNodeInfoId'+index).val();
 				topoManageInfo.nodeType=radioValue;
-				if(radioValue==1){
+				if(radioValue==2){
 					if(nodeIds==null||nodeIds==undefined||nodeIds==''){
 						alert("i18n_topoManage.topoNodeError1_n81i");
 						flag=false;
@@ -158,7 +159,7 @@
 						return;
 					}
 					topoManageInfo.nodeTypeId=nodeIds;
-				}else if(radioValue==2){
+				}else if(radioValue==1){
 					if(groupIds==null||groupIds==undefined||groupIds==''){
 						alert("i18n_topoManage.topoNodeGroupError1_n81i");
 						flag=false;
@@ -306,10 +307,10 @@
 												<c:forEach items="${typeList}" var="type">
 													<c:choose>
 														<c:when test='${type==topoManageInfo.topoNodeInfo.type}'>
-															<input type='radio' status='${status.index}' value='${type}' name='topoNodeType${status.index}' checked='checked'  onchange="chooseTopoNodeType(this)"/><c:if test='${type==1}'>i18n_topoManage.topoNode_n81i</c:if><c:if test='${type==2}'>i18n_topoManage.topoNodeGroup_n81i</c:if><c:if test='${type==3}'>i18n_topoManage.topoNone_n81i</c:if><c:if test='${type==4}'>i18n_topoManage.topoPicture_n81i</c:if>
+															<input type='radio' status='${status.index}' value='${type}' name='topoNodeType${status.index}' checked='checked'  onchange="chooseTopoNodeType(this)"/><c:if test='${type==2}'>i18n_topoManage.topoNode_n81i</c:if><c:if test='${type==1}'>i18n_topoManage.topoNodeGroup_n81i</c:if><c:if test='${type==3}'>i18n_topoManage.topoNone_n81i</c:if><c:if test='${type==4}'>i18n_topoManage.topoPicture_n81i</c:if>
 														</c:when>
 														<c:otherwise>
-															<input type='radio' status='${status.index}' name='topoNodeType${status.index}' value='${type}' onchange="chooseTopoNodeType(this)"/><c:if test='${type==1}'>i18n_topoManage.topoNode_n81i</c:if><c:if test='${type==2}'>i18n_topoManage.topoNodeGroup_n81i</c:if><c:if test='${type==3}'>i18n_topoManage.topoNone_n81i</c:if><c:if test='${type==4}'>i18n_topoManage.topoPicture_n81i</c:if>
+															<input type='radio' status='${status.index}' name='topoNodeType${status.index}' value='${type}' onchange="chooseTopoNodeType(this)"/><c:if test='${type==2}'>i18n_topoManage.topoNode_n81i</c:if><c:if test='${type==1}'>i18n_topoManage.topoNodeGroup_n81i</c:if><c:if test='${type==3}'>i18n_topoManage.topoNone_n81i</c:if><c:if test='${type==4}'>i18n_topoManage.topoPicture_n81i</c:if>
 														</c:otherwise>
 													</c:choose>
 												</c:forEach>
diff --git a/src/nis/nms/web/actions/sysManage/TopoManageAction.java b/src/nis/nms/web/actions/sysManage/TopoManageAction.java
index 094e61d..46b6b47 100644
--- a/src/nis/nms/web/actions/sysManage/TopoManageAction.java
+++ b/src/nis/nms/web/actions/sysManage/TopoManageAction.java
@@ -100,7 +100,7 @@ public class TopoManageAction extends BaseAction{
 						for (TopoNodeInfo topoInfo : topoNodeList) {
 							topoManageInfo=new TopoManageInfo();
 							topoManageInfo.setTopoNodeInfo(topoInfo);
-							if(topoInfo.getType()==1L){
+							if(topoInfo.getType()==2L){
 								List nodeTables = this.commonService.find("from NodeTable where 1=1 and id=?",topoInfo.getTypeId());
 								nodeTable = (NodeTable)nodeTables.get(0);
 								List find = this.commonService.find("from NodegroupTable where 1=1 and id=?",nodeTable.getGroupId());
@@ -109,7 +109,7 @@ public class TopoManageAction extends BaseAction{
 								topoManageInfo.setNodeGroupId(nodeTable.getGroupId());
 								topoManageInfo.setNodeId(nodeTable.getNodeId());
 								topoManageInfo.setNodeName(nodeTable.getNodeIp());
-							}else if(topoInfo.getType()==2L){
+							}else if(topoInfo.getType()==1L){
 								List find = this.commonService.find("from NodegroupTable where 1=1 and id=?",topoInfo.getTypeId());
 								nodegroupTable = (NodegroupTable) find.get(0);
 								topoManageInfo.setNodeGroupName(nodegroupTable.getGroupName());