From 9ebf48bcee9d68874e87f54a327bdcf16016db44 Mon Sep 17 00:00:00 2001
From: yeyang <746659424@qq.com>
Date: Fri, 30 Dec 2022 17:16:10 +0800
Subject: [PATCH] Optimize

---
 model/CPU.js               | 49 ++++++++++++++++++++++----------------
 resources/state/state.css  |  4 ++--
 resources/state/state.html | 16 ++++++-------
 3 files changed, 39 insertions(+), 30 deletions(-)

diff --git a/model/CPU.js b/model/CPU.js
index 6bbbdfa..c9c0de8 100644
--- a/model/CPU.js
+++ b/model/CPU.js
@@ -61,12 +61,12 @@ class OSUtils {
     } else if (res >= 0.8) {
       color = '#ffa500'
     }
-    let leftCircle = `style=transform:rotate(-180deg);background:${color};`;
-    let rightCircle = `style=transform:rotate(360deg);background:${color};`
+    let leftCircle = `style="transform:rotate(-180deg);background:${color};"`;
+    let rightCircle = `style="transform:rotate(360deg);background:${color};"`;
     if (num > 180) {
-      leftCircle = `style=transform:rotate(${num}deg);background:${color};`
+      leftCircle = `style="transform:rotate(${num}deg);background:${color};"`;
     } else {
-      rightCircle = `style=transform:rotate(-${180 - num}deg);background:${color};`;
+      rightCircle = `style="transform:rotate(-${180 - num}deg);background:${color};"`;
     }
     return { leftCircle, rightCircle }
   }
@@ -85,10 +85,12 @@ class OSUtils {
     return {
       ...this.Circle(occupy),
       inner: parseInt(occupy * 100) + "%",
-      p1: 'Node',
-      p2: `总 ${rss}`,
-      p3: `堆 ${heapTotal}`,
-      p4: `栈 ${heapUsed}`
+      title: 'Node',
+      info: [
+        `总 ${rss}`,
+        `堆 ${heapTotal}`,
+        `栈 ${heapUsed}`
+      ]
     }
   }
 
@@ -106,10 +108,12 @@ class OSUtils {
     return {
       ...this.Circle(MemUsage),
       inner: parseInt(MemUsage * 100) + "%",
-      p1: 'RAM',
-      p2: `总共 ${totalmem}`,
-      p3: `已用 ${Usingmemory}`,
-      p4: `空闲 ${freemem}`
+      title: 'RAM',
+      info: [
+        `总共 ${totalmem}`,
+        `已用 ${Usingmemory}`,
+        `空闲 ${freemem}`,
+      ]
     }
   }
 
@@ -128,10 +132,13 @@ class OSUtils {
     return {
       ...this.Circle(cpu_info / 100),
       inner: parseInt(cpu_info) + "%",
-      p1: 'CPU',
-      p2: `${cpumodel} ${hx.length}核 ${osinfo.arch}`,
-      p3: `平均${maxspeed.avg}GHz`,
-      p4: `最大${maxspeed.max}GHz`
+      title: 'CPU',
+      info: [
+        `${cpumodel} ${hx.length}核 ${osinfo.arch}`,
+        `平均${maxspeed.avg}GHz`,
+        `最大${maxspeed.max}GHz`
+      ]
+
     }
   }
 
@@ -146,10 +153,12 @@ class OSUtils {
       return {
         ...this.Circle(utilizationGpu / 100),
         inner: parseInt(utilizationGpu) + "%",
-        p1: 'GPU',
-        p2: `${vendor} ${temperatureGpu} ${powerDraw}`,
-        p3: `总共 ${(memoryTotal / 1024).toFixed(2)}G`,
-        p4: `已用 ${(memoryUsed / 1024).toFixed(2)}G`
+        title: 'GPU',
+        info: [
+          `${vendor} ${temperatureGpu} ${powerDraw}`,
+          `总共 ${(memoryTotal / 1024).toFixed(2)}G`,
+          `已用 ${(memoryUsed / 1024).toFixed(2)}G`
+        ]
       }
     } catch (e) {
       console.log(e);
diff --git a/resources/state/state.css b/resources/state/state.css
index 32f2061..afac365 100644
--- a/resources/state/state.css
+++ b/resources/state/state.css
@@ -125,12 +125,12 @@ hr {
 
 }
 
-.info .li article p:nth-child(1) {
+.info .li article summary {
     font-size: 20px;
     margin-top: 5px;
 }
 
-.info .li article p:not(:first-child) {
+.info .li article p {
     font-size: 10px;
     color: #2f4f4f;
     white-space: nowrap;
diff --git a/resources/state/state.html b/resources/state/state.html
index af1f70f..a5b81ad 100644
--- a/resources/state/state.html
+++ b/resources/state/state.html
@@ -19,26 +19,26 @@
 </div>
 <div class="box">
     <ul class="info">
-        {{each visualData}}
+        {{each visualData group}}
         <li class="li">
             <div class="cpu">
                 <div class="left">
-                    <div class="left-circle" {{$value.leftCircle}}>
+                    <div class="left-circle" {{@group.leftCircle}}>
                     </div>
                 </div>
                 <div class="right">
-                    <div class="right-circle" {{$value.rightCircle}}>
+                    <div class="right-circle" {{@group.rightCircle}}>
                     </div>
                 </div>
                 <div class="inner">
-                    {{$value.inner}}
+                    {{group.inner}}
                 </div>
             </div>
             <article>
-                <p>{{$value.p1}}</p>
-                <p>{{$value.p2}}</p>
-                <p>{{$value.p3}}</p>
-                <p>{{$value.p4}}</p>
+                <summary>{{group.title}}</summary>
+                {{each group.info info}}
+                <p>{{info}}</p>
+                {{/each}}
             </article>
         </li>
         {{/each}}