From ccee5f79043769c13d304343a40c46a3de4e9d17 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期五, 28 一月 2022 15:19:30 +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 | 92 ++++++++++++++++++++++++++++-----------------
1 files changed, 57 insertions(+), 35 deletions(-)
diff --git a/src/pages/systemMonitor/index/App.vue b/src/pages/systemMonitor/index/App.vue
index 5dffb21..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' }"
@@ -49,29 +51,37 @@
stripe
class="tableBox"
>
- <el-table-column label="鍚嶇О" width="180">
+ <el-table-column label="鍚嶇О" width="231">
<template slot-scope="scope">
<span class="iconfont icon"></span>
<span>{{ scope.row.desc }} </span>
</template>
</el-table-column>
- <el-table-column label="CPU" width="180">
+ <el-table-column label="CPU" width="150">
<template slot-scope="scope">
<span>{{ scope.row.cpu.toFixed(2) }} %</span>
</template>
</el-table-column>
- <el-table-column label="鍐呭瓨">
+ <el-table-column label="鍐呭瓨" width="150">
<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 label="绠楀姏">
+ <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="缃戠粶"></el-table-column>
+ <el-table-column
+ prop="net"
+ label="缃戠粶"
+ width="150"
+ ></el-table-column>
</el-table>
</div>
@@ -84,28 +94,24 @@
<el-table
:data="appProcessData"
style="width: 100%"
- :header-cell-style="{
- background: '#F2F2F7',
- color: '#333333',
- height: '40px',
- }"
+ :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>
@@ -284,13 +290,18 @@
<span class="iconfont icon"></span>
鏈嶅姟</span
>
- <el-table :data="vasystemServicesData"
-
- 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">
- <span>{{ scope.row.name }}</span>
+ <div class="name_container">
+ <span class="iconfont icon"></span>
+ <span>{{ scope.row.name }}</span>
+ </div>
</template>
</el-table-column>
<el-table-column label="鐘舵��" prop="status">
@@ -398,6 +409,7 @@
lineStyle: {
width: 1,
type: "solid",
+ color: "rgb(242,242,242)",
},
},
},
@@ -412,6 +424,11 @@
},
axisTick: {
show: false,
+ },
+ splitLine: {
+ lineStyle: {
+ color: "rgb(242,242,242)",
+ },
},
},
series: [
@@ -562,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] = {};
@@ -718,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;
@@ -913,6 +934,7 @@
}
.column-right {
+ background-color: #fff;
overflow-y: auto;
overflow-x: auto;
}
--
Gitblit v1.8.0