Merge pull request #405 from xxxllluuu/master

fix issue 404
uavorg · Sep 21, 2018 · ae3629f · ae3629f
2 parents 4e9f869 + 2d53896
commit ae3629f
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/com.creditease.uav.console/src/main/webapp/uavapp_godeye/timesandtable/js/uav.tstable.js b/com.creditease.uav.console/src/main/webapp/uavapp_godeye/timesandtable/js/uav.tstable.js
@@ -1045,10 +1045,7 @@ var PageClass = {
 		var appMetrics = $("#appmetrics").find("div");
 
 		//ID format
-		var appmetricsInstid = appurl;
-		if(appmetricsInstid.indexOf(appid) >= 0){
-			appmetricsInstid = appmetricsInstid.substring(0,appmetricsInstid.indexOf(appid)-1);
-		}
+		var appmetricsInstid = getJVMMetricsInstid(appurl,appid);
 
 		$.each(appMetrics,function(index,obj){
 			if(obj.className.indexOf("userSelect") >=0){
@@ -2422,6 +2419,19 @@ function getClienttId(appurl,appid,ip,clientHtmlId){
 	instid =   instid +"#"+ appid +"#"+clientHtmlId;
 	return instid;
 }
+
+function getJVMMetricsInstid(appurl,appid){
+	if(appurl.indexOf(appid) >= 0){
+		return appurl.substring(0,appurl.indexOf(appid)-1);
+	}
+
+	if(appurl.substring(appurl.length-1)=="/"){
+		return appurl.substring(0,appurl.length-1);
+	}
+
+	return appurl;
+}
+
 function getIpByAppurl(appUrl) {
 	var ip;
 	var isJse = appUrl.indexOf("http:") == -1?true:false;