Quellcode durchsuchen

加入统计图表时间跨度选择器

James Iter vor 9 Jahren
Ursprung
Commit
2ccd08ccdb
2 geänderte Dateien mit 21 neuen und 3 gelöschten Zeilen
  1. 2 0
      api/performance.py
  2. 19 3
      templates/guest_detail.html

+ 2 - 0
api/performance.py

@@ -55,6 +55,8 @@ def get_performance_data(uuid, uuid_field, the_class=None, granularity='hour'):
         Rules.UUID.value,
         Rules.UUID.value,
     ]
     ]
 
 
+    t = {'t1': 0, 't2': 1}
+
     try:
     try:
         ji.Check.previewing(args_rules, {'uuid': uuid})
         ji.Check.previewing(args_rules, {'uuid': uuid})
         uuids_str = ':'.join([uuid_field, 'in', uuid])
         uuids_str = ':'.join([uuid_field, 'in', uuid])

+ 19 - 3
templates/guest_detail.html

@@ -506,6 +506,11 @@
         render_traffic_chart(uuid, 'hour');
         render_traffic_chart(uuid, 'hour');
         // render_memory_chart(uuid, 'hour');
         // render_memory_chart(uuid, 'hour');
     });
     });
+    
+    function refresh_render_with_specify_granularity(granularity) {
+        render_cpu_chart(uuid, granularity);
+        render_traffic_chart(uuid, granularity);
+    }
 </script>
 </script>
 <div class="container" style="padding-top: 100px; width: 90%; max-width: 100%;">
 <div class="container" style="padding-top: 100px; width: 90%; max-width: 100%;">
     <div class="panel">
     <div class="panel">
@@ -616,9 +621,20 @@
                     </table>
                     </table>
                 </div>
                 </div>
                 <div class="col-xs-8">
                 <div class="col-xs-8">
-                    <div id="cpu_chart" style="width: 800px;height:280px;"></div>
-                    <div id="traffic_chart" style="width: 800px;height:280px;"></div>
-                    <!--<div id="memory_chart" style="width: 800px;height:280px;"></div>-->
+                    <div class="row" style="margin-bottom: 20px;">
+                        <div class="col-xs-8"></div>
+                        <div class="col-xs-4">
+                            <div class="btn-group btn-group-justified btn-group-xs">
+                                <a class="btn btn-default" role="button" onclick="refresh_render_with_specify_granularity('hour');">1小时</a>
+                                <a class="btn btn-default" role="button" onclick="refresh_render_with_specify_granularity('six_hours');">6小时</a>
+                                <a class="btn btn-default" role="button" onclick="refresh_render_with_specify_granularity('day');">1天</a>
+                                <a class="btn btn-default" role="button" onclick="refresh_render_with_specify_granularity('seven_days');">7天</a>
+                            </div>
+                        </div>
+                    </div>
+                        <div id="cpu_chart" style="width: 800px;height:280px;"></div>
+                        <div id="traffic_chart" style="width: 800px;height:280px;"></div>
+                        <!--<div id="memory_chart" style="width: 800px;height:280px;"></div>-->
                 </div>
                 </div>
             </div>
             </div>
         </div>
         </div>