fix beego#1877

qiaoshuai2566348 · Sep 13, 2016 · 58ffc6f · 58ffc6f
1 parent d5fb74a
commit 58ffc6f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/adminui.go b/adminui.go
@@ -78,13 +78,14 @@ var qpsTpl = `{{define "content"}}
 	{{range $i, $elem := .Content.Data}}
 
 	<tr>
-		{{range $elem}}
-			<td>
-			{{.}}
-			</td>
-		{{end}}
+	    <td>{{index $elem 0}}</td>
+	    <td>{{index $elem 1}}</td>
+	    <td>{{index $elem 2}}</td>
+	    <td data-order="{{index $elem 3}}">{{index $elem 4}}</td>
+	    <td data-order="{{index $elem 5}}">{{index $elem 6}}</td>
+	    <td data-order="{{index $elem 7}}">{{index $elem 8}}</td>
+	    <td data-order="{{index $elem 9}}">{{index $elem 10}}</td>
 	</tr>
-
 	{{end}}
 	</tbody>
 

diff --git a/toolbox/statistics.go b/toolbox/statistics.go
@@ -99,9 +99,13 @@ func (m *URLMap) GetMap() map[string]interface{} {
 				fmt.Sprintf("% -50s", k),
 				fmt.Sprintf("% -10s", kk),
 				fmt.Sprintf("% -16d", vv.RequestNum),
+				fmt.Sprintf("%d", vv.TotalTime),
 				fmt.Sprintf("% -16s", toS(vv.TotalTime)),
+				fmt.Sprintf("%d", vv.MaxTime),
 				fmt.Sprintf("% -16s", toS(vv.MaxTime)),
+				fmt.Sprintf("%d", vv.MinTime),
 				fmt.Sprintf("% -16s", toS(vv.MinTime)),
+				fmt.Sprintf("%d", time.Duration(int64(vv.TotalTime)/vv.RequestNum)),
 				fmt.Sprintf("% -16s", toS(time.Duration(int64(vv.TotalTime)/vv.RequestNum))),
 			}
 			resultLists = append(resultLists, result)