Merge pull request #570 from midoks/dev

调优

class/core/system_api.py

@@ -686,8 +686,8 @@ class system_api:
             for disk_name in diskio_group.keys():
                 diskInfo[disk_name] = {}
                 # print('disk_name',disk_name)
-                # print('diskio_group',diskio_group[disk_name])
-                # print('diskio_cache',diskio_cache[disk_name])
+                # print(diskio_group[disk_name].write_time , diskio_cache[disk_name].write_time)
+                # print(diskio_group[disk_name].write_count , diskio_cache[disk_name].write_count)
 
                 diskInfo[disk_name]['read_count']   = int((diskio_group[disk_name].read_count - diskio_cache[disk_name].read_count) / stime)
                 diskInfo[disk_name]['write_count']  = int((diskio_group[disk_name].write_count - diskio_cache[disk_name].write_count) / stime)

route/static/app/index.js

@@ -1408,8 +1408,8 @@ var index = {
 
             $("#readBytes").html(toSize(iostat_select.read_bytes));
             $("#writeBytes").html(toSize(iostat_select.write_bytes));
-            $("#diskIops").html(iostat_select.read_count);
-            $("#diskTime").html(iostat_select.write_time);
+            $("#diskIops").html(iostat_select.read_count+":"+iostat_select.write_count+ " 次");
+            $("#diskTime").html(iostat_select.read_time+":"+iostat_select.write_time +" ms");
 
 
             $("#core").html(net.cpu[1] + " " + lan.index.cpu_core);

route/templates/default/index.html

@@ -132,7 +132,7 @@
                                 <div class="col-sm-6 col-md-3"><p class="c9"><span class="ico-read"></span>读取</p><a id="readBytes">0</a></div>
                                 <div class="col-sm-6 col-md-3"><p class="c9"><span class="ico-write"></span>写入</p><a id="writeBytes">0</a></div>
                                 <div class="col-sm-6 col-md-3"><p class="c9">每秒读写</p><a id="diskIops">0</a></div>
-                                <div class="col-sm-6 col-md-3"><p class="c9">IO延迟</p><a id="diskTime" style="color: rgb(32, 165, 58);">0</a></div>
+                                <div class="col-sm-6 col-md-3"><p class="c9">读写IO延迟</p><a id="diskTime" style="color: rgb(32, 165, 58);">0</a></div>
                             </div>
                             <div id="ioStat" style="width:100%;height:330px;"></div>
                         </div>