🐞 fix: 更新监视器，动态转换Byte到KB

frontend/src/views/system/monitor.vue

@@ -111,39 +111,39 @@
           <div class="list-element">
             <div style="background: yellow;">
               <label>evue_free_size</label>
-              <p>{{ evmList.evue_free_size | byte2kb }}(KB)</p>
+              <p>{{ evmList.evue_free_size }}(KB)</p>
             </div>
             <div style="background: orange;">
               <label>evue_total_size</label>
-              <p>{{ evmList.evue_total_size | byte2kb }}(KB)</p>
+              <p>{{ evmList.evue_total_size }}(KB)</p>
             </div>
             <div style="background: orange;">
               <label>evue_used_size</label>
-              <p>{{ evmList.evue_used_size | byte2kb }}(KB)</p>
+              <p>{{ evmList.evue_used_size }}(KB)</p>
             </div>
             <div style="background: yellowgreen;">
               <label>ext_total_size</label>
-              <p>{{ evmList.ext_total_size | byte2kb }}(KB)</p>
+              <p>{{ evmList.ext_total_size }}(KB)</p>
             </div>
             <div style="background: yellowgreen;">
               <label>ext_used_size</label>
-              <p>{{ evmList.ext_used_size | byte2kb }}(KB)</p>
+              <p>{{ evmList.ext_used_size }}(KB)</p>
             </div>
             <div style="background: paleturquoise;">
               <label>heap_total_size</label>
-              <p>{{ evmList.heap_total_size | byte2kb }}(KB)</p>
+              <p>{{ evmList.heap_total_size }}(KB)</p>
             </div>
             <div style="background: paleturquoise;">
               <label>heap_used_size</label>
-              <p>{{ evmList.heap_used_size | byte2kb }}(KB)</p>
+              <p>{{ evmList.heap_used_size }}(KB)</p>
             </div>
             <div style="background: darksalmon;">
               <label>stack_total_size</label>
-              <p>{{ evmList.stack_total_size | byte2kb }}(KB)</p>
+              <p>{{ evmList.stack_total_size }}(KB)</p>
             </div>
             <div style="background: darksalmon;">
               <label>stack_used_size</label>
-              <p>{{ evmList.stack_used_size | byte2kb }}(KB)</p>
+              <p>{{ evmList.stack_used_size }}(KB)</p>
             </div>
           </div>
         </grid-item>
@@ -405,6 +405,18 @@ const indexedDb = Database(),
   jsonFile = "evue-monitor.json";
 let monitor = new indexedDb(dbObject);
 
+function isNumber(value) {
+  return typeof value === "number" && !isNaN(value);
+}
+
+function byteToKiloByte(obj) {
+  Object.prototype.toString.call(obj) === "[object Object]" && Object.keys(obj).forEach(k => {
+      if (k.indexOf("size") !== -1 && isNumber(obj[k])) {
+        obj[k] = Math.ceil(obj[k] / 1024)
+      }
+    })
+}
+
 function resetResult() {
   return {
     systemMax: {},
@@ -433,6 +445,7 @@ function resetResult() {
   };
 }
 
+// 统计使用
 const result = resetResult();
 
 const system = {
@@ -441,7 +454,6 @@ const system = {
     used_space_size: null,
   },
   evm = {
-    heap_map_size: null,
     heap_total_size: null,
     heap_used_size: null,
     stack_total_size: null,
@@ -483,7 +495,6 @@ export default {
       evmHistory: [],
       lvglHistory: [],
       evm: {
-        heap_map_size: null,
         heap_total_size: null,
         heap_used_size: null,
         stack_total_size: null,
@@ -515,18 +526,6 @@ export default {
       pngShowMode: true,
       currentPngList: [],
       socket: null,
-      form: {
-        system: ["free_size", "free_space_size", "used_space_size"],
-        lvgl: ["total_size", "free_size", "free_biggest_size"],
-        evm: [
-          "heap_map_size",
-          "heap_total_size",
-          "heap_used_size",
-          "stack_total_size",
-          "stack_used_size",
-        ],
-        image: ["png_uncompressed_size", "png_file_size", "length"],
-      },
       layout: [
         { x: 0, y: 0, w: 6, h: 5, i: "1", static: false },
         { x: 6, y: 0, w: 6, h: 5, i: "2", static: true },
@@ -771,7 +770,18 @@ export default {
           this.isLoading = false;
         });
     },
-    queryData() {
+    onChange(res) {
+      if (!res) return null;
+
+      var t = this.watchs.find((item) => {
+        return item.id == res;
+      });
+      if (t) this.device = t.imei;
+
+      // 清空之前数据
+      this.resetData();
+    },
+    onSubmit() {
       getMonitorData({
         watch: this.device,
       })
@@ -786,20 +796,6 @@ export default {
           this.$message.warning(err.msg);
         });
     },
-    onChange(res) {
-      if (!res) return null;
-
-      var t = this.watchs.find((item) => {
-        return item.id == res;
-      });
-      if (t) this.device = t.imei;
-
-      // 清空之前数据
-      this.resetData();
-    },
-    onSubmit() {
-      this.queryData();
-    },
     onReset(formName) {
       this.$refs[formName].resetFields();
       this.fetchData();
@@ -855,25 +851,15 @@ export default {
       this.resetData(m);
     },
     processData(msg) {
-      function isNumber(value) {
-        return typeof value === "number" && !isNaN(value);
-      }
+      if (Object.prototype.toString.call(msg) !== "[object Object]") return null;
 
-      if (!msg) return null;
-      Object.keys(msg).forEach((item) => {
-        if (this.form[item]) {
-          var keys = this.form[item];
-          for (var i = 0; i < keys.length; i++) {
-            var k = keys[i];
-            if (item == "image") {
-              for (var j = 0; j < msg[item].length; j++) {
-                if (isNumber(msg[item][j][k]))
-                  msg[item][j][k] = Math.ceil(msg[item][j][k] / 1024);
-              }
-            } else {
-              msg[item][k] = Math.ceil(msg[item][k] / 1024);
-            }
-          }
+      Object.keys(msg).forEach((key) => {
+        if (Array.isArray(msg[key])) {
+          msg[key].forEach(item => {
+            byteToKiloByte(item)
+          })
+        } else {
+          byteToKiloByte(msg[key])
         }
       });
 
@@ -881,8 +867,6 @@ export default {
         if (item.png_detail && item.png_detail.length) {
           item.png_detail = item.png_detail.map((png) => {
             png.ratio = Math.floor(png.ratio * 100) / 100;
-            // png.filesize = Math.floor(png.filesize / 1024);
-            // png.uncompressed_size = Math.floor(png.uncompressed_size / 1024);
             return png;
           });
         }
@@ -943,7 +927,6 @@ export default {
             target.png_total_count = item.png_total_count;
             target.highlight = item.highlight;
             if (item.png_uncompressed_size) {
-              // target.highlight = true;
               if (item.png_uncompressed_size !== target.png_uncompressed_size) {
                 target.png_uncompressed_size = item.png_uncompressed_size;
                 if (this.pngShowMode) this.pngList = item.png_detail || [];