gfwleak/nms-nmsweb
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.10.125/nms/nmsweb.git into dev

Browse Source
This commit is contained in:
wangwenrui
2018-11-21 17:08:59 +08:00
parent 3a4e33827d cd418ea458
commit 7432d5cfd0
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
WebRoot/page/systemManage/topoManage/topoManageIndex.jsp
View File

@@ -30,17 +30,18 @@
<script type="text/javascript"> <script type="text/javascript">
//页面初始化 回显节点对应信息 //页面初始化 回显节点对应信息
// type 1 为节点组 2 为节点 3为 空 4为 topo图
$(function(){ $(function(){
$("input[name^='topoNodeType']:checked").each(function(index,data){ $("input[name^='topoNodeType']:checked").each(function(index,data){
var radioValue=$(data).val(); var radioValue=$(data).val();
if(radioValue==1){ if(radioValue==2){
$("#topoInfo"+index).hide(); $("#topoInfo"+index).hide();
$("#chooseGroupNode"+index).show(); $("#chooseGroupNode"+index).show();
$("#topoNodeOne"+index).show(); $("#topoNodeOne"+index).show();
$("#topoNodeTwo"+index).show(); $("#topoNodeTwo"+index).show();
$("#chooseType").val(1); $("#chooseType").val(1);
$('#chooseIndex').val(index); $('#chooseIndex').val(index);
}else if(radioValue==2){ }else if(radioValue==1){
$("#topoInfo"+index).hide(); $("#topoInfo"+index).hide();
$("#chooseGroupNode"+index).show(); $("#chooseGroupNode"+index).show();
$("#topoNodeOne"+index).hide(); $("#topoNodeOne"+index).hide();
@@ -66,6 +67,13 @@
}) })
function selectNodeAndNodeGroup(index) { function selectNodeAndNodeGroup(index) {
$('#chooseIndex').val(index);
var nodeType = $('input[name="topoNodeType'+index+'"]:checked').val();
if(nodeType==2){
$("#chooseType").val(1);
}else{
$("#chooseType").val(0);
}
var groupId = $('#nodeGroupId'+index).val();//选中节点组 var groupId = $('#nodeGroupId'+index).val();//选中节点组
var nodeId = $('#nodeId'+index).val();//选中ip var nodeId = $('#nodeId'+index).val();//选中ip
var url = "<%=path%>/nodeGroupManage/nodeGroupManage!executeAction.do?action=toSelectNodeAndNodeGroup&type=topoManage&groupId="+groupId+"&nodeId="+nodeId; //转向网页的地址; var url = "<%=path%>/nodeGroupManage/nodeGroupManage!executeAction.do?action=toSelectNodeAndNodeGroup&type=topoManage&groupId="+groupId+"&nodeId="+nodeId; //转向网页的地址;
@@ -109,7 +117,7 @@
$("#topoNodeTwo"+index).hide(); $("#topoNodeTwo"+index).hide();
$("#chooseType").val(0); $("#chooseType").val(0);
$('#chooseIndex').val(index); $('#chooseIndex').val(index);
}else if(value==2){ }else if(value==1){
$("#topoInfo"+index).hide(); $("#topoInfo"+index).hide();
$("#chooseGroupNode"+index).show(); $("#chooseGroupNode"+index).show();
$("#topoNodeOne"+index).hide(); $("#topoNodeOne"+index).hide();
@@ -140,7 +148,7 @@
var data={}; var data={};
topoManageInfo.nodeId=$('#topoNodeInfoId'+index).val(); topoManageInfo.nodeId=$('#topoNodeInfoId'+index).val();
topoManageInfo.nodeType=radioValue; topoManageInfo.nodeType=radioValue;
if(radioValue==1){ if(radioValue==2){
if(nodeIds==null||nodeIds==undefined||nodeIds==''){ if(nodeIds==null||nodeIds==undefined||nodeIds==''){
alert("i18n_topoManage.topoNodeError1_n81i"); alert("i18n_topoManage.topoNodeError1_n81i");
flag=false; flag=false;
@@ -151,7 +159,7 @@
return; return;
} }
topoManageInfo.nodeTypeId=nodeIds; topoManageInfo.nodeTypeId=nodeIds;
}else if(radioValue==2){ }else if(radioValue==1){
if(groupIds==null||groupIds==undefined||groupIds==''){ if(groupIds==null||groupIds==undefined||groupIds==''){
alert("i18n_topoManage.topoNodeGroupError1_n81i"); alert("i18n_topoManage.topoNodeGroupError1_n81i");
flag=false; flag=false;
@@ -299,10 +307,10 @@
<c:forEach items="${typeList}" var="type"> <c:forEach items="${typeList}" var="type">
<c:choose> <c:choose>
<c:when test='${type==topoManageInfo.topoNodeInfo.type}'> <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:when>
<c:otherwise> <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:otherwise>
</c:choose> </c:choose>
</c:forEach> </c:forEach>

4
src/nis/nms/web/actions/sysManage/TopoManageAction.java
View File

@@ -100,7 +100,7 @@ public class TopoManageAction extends BaseAction{
for (TopoNodeInfo topoInfo : topoNodeList) { for (TopoNodeInfo topoInfo : topoNodeList) {
topoManageInfo=new TopoManageInfo(); topoManageInfo=new TopoManageInfo();
topoManageInfo.setTopoNodeInfo(topoInfo); 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()); List nodeTables = this.commonService.find("from NodeTable where 1=1 and id=?",topoInfo.getTypeId());
nodeTable = (NodeTable)nodeTables.get(0); nodeTable = (NodeTable)nodeTables.get(0);
List find = this.commonService.find("from NodegroupTable where 1=1 and id=?",nodeTable.getGroupId()); 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.setNodeGroupId(nodeTable.getGroupId());
topoManageInfo.setNodeId(nodeTable.getNodeId()); topoManageInfo.setNodeId(nodeTable.getNodeId());
topoManageInfo.setNodeName(nodeTable.getNodeIp()); 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()); List find = this.commonService.find("from NodegroupTable where 1=1 and id=?",topoInfo.getTypeId());
nodegroupTable = (NodegroupTable) find.get(0); nodegroupTable = (NodegroupTable) find.get(0);
topoManageInfo.setNodeGroupName(nodegroupTable.getGroupName()); topoManageInfo.setNodeGroupName(nodegroupTable.getGroupName());