1、jar包直接放在lib文件夹下

2、增加hibernate interceptor 修改sql语句适配mycat
3、部分页面修改
4、增加分中心只显示数据展示分中心角色菜单

WebRoot/page/detection/detecWarning/detecWarningList.jsp

@@ -604,6 +604,12 @@
 							    </c:if>
 							    
 						    </c:forEach>
+						    <c:if test="${empty nodeType }">
+						    	<c:forEach items="${allCheckTypeInfo }" var="checkTypeInfo">
+									<option value="${checkTypeInfo.id }" <c:if test="${checkTypeInfo.id eq checkType}">selected ="selected"</c:if>>${checkTypeInfo.checkTypeName1 }</option>
+						    	</c:forEach>
+						    </c:if>
+						    
 						</select>
 					</label>
 					 <label class="divTopText"><font class="selectText">i18n_dwl.text.checkTypeName_n81i</font>

WebRoot/page/detection/monitorData/monitorInfoListNewTopo.jsp

@@ -435,7 +435,7 @@
 		function show(){
 		    hght=0;//恢复滚动条总长，因为$(”#mypage”).scroll事件一触发，又会得到新值，不恢复的话可能会造成判断错误而再次加载……
 		    topH=0;//原因同上。
-		     var urlTmp = encodeURI("<c:url value='monitorData.do?action=queryChild'/>&requestType=${requestType}&nodeGroupId=${nodeGroupId}&pageSize="+'${pageSize }'+"&pageNo="+(++pagePoint)+"&cip="+$("#nodeIp").val()+"&ctn="+$("#checkTypeId").val()+"&stateInfo="+$("#stateInfo").val());
+		     var urlTmp = encodeURI("<c:url value='monitorData.do?action=queryChild'/>&nodeType=${nodeType}&requestType=${requestType}&nodeGroupId=${nodeGroupId}&pageSize="+'${pageSize }'+"&pageNo="+(++pagePoint)+"&cip="+$("#nodeIp").val()+"&ctn="+$("#checkTypeId").val()+"&stateInfo="+$("#stateInfo").val());
 			$.ajax({
 				url:urlTmp,
 				type : "get",

WebRoot/page/detection/monitorData/serverMonitorInfoListNew.jsp

@@ -450,7 +450,7 @@
 		function show(){
 		    hght=0;//恢复滚动条总长，因为$(”#mypage”).scroll事件一触发，又会得到新值，不恢复的话可能会造成判断错误而再次加载……
 		    topH=0;//原因同上。
-		   var urlTmp = encodeURI("<c:url value='monitorData.do?action=queryChild'/>&pageSize="+'${pageSize }'+"&pageNo="+(++pagePoint)+"&cip="+$("#nodeIp").val()+"&ctn="+$("#checkTypeId").val()+"&stateInfo="+$("#stateInfo").val()+"&nodeGroupStr=${nodeGroupStr}&nodeIpRange=${nodeIpRange}");
+		   var urlTmp = encodeURI("<c:url value='monitorData.do?action=queryChild'/>&pageSize="+'${pageSize }'+"&pageNo="+(++pagePoint)+"&cip="+$("#nodeIp").val()+"&ctn="+$("#checkTypeId").val()+"&stateInfo="+$("#stateInfo").val()+"&nodeGroupStr=${nodeGroupStr}&nodeIpRange=${nodeIpRange}&checkType=${checkType }");
 			$.ajax({
 				url:urlTmp,
 				type : "get",

WebRoot/page/detection/switchInfo/switchDetectInfoGraphPage.jsp

@@ -389,6 +389,11 @@
 			 jQuery("#portInfoPicXt").show();
 		}
 	  
+	    Highcharts.setOptions( {
+			global : {
+				useUTC : false
+			}
+		});
 		function createChart(policeNum,dto,numberFormat,unit,tab) {
 		            if(numberFormat==undefined||numberFormat==null) {
 		            	numberFormat=0;//数字保留几位小数
@@ -586,11 +591,7 @@
 							text: 'i18n_sdigp.message.updateTheMarker_n81i'
 						}
 					});
-					Highcharts.setOptions( {
-						global : {
-							useUTC : false
-						}
-					});
+					
 		}
 		
 		function doSvgFun(){

WebRoot/page/show/show3DRoom.jsp

@@ -218,14 +218,14 @@ body {
    				var e = event ? event : window.event;
 		        x = e.clientX;
 		        y = e.clientY;
-				  style.left = x + window.document.body.scrollLeft-200 ;  
-			      style.top =  y + window.document.body.scrollTop-50;  
+				  style.right = x + window.document.body.scrollLeft-200 ;  
+			      style.bottom =  y + window.document.body.scrollTop-50;  
    			}else if(navigator.userAgent.indexOf("Chrome")>0){
    				var e = event ? event : window.event;
 		        x = e.clientX;
 		        y = e.clientY;
-				  style.left = x + window.document.body.scrollLeft-200 ;  
-			      style.top =  y + window.document.body.scrollTop-50;
+				  style.right = x + window.document.body.scrollLeft-200 ;  
+			      style.bottom =  y + window.document.body.scrollTop-50;
    			}		      
 	     }  
 	     	

WebRoot/page/show/showNodeRoom.jsp

@@ -149,10 +149,10 @@ body {
 		 				raphael.text(roomStartX+220,roomBJY+roomTitleGap,titleTtext).attr({'font-size':12,fill:"#000000"});
 		 			</c:when>
 		 			<c:when test="${session.i18n_lang == 'zh_CN'}">
-	 					raphael.text(roomStartX+120,roomBJY+roomTitleGap,titleTtext).attr({'font-size':12,fill:"#000000"});
+	 					raphael.text(roomStartX+220,roomBJY+roomTitleGap,titleTtext).attr({'font-size':12,fill:"#000000"});
 	 				</c:when>
 		 			<c:when test="${session.i18n_lang == 'en_US'}">
-	 					raphael.text(roomStartX+150,roomBJY+roomTitleGap,titleTtext).attr({'font-size':12,fill:"#000000"});
+	 					raphael.text(roomStartX+220,roomBJY+roomTitleGap,titleTtext).attr({'font-size':12,fill:"#000000"});
 	 				</c:when>
 		 		</c:choose>
 		 		//raphael.text(roomStartX+120,roomBJY+roomTitleGap,titleTtext).attr({'font-size':12,fill:"#000000"});
@@ -448,11 +448,13 @@ body {
 						 	});
 						 	
 						 	//写节点机在机柜中的序号
-						 	var nodeShowInd = 0;
+						 	var nodeShowInd = nodeIndex;
 						 	for(var i = 1;i<=nodeIndex;i++){
 						 		if(nodeIndexs[i] != null &&nodeIndexs[i] != ""){
-						 			nodeShowInd++;
+						 			//nodeShowInd++;
 						 			raphaelBox.text(nodeIndexs[i].x,nodeIndexs[i].y,nodeShowInd).attr({'font-size':12,fill:"#000000"});
+						 			nodeShowInd--;
+						 			
 						 		}
 						 	}
 						 	window.top.layer.close(loading);