Refactor net.html to update interval calculation for network speed chart

arloor · Oct 25, 2024 · af86c28 · af86c28
1 parent 041bcf8
commit af86c28
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 17 deletions.
diff --git a/rust_http_proxy/html/net.html b/rust_http_proxy/html/net.html
@@ -70,6 +70,17 @@
         },
     },
 ];
+let max = series.map(s => s.data).flat().reduce((a, b) => Math.max(a, b));
+let interval = 0;
+if (max > 1024 * 1024 * 8) {
+    interval = 1024 * 1024 * 8
+} else {
+    interval = 1024 * 1024
+};
+if (max / interval > 10) {
+    interval = (max / interval / 10) * interval;
+}
+console.log("interval is", interval);
 // 指定图表的配置项和数据
 var option = {
     title: {
@@ -118,7 +129,7 @@
             interval = Math.pow(k, c);
             return Math.ceil(value.max / interval) * interval;
         },
-        interval: {{ interval }},
+        interval: interval,
         axisLabel: {
             formatter: (value, index) => formatDataRateIEC(value)
         },

diff --git a/rust_http_proxy/src/linux_monitor.rs b/rust_http_proxy/src/linux_monitor.rs
@@ -99,30 +99,15 @@ impl NetMonitor {
         let mut scales = vec![];
         let mut series_up = vec![];
         let mut series_down = vec![];
-        let mut max = 0;
         for x in r {
             scales.push(x.time);
             series_up.push(x.egress);
             series_down.push(x.ingress);
-            if x.egress > max {
-                max = x.egress;
-            }
-            if x.ingress > max {
-                max = x.ingress;
-            }
-        }
-        let mut interval = if max > 1024 * 1024 * 8 {
-            1024 * 1024 * 8
-        } else {
-            1024 * 1024
-        };
-        if max / interval > 10 {
-            interval = (max / interval / 10) * interval;
         }
+
         // 创建上下文并插入数据
         let mut context = tera::Context::new();
         context.insert("hostname", hostname);
-        context.insert("interval", &interval);
         context.insert("series_up", format!("{:?}", series_up).as_str());
         context.insert("series_down", format!("{:?}", series_down).as_str());
         context.insert("scales", format!("{:?}", scales).as_str());