From cd5044d1bfeb9fcff4171e6212a7b8b8fd41e33f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= <peiyu_ren@163.com>
Date: Thu, 21 Dec 2023 14:38:11 +0800
Subject: [PATCH] =?UTF-8?q?Server=20Monitor=20=E8=8F=9C=E5=8D=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=20SERVICE=20AND=20PROCESS=20=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4=EF=BC=8C=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../instances/serviceProcess.vue              | 31 +++++++++++++++++--
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/views/abnormalAlarm/serverMonitor/instances/serviceProcess.vue b/src/views/abnormalAlarm/serverMonitor/instances/serviceProcess.vue
index 00d2669..62cb2da 100644
--- a/src/views/abnormalAlarm/serverMonitor/instances/serviceProcess.vue
+++ b/src/views/abnormalAlarm/serverMonitor/instances/serviceProcess.vue
@@ -40,6 +40,10 @@
         </a-col>
       </a-row>
       <div class="service-search-btns">
+        <a-button class="view-btn" @click="handleRefresh">
+          <img class="icon-add" src="@/assets/images/global/reset-pwd.png" alt="" />
+          <span style="margin-left: 10px"> Refresh </span>
+        </a-button>
         <a-button
           :class="['service-search-btns-ant', type == 'cpu' ? 'service-search-btns-active' : '']"
           @click="handleCpu"
@@ -207,7 +211,9 @@ export default {
         { label: '1Hours', value: 1 },
         { label: '2Hours', value: 2 },
         { label: '3Hours', value: 3 },
+        { label: 'user-defined', value: 0 },
       ],
+      userDefined: false,
       ranked: {
         content: null,
         legend: [],
@@ -267,13 +273,18 @@ export default {
     })
   },
   methods: {
+    handleRefresh() {
+      if (!this.userDefined) {
+        this.getBeforeHours(this.queryParams.timer)
+      }
+    },
     // Top-ranked processes in the last hour
     getRankProcesses() {
       this.ranked.content && this.ranked.content.clear()
       this.processCpu.content && this.processCpu.content.clear()
       this.processMenbry.content && this.processMenbry.content.clear()
       let params = {
-        hostId: this.queryParams.server || '10483',
+        hostId: this.queryParams.server,
         pageName: 'serviceAndProcess',
         start: this.queryParams.startDate,
         end: this.queryParams.endDate,
@@ -347,6 +358,7 @@ export default {
     },
     moment,
     onRangeDateChange(date, dateString) {
+      this.queryParams.timer = 0
       this.queryParams.startDate = dateString[0]
       this.queryParams.endDate = dateString[1]
       this.getRankProcesses()
@@ -364,8 +376,7 @@ export default {
             }
           })
           let serverId = this.$route.query.serverId
-          this.queryParams.server = '10483'
-          // this.serverOptions.find((item) => item.sourceId === serverId).hostId || res.result[0].hostId
+          this.queryParams.server = serverId || res.result[0].hostId
           this.getRankProcesses()
         } else {
           this.$message.warning('This operation fails. Contact your system administrator')
@@ -377,6 +388,12 @@ export default {
       this.getRankProcesses()
     },
     onTimeChange(val) {
+      if (val !== 0) {
+        this.userDefined = false
+      } else {
+        this.userDefined = true
+      }
+      this.queryParams.timer = val
       this.getBeforeHours(val)
       this.getRankProcesses()
     },
@@ -720,4 +737,12 @@ export default {
     }
   }
 }
+.view-btn {
+  background-color: #1397a3;
+  font-family: ArialMT;
+  color: #ffffff;
+  border: none;
+  margin-left: 20px;
+  box-shadow: 0px 1px 1px 0px #000000;
+}
 </style>
\ No newline at end of file