From 74b0e38b53232fdb92f6c91a08a7587ad723051f Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@nismail.iie.ac.cn>
Date: Wed, 21 Nov 2018 19:17:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4putty=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebRoot/common/remoteConn.jsp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/WebRoot/common/remoteConn.jsp b/WebRoot/common/remoteConn.jsp
index f14321e..a3e128d 100644
--- a/WebRoot/common/remoteConn.jsp
+++ b/WebRoot/common/remoteConn.jsp
@@ -28,7 +28,7 @@
 	<script language="javascript" type="text/javascript">
 	//---------2012-7-2 用于远程连接时，若没有指定操作系统弹出选择框
 	$(function() {
-		$( "#dialog:ui-dialog" ).dialog( "destroy" );
+ 		$( "#dialog:ui-dialog" ).dialog( "destroy" );
 		var	tips = $( ".validateTips" );
 	
 		function updateTips( t ) {
@@ -75,14 +75,20 @@
 	
 	function remoteConn(nodeSysType,ip,nodeType, btn){//nodeSysType 操作系统类型   ip 远程连接的节点IP nodeType 节点类型
 		assistEl = btn;
+		if(nodeSysType == null || nodeSysType == ""){
+			nodeSysType="1";
+		}
+		
 		triggerEl = document.getElementById('trigger_protocol_ifrm');
 		
 		if(nodeType != null && nodeType != "" && nodeType != "0"){// 节点类型不是服务器，即是交换机，则默认使用Telnet连接
 			runRemoteConn('3', ip)
-		} else if (nodeSysType == null || nodeSysType == "") {// 节点类型是服务器，则判断系统类型
+		} 
+		/* else if (nodeSysType == null || nodeSysType == "") {// 节点类型是服务器，则判断系统类型
 			$("#ip").val(ip);
 			$("#dialog").dialog("open");
-		} else {
+		}  */
+		else {
 			runRemoteConn(nodeSysType, ip);
 		}
 	}