From 1e09a7a01a6c1888e1a2a832eb007fb8c2b653a0 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期三, 26 一月 2022 11:06:27 +0800
Subject: [PATCH] Merge branch 'bhomebus' of http://192.168.5.5:10010/r/web/vue-smart-ai into bhomebus

---
 src/pages/systemMonitor/index/App.vue |   81 ++++++++++++++++++++++++----------------
 1 files changed, 49 insertions(+), 32 deletions(-)

diff --git a/src/pages/systemMonitor/index/App.vue b/src/pages/systemMonitor/index/App.vue
index c6a1359..297d8ec 100644
--- a/src/pages/systemMonitor/index/App.vue
+++ b/src/pages/systemMonitor/index/App.vue
@@ -28,7 +28,9 @@
             @click="activeTab = 1"
           >
             <div class="title">搴旂敤鍗曞厓</div>
-            <div class="subtitle">姝ｅ湪杩涜{{ 1 }}涓簲鐢ㄥ崟鍏�</div>
+            <div class="subtitle">
+              姝ｅ湪杩涜{{ appProcessData.length }}涓簲鐢ㄥ崟鍏�
+            </div>
             <span
               class="iconfont icon"
               :style="activeTab == 1 ? {} : { color: '#fff' }"
@@ -65,13 +67,21 @@
                 <span>{{ scope.row.mem.toFixed(2) }} %</span>
               </template>
             </el-table-column>
-            <el-table-column prop="disk" label="纭洏" width="150"></el-table-column>
+            <el-table-column
+              prop="disk"
+              label="纭洏"
+              width="150"
+            ></el-table-column>
             <el-table-column label="绠楀姏" width="150">
               <template slot-scope="scope">
                 <span>{{ scope.row.gpu }} M</span>
               </template>
             </el-table-column>
-            <el-table-column prop="net" label="缃戠粶" width="150"></el-table-column>
+            <el-table-column
+              prop="net"
+              label="缃戠粶"
+              width="150"
+            ></el-table-column>
           </el-table>
         </div>
 
@@ -84,24 +94,24 @@
           <el-table
             :data="appProcessData"
             style="width: 100%"
-           :header-cell-style="'background: #F2F2F7;color: #333333;height: 40px;font-size: 16px;'"
+            :header-cell-style="'background: #F2F2F7;color: #333333;height: 40px;font-size: 16px;'"
             stripe
             class="tableBox"
           >
-            <el-table-column
-              prop="desc"
-              label="鍚嶇О"
-              width="180"
-            ></el-table-column>
-            <el-table-column
-              prop="cpu"
-              label="CPU"
-              width="180"
-            ></el-table-column>
-            <el-table-column prop="mem" label="鍐呭瓨"></el-table-column>
-            <el-table-column prop="disk" label="纭洏"></el-table-column>
+            <el-table-column prop="desc" label="鍚嶇О"></el-table-column>
+            <el-table-column prop="cpu" label="CPU">
+              <template slot-scope="scope">
+                <span>{{ scope.row.cpu.toFixed(2) }} %</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="mem" label="鍐呭瓨">
+              <template slot-scope="scope">
+                <span>{{ scope.row.mem.toFixed(2) }} %</span>
+              </template>
+            </el-table-column>
+            <!--   <el-table-column prop="disk" label="纭洏"></el-table-column>
             <el-table-column prop="gpu" label="绠楀姏"></el-table-column>
-            <el-table-column prop="net" label="缃戠粶"></el-table-column>
+            <el-table-column prop="net" label="缃戠粶"></el-table-column> -->
           </el-table>
         </div>
       </el-tab-pane>
@@ -280,15 +290,18 @@
           <span class="iconfont icon">&#xe944;</span>
           鏈嶅姟</span
         >
-        <el-table :data="vasystemServicesData"
-        :header-cell-style="'color: #333333;height: 40px;font-size: 16px;'"
-            stripe
-            class="tableBox" 
+        <el-table
+          :data="vasystemServicesData"
+          :header-cell-style="'color: #333333;height: 40px;font-size: 16px;'"
+          stripe
+          class="tableBox"
         >
           <el-table-column label="鍚嶇О" show-overflow-tooltip>
             <template slot-scope="scope">
+              <div class="name_container">
                 <span class="iconfont icon">&#xe74d;</span>
-              <span>{{ scope.row.name }}</span>
+                <span>{{ scope.row.name }}</span>
+              </div>
             </template>
           </el-table-column>
           <el-table-column label="鐘舵��" prop="status">
@@ -396,7 +409,7 @@
             lineStyle: {
               width: 1,
               type: "solid",
-              color:"rgb(242,242,242)"
+              color: "rgb(242,242,242)",
             },
           },
         },
@@ -414,9 +427,9 @@
           },
           splitLine: {
             lineStyle: {
-            color:"rgb(242,242,242)"
-            }
-          }
+              color: "rgb(242,242,242)",
+            },
+          },
         },
         series: [
           {
@@ -566,13 +579,11 @@
 
           rsp.data.disk.forEach((d) => {
             if (d.name in this.disks) {
-              this.disks[d.name].readBytes = this.disks[d.name].readBytes.slice(
-                1
-              );
+              this.disks[d.name].readBytes =
+                this.disks[d.name].readBytes.slice(1);
               this.disks[d.name].readBytes.push(d.readBytes);
-              this.disks[d.name].writeBytes = this.disks[
-                d.name
-              ].writeBytes.slice(1);
+              this.disks[d.name].writeBytes =
+                this.disks[d.name].writeBytes.slice(1);
               this.disks[d.name].writeBytes.push(d.writeBytes);
             } else {
               this.disks[d.name] = {};
@@ -722,6 +733,12 @@
   box-sizing: border-box;
   background-color: #fff;
   height: 100%;
+
+  .name_container {
+    text-align: left;
+    margin-left: 38%;
+  }
+
   .el-table th.el-table__cell.is-leaf,
   .el-table td.el-table__cell {
     border-bottom: none;

--
Gitblit v1.8.0