diff --git a/src/main/webapp/static/pages/scripts/echart.js b/src/main/webapp/static/pages/scripts/echart.js
index 716bc023f..bffd386e5 100644
--- a/src/main/webapp/static/pages/scripts/echart.js
+++ b/src/main/webapp/static/pages/scripts/echart.js
@@ -87,10 +87,20 @@
     	var data=new Array();
     	var drillData=new Array();
     	var unit="bytes";
+    	var  minCount = 0;
+    	for (var int = rs.length-1; int >= 0; int--) {
+    		if(rs[int].count>0){
+    			minCount=rs[int].count;
+    			break;
+    		}
+    	}
     	$(rs).each(function(i, d) {
-    		var inoctetsNum=d.count;
-        	unit=changeUnit(inoctetsNum);
-        	inoctetsNum=changeNum(inoctetsNum);
+//    		var inoctetsNum=d.count;
+//        	unit=changeUnit(inoctetsNum);
+//        	inoctetsNum=changeNum(inoctetsNum);
+        	var mapNum=getUnit(minCount,d.count);
+    		var inoctetsNum=mapNum.sum;
+    		unit=mapNum.unit;
 //    		var pktNum=new Array();
 //    		var byteLen=new Array();
 			//协议图-操作系统
@@ -540,10 +550,20 @@
     	var xData=new Array();
     	var drillData=new Array();
     	var unit="bytes";
+    	var  minCount = 0;
+    	for (var int = rs.length-1; int >= 0; int--) {
+    		if(rs[int].count>0){
+    			minCount=rs[int].count;
+    			break;
+    		}
+    	}
     	$(rs).each(function(i, d) {
-        	var inoctetsNum=d.count;
-        	unit=changeUnit(inoctetsNum);
-        	inoctetsNum=changeNum(inoctetsNum);
+    		var mapNum=getUnit(minCount,d.count);
+  //      	var inoctetsNum=d.count;
+  //      	unit=changeUnit(inoctetsNum);
+  //      	inoctetsNum=changeNum(inoctetsNum);
+    		var inoctetsNum=mapNum.sum;
+    		unit=mapNum.unit;
     		var pktNum=new Array();
     		var byteLen=new Array();
     		xData.push(d.appType);
@@ -681,7 +701,7 @@
     		tooltip: {
     			enabled: true,
     			headerFormat: '<span style="font-size:10px"><b>{point.key}</span><br>',
-    			pointFormat: '{point.y:.1f} <b> '+unit,
+    			pointFormat: '{point.y:.2f} <b> '+unit,
     			shared: true,
     			useHTML: true
     		},
@@ -732,10 +752,20 @@ function echart_2(rs){
 	var data=new Array();
 	var drillData=new Array();
 	var unit="bytes";
+	var  minCount = 0;
+	for (var int = rs.length-1; int >= 0; int--) {
+		if(rs[int].count>0){
+			minCount=rs[int].count;
+			break;
+		}
+	}
 	$(rs).each(function(i, d) {
-		var inoctetsNum=d.count;
-    	unit=changeUnit(inoctetsNum);
-    	inoctetsNum=changeNum(inoctetsNum);
+//		var inoctetsNum=d.count;
+//    	unit=changeUnit(inoctetsNum);
+//    	inoctetsNum=changeNum(inoctetsNum);
+    	var mapNum=getUnit(minCount,d.count);
+		var inoctetsNum=mapNum.sum;
+		unit=mapNum.unit;
 //		var pktNum=new Array();
 //		var byteLen=new Array();
 		data.push({
@@ -882,10 +912,20 @@ function echart_5(rs){
 	var data=new Array();
 	var drillData=new Array();
 	var unit="bytes";
+	var  minCount = 0;
+	for (var int = rs.length-1; int >= 0; int--) {
+		if(rs[int].count>0){
+			minCount=rs[int].count;
+			break;
+		}
+	}
 	$(rs).each(function(i, d) {
-		var inoctetsNum=d.count;
-    	unit=changeUnit(inoctetsNum);
-    	inoctetsNum=changeNum(inoctetsNum);
+//		var inoctetsNum=d.count;
+//    	unit=changeUnit(inoctetsNum);
+//    	inoctetsNum=changeNum(inoctetsNum);
+    	var mapNum=getUnit(minCount,d.count);
+		var inoctetsNum=mapNum.sum;
+		unit=mapNum.unit;
 //		var pktNum=new Array();
 //		var byteLen=new Array();
 		//协议图-操作系统
@@ -1039,10 +1079,20 @@ function echart_4(rs){
 	var data=new Array();
 //	var drillData=new Array();
 	var unit="bytes";
+	var  minCount = 0;
+	for (var int = rs.length-1; int >= 0; int--) {
+		if(rs[int].count>0){
+			minCount=rs[int].count;
+			break;
+		}
+	}
 		$(rs).each(function(i, d) {
-			var inoctetsNum=d.count;
-	    	unit=changeUnit(inoctetsNum);
-	    	inoctetsNum=changeNum(inoctetsNum);
+//			var inoctetsNum=d.count;
+//	    	unit=changeUnit(inoctetsNum);
+//	    	inoctetsNum=changeNum(inoctetsNum);
+	    	var mapNum=getUnit(minCount,d.count);
+    		var inoctetsNum=mapNum.sum;
+    		unit=mapNum.unit;
 	//		var pktNum=new Array();
 	//		var byteLen=new Array();
 			data.push({
@@ -1182,10 +1232,20 @@ function echart_6(rs){
 	var data=new Array();
 //	var drillData=new Array();
 	var unit="bytes";
+	var  minCount = 0;
+	for (var int = rs.length-1; int >= 0; int--) {
+		if(rs[int].count>0){
+			minCount=rs[int].count;
+			break;
+		}
+	}
 	$(rs).each(function(i, d) {
-		var inoctetsNum=d.count;
-    	unit=changeUnit(inoctetsNum);
-    	inoctetsNum=changeNum(inoctetsNum);
+//		var inoctetsNum=d.count;
+//    	unit=changeUnit(inoctetsNum);
+//    	inoctetsNum=changeNum(inoctetsNum);
+    	var mapNum=getUnit(minCount,d.count);
+		var inoctetsNum=mapNum.sum;
+		unit=mapNum.unit;
 //		var pktNum=new Array();
 //		var byteLen=new Array();
 		//协议图-操作系统
@@ -1331,26 +1391,36 @@ function echart_topic_domain(rs){
 	    color:'#265197'
 	}];
 	var unit="bytes";
+	var  minCount = 0;
+	for (var int = rs.length-1; int >= 0; int--) {
+		if(rs[int].count>0){
+			minCount=rs[int].count;
+			break;
+		}
+	}
 	$(rs).each(function(i,d){
 		var inoctetsNum=d.count;
-		var inoctetsNumK=inoctetsNum/1024;
-		var inoctetsNumM=inoctetsNumK/1024;
-		var inoctetsNumG=inoctetsNumM/1024;
-			inoctetsNum=inoctetsNumG;
-			inoctetsNum=Math.round(inoctetsNum*100)/100;
+//		var inoctetsNumK=inoctetsNum/1024;
+//		var inoctetsNumM=inoctetsNumK/1024;
+//		var inoctetsNumG=inoctetsNumM/1024;
+//			inoctetsNum=inoctetsNumG;
+//			inoctetsNum=Math.round(inoctetsNum*100)/100;
 		
-    	unit="GB";
+		 unit="GB";
     	if(inoctetsNum>0){
 		/****主题中的子域名*******/
     	var topicData=0;
     	
 		$(d.domainData).each(function(j,t){
-			var domainNum=t.byteCount;
-			var domainNumK=domainNum/1024;
-			var domainNumM=domainNumK/1024;
-			var domainNumG=domainNumM/1024;
-				domainNum=domainNumG;
-				domainNum=Math.round(domainNum*100)/100;
+//			var domainNum=t.byteCount;
+//			var domainNumK=domainNum/1024;
+//			var domainNumM=domainNumK/1024;
+//			var domainNumG=domainNumM/1024;
+//				domainNum=domainNumG;
+//				domainNum=Math.round(domainNum*100)/100;
+				var mapNum=getUnit(minCount,t.byteCount);
+				var domainNum=mapNum.sum;
+		    	unit=mapNum.unit;
 				topicData=topicData+domainNum;
 	    		data.push({
 	    			'id': '2.'+t.webId,
@@ -1582,3 +1652,82 @@ function addDateName(){
 	var now=year+""+month+""+date+""+h+""+m+""+s;
 	return now;
 }
+// minCount Topic 最小的count值    
+function getUnit(minCount,count){
+    var unit="bytes";
+    if(minCount >0){
+    	var countk1=minCount/1024;
+    	var sumk1=Math.round(countk1*100)/100;
+    	if(sumk1>0){
+    		var countm1=countk1/1024;
+    		var summ1=Math.round(countm1*100)/100;
+    		if(summ1>0){
+    			var countg1=countm1/1024;
+    			var sumg1=Math.round(countg1*100)/100;
+    			if(sumg1>0){
+    				unit="GB";
+    			}else{
+    				unit="MB";
+    			}
+    		}else{
+    			unit="KB";
+    		}
+    	}else{
+    		unit="bytes";
+    	}
+    }
+	var map={};
+	if(count >=0){
+		if(unit =="bytes"){
+			map.unit=unit;
+			map.sum=count;
+		}else if(unit =="KB"){
+			var countk=count/1024;
+			var sumk=Math.round(countk*100)/100;
+			map.unit=unit;
+			map.sum=sumk;
+		}else if(unit =="MB"){
+			var countk=count/1024;
+			var countm=countk/1024;
+			var summ=Math.round(countm*100)/100;
+			map.unit=unit;
+			map.sum=summ;
+		}else if(unit =="GB"){
+			var countk=count/1024;
+			var countm=countk/1024;
+			var countg=countm/1024;
+			var sumg=Math.round(countg*100)/100;
+			map.unit=unit;
+			map.sum=sumg;
+		}
+	}
+	return map;
+//	if(count >=0){
+//		var countk=count/1024;
+//		var sumk=Math.round(countk*100)/100;
+//		if(sumk>0){
+//			var countm=countk/1024;
+//			var summ=Math.round(countm*100)/100;
+//			if(summ>0){
+//				var countg=countm/1024;
+//				var sumg=Math.round(countg*100)/100;
+//				if(sumg>0){
+//					map.unit="GB";
+//					map.sum=sumg;
+//				}else{
+//					map.unit="MB";
+//					map.sum=summ; 
+//				}
+//			}else{
+//				map.unit="KB";
+//				map.sum=sumk; 
+//			}
+//		}else{
+//			map.unit="bytes";
+//			map.sum=count;
+//		}
+//	}else{
+//		map.unit="bytes";
+//		map.sum=0;
+//	}
+}
\ No newline at end of file