From 36b50d3bf299a96a6e072ff273544293c3bf5fba Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 4 Jun 2024 01:01:15 +0800
Subject: [PATCH] update

---
 plugins/task_manager/js/task_manager.js    |  2 +-
 plugins/task_manager/task_manager_index.py | 26 +++++++++++++++++---------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/plugins/task_manager/js/task_manager.js b/plugins/task_manager/js/task_manager.js
index 413d045bd..da4a592e5 100644
--- a/plugins/task_manager/js/task_manager.js
+++ b/plugins/task_manager/js/task_manager.js
@@ -710,7 +710,7 @@ function get_run_list() {
             return;
         }
 
-
+        var rdata = rdata.data;
         var tbody_tr = '';
         for (var i = 0; i < rdata.run_list.length; i++) {
             tbody_tr += '<tr>\
diff --git a/plugins/task_manager/task_manager_index.py b/plugins/task_manager/task_manager_index.py
index 9bce2b5aa..b2374b1a3 100755
--- a/plugins/task_manager/task_manager_index.py
+++ b/plugins/task_manager/task_manager_index.py
@@ -134,33 +134,40 @@ class mainClass(object):
 
     # 获取进程io写
     def get_io_write(self, pid, io_write):
-        # self.get_old()
         disk_io_write = 0
         if not self.old_info: self.old_info = {}
         if not pid in self.old_info:
-            self.new_info[pid]['io_write'] = io_write
+            self.old_info[pid] = {}
+            self.old_info[pid]['io_write'] = io_write
             return disk_io_write
-        if not 'time' in self.old_info: self.old_info['time'] = self.new_info['time']
+
+        if not 'io_write' in self.old_info[pid]:
+            self.old_info[pid]['io_write'] = io_write
+            return disk_io_write
+
         io_end = (io_write - self.old_info[pid]['io_write'])
         if io_end > 0:
             disk_io_write = io_end / (time.time() - self.old_info['time'])
-        self.new_info[pid]['io_write'] = io_write
+        self.old_info[pid]['io_write'] = io_write
         if disk_io_write > 0: return int(disk_io_write)
         return 0
 
     # 获取io读
     def get_io_read(self, pid, io_read):
-        # self.get_old()
         disk_io_read = 0
-        if not self.old_info: self.old_info = {}
         if not pid in self.old_info:
-            self.new_info[pid]['io_read'] = io_read
+            self.old_info[pid] = {} 
+            self.old_info[pid]['io_read'] = io_read
             return disk_io_read
-        if not 'time' in self.old_info: self.old_info['time'] = self.new_info['time']
+
+        if not 'io_read' in self.old_info[pid]:
+            self.old_info[pid]['io_read'] = io_read
+            return disk_io_read
+
         io_end = (io_read - self.old_info[pid]['io_read'])
         if io_end > 0:
             disk_io_read = io_end / (time.time() - self.old_info['time'])
-        self.new_info[pid]['io_read'] = io_read
+        self.old_info[pid]['io_read'] = io_read
         if disk_io_read > 0: return int(disk_io_read)
         return 0
 
@@ -773,6 +780,7 @@ class mainClass(object):
                 del (p)
                 del (tmp)
             except Exception as e:
+                print(mw.getTracebackInfo())
                 continue
 
         processList = self.__pro_s_s(processList)