Merge branch 'dev_linlong'
Showing
1 changed file
with
18 additions
and
3 deletions
| @@ -154,7 +154,7 @@ | @@ -154,7 +154,7 @@ | ||
| 154 | , | 154 | , |
| 155 | { | 155 | { |
| 156 | title: "可用/总内存(MB)", | 156 | title: "可用/总内存(MB)", |
| 157 | - width: "180px", | 157 | + width: "170px", |
| 158 | // field: "url" | 158 | // field: "url" |
| 159 | formatter: function (value, rowData, rowIndex) { | 159 | formatter: function (value, rowData, rowIndex) { |
| 160 | var array = rowData.mem.split("\r\n"); | 160 | var array = rowData.mem.split("\r\n"); |
| @@ -167,7 +167,7 @@ | @@ -167,7 +167,7 @@ | ||
| 167 | , | 167 | , |
| 168 | { | 168 | { |
| 169 | title: "网络I/O(Mbps)", | 169 | title: "网络I/O(Mbps)", |
| 170 | - width: "130px", | 170 | + width: "120px", |
| 171 | // field: "url" | 171 | // field: "url" |
| 172 | formatter: function (value, rowData, rowIndex) { | 172 | formatter: function (value, rowData, rowIndex) { |
| 173 | var array = rowData.net.split("\r\n"); | 173 | var array = rowData.net.split("\r\n"); |
| @@ -240,7 +240,22 @@ | @@ -240,7 +240,22 @@ | ||
| 240 | div = div+ "<div style='height:30px;'>"+array[i]+"</div>"; | 240 | div = div+ "<div style='height:30px;'>"+array[i]+"</div>"; |
| 241 | return div; | 241 | return div; |
| 242 | } | 242 | } |
| 243 | - }, { | 243 | + }, |
| 244 | + { | ||
| 245 | + title: "延迟", | ||
| 246 | + width: "90px", | ||
| 247 | + // field: "hitRate" | ||
| 248 | + formatter: function (value, rowData, rowIndex) { | ||
| 249 | + if(typeof(rowData.diff)=="undefined"){ | ||
| 250 | + return ""; | ||
| 251 | + } | ||
| 252 | + var array = rowData.diff.split("\r\n"); | ||
| 253 | + var div = ""; | ||
| 254 | + for(var i=0;i<array.length;i++) | ||
| 255 | + div = div+ "<div style='height:30px;'>"+array[i]+"</div>"; | ||
| 256 | + return div; | ||
| 257 | + } | ||
| 258 | + },{ | ||
| 244 | title: "使用内存", | 259 | title: "使用内存", |
| 245 | width:"80px", | 260 | width:"80px", |
| 246 | // field: "useMemory" | 261 | // field: "useMemory" |
-
Please register or login to post a comment