From cce74bab9c252177c192c845387c6c48e50685b5 Mon Sep 17 00:00:00 2001
From: valarchie <343928303@qq.com>
Date: Wed, 19 Jul 2023 18:17:27 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=99=A8=E7=9B=91=E6=8E=A7=E9=A1=B5=E9=9D=A2=20=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8Aloading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/monitor/server/index.vue | 73 ++++++++++++++----------------
 1 file changed, 35 insertions(+), 38 deletions(-)

diff --git a/src/views/monitor/server/index.vue b/src/views/monitor/server/index.vue
index 134d139..511e2ae 100644
--- a/src/views/monitor/server/index.vue
+++ b/src/views/monitor/server/index.vue
@@ -1,5 +1,6 @@
 <template>
-  <div class="main">
+  <!-- v-loading指令  可以直接调用Loading动画  -->
+  <div class="main" v-loading="loading">
     <el-row :gutter="30">
       <el-col :span="12" class="card-box">
         <el-card>
@@ -93,20 +94,14 @@
 
 <script setup lang="ts">
 import { getServerInfoApi, ServerInfo } from "@/api/system/monitor";
-import { onBeforeMount, reactive, ref } from "vue";
+import { onBeforeMount, ref } from "vue";
 
 /** 组件name最好和菜单表中的router_name一致 */
 defineOptions({
   name: "ServerInfo"
 });
 
-const server = reactive<ServerInfo>({
-  cpuInfo: undefined,
-  diskInfos: undefined,
-  jvmInfo: undefined,
-  memoryInfo: undefined,
-  systemInfo: undefined
-});
+const loading = ref(true);
 
 const cpuInfoTable = ref([]);
 const memoryInfoTable = ref([]);
@@ -115,113 +110,114 @@ const jvmInfoTable = ref([]);
 const diskInfoTable = ref([]);
 
 async function getList() {
-  // pageLoading.value = true;
-  const { data } = await getServerInfoApi();
-  console.log(data);
-  Object.assign(server, data);
+  loading.value = true;
+  const { data } = await getServerInfoApi().finally(() => {
+    loading.value = false;
+  });
+  const serverInfo = data as ServerInfo;
 
   cpuInfoTable.value = [
     {
       field: "核心数",
-      value: server.cpuInfo.cpuNum
+      value: serverInfo.cpuInfo.cpuNum
     },
     {
       field: "用户使用率",
-      value: server.cpuInfo.used + "%"
+      value: serverInfo.cpuInfo.used + "%"
     },
     {
       field: "系统使用率",
-      value: server.cpuInfo.sys + "%"
+      value: serverInfo.cpuInfo.sys + "%"
     },
     {
       field: "当前空闲率",
-      value: server.cpuInfo.free + "%"
+      value: serverInfo.cpuInfo.free + "%"
     }
   ];
 
   memoryInfoTable.value = [
     {
       field: "总内存",
-      machine: server.memoryInfo.total + "G",
-      jvm: server.jvmInfo.total + "M"
+      machine: serverInfo.memoryInfo.total + "G",
+      jvm: serverInfo.jvmInfo.total + "M"
     },
     {
       field: "已用内存",
-      machine: server.memoryInfo.used + "G",
-      jvm: server.jvmInfo.used + "M"
+      machine: serverInfo.memoryInfo.used + "G",
+      jvm: serverInfo.jvmInfo.used + "M"
     },
     {
       field: "剩余内存",
-      machine: server.memoryInfo.free + "G",
-      jvm: server.jvmInfo.free + "M"
+      machine: serverInfo.memoryInfo.free + "G",
+      jvm: serverInfo.jvmInfo.free + "M"
     },
     {
       field: "使用率",
-      machine: server.memoryInfo.usage + "%",
-      jvm: server.jvmInfo.usage + "%",
+      machine: serverInfo.memoryInfo.usage + "%",
+      jvm: serverInfo.jvmInfo.usage + "%",
       // 设置warning  页面上会红字显示
-      warning: server.jvmInfo.usage > 30
+      warning: serverInfo.jvmInfo.usage > 30
     }
   ];
 
   serverInfoTable.value = [
     {
       field: "服务器名称",
-      value: server.systemInfo.computerName
+      value: serverInfo.systemInfo.computerName
     },
     {
       field: "操作系统",
-      value: server.systemInfo.osName
+      value: serverInfo.systemInfo.osName
     },
     {
       field: "服务器IP",
-      value: server.systemInfo.computerIp
+      value: serverInfo.systemInfo.computerIp
     },
     {
       field: "系统架构",
-      value: server.systemInfo.osArch
+      value: serverInfo.systemInfo.osArch
     }
   ];
 
   jvmInfoTable.value = [
     {
       field: "JDK名称",
-      value: server.jvmInfo.name,
+      value: serverInfo.jvmInfo.name,
       span: 1
     },
     {
       field: "JDK版本",
-      value: server.jvmInfo.version,
+      value: serverInfo.jvmInfo.version,
       span: 1
     },
     {
       field: "启动时间",
-      value: server.jvmInfo.startTime,
+      value: serverInfo.jvmInfo.startTime,
       span: 1
     },
     {
       field: "运行时长",
-      value: server.jvmInfo.runTime,
+      value: serverInfo.jvmInfo.runTime,
       span: 1
     },
     {
       field: "安装路径",
-      value: server.jvmInfo.home,
+      value: serverInfo.jvmInfo.home,
       span: 2
     },
     {
       field: "项目路径",
-      value: server.systemInfo.userDir,
+      value: serverInfo.systemInfo.userDir,
       span: 2
     },
     {
       field: "运行参数",
-      value: server.jvmInfo.inputArgs,
+      value: serverInfo.jvmInfo.inputArgs,
       span: 2
     }
   ];
 
-  diskInfoTable.value = server.diskInfos;
+  diskInfoTable.value = serverInfo.diskInfos;
 }
 
 function cellClassName({ row }) {
@@ -229,6 +225,7 @@ function cellClassName({ row }) {
     return "text-red-500";
   }
 }
+
 onBeforeMount(() => {
   getList();
 });