Authored by jack

Merge branch 'dev_linlong'

... ... @@ -154,7 +154,7 @@
,
{
title: "可用/总内存(MB)",
width: "180px",
width: "170px",
// field: "url"
formatter: function (value, rowData, rowIndex) {
var array = rowData.mem.split("\r\n");
... ... @@ -167,7 +167,7 @@
,
{
title: "网络I/O(Mbps)",
width: "130px",
width: "120px",
// field: "url"
formatter: function (value, rowData, rowIndex) {
var array = rowData.net.split("\r\n");
... ... @@ -240,7 +240,22 @@
div = div+ "<div style='height:30px;'>"+array[i]+"</div>";
return div;
}
}, {
},
{
title: "延迟",
width: "90px",
// field: "hitRate"
formatter: function (value, rowData, rowIndex) {
if(typeof(rowData.diff)=="undefined"){
return "";
}
var array = rowData.diff.split("\r\n");
var div = "";
for(var i=0;i<array.length;i++)
div = div+ "<div style='height:30px;'>"+array[i]+"</div>";
return div;
}
},{
title: "使用内存",
width:"80px",
// field: "useMemory"
... ...