From 864ad75ce3f03cd94172b4330e8a71f7848451cf 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: Mon, 5 Feb 2024 14:41:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=20Database=20Monitor=20?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC=E5=90=8E=EF=BC=8C=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E6=A1=86=E4=B8=8D=E5=AF=B9=E5=BA=94=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../abnormalAlarm/components/tableList.vue    |  4 ++-
 .../instances/conditionBox.vue                | 12 ++++++---
 .../instances/serviceProcess.vue              | 25 +++----------------
 3 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/src/views/abnormalAlarm/components/tableList.vue b/src/views/abnormalAlarm/components/tableList.vue
index d96aa11..f9b8f58 100644
--- a/src/views/abnormalAlarm/components/tableList.vue
+++ b/src/views/abnormalAlarm/components/tableList.vue
@@ -11,8 +11,9 @@
     :customRow="customRow"
     :rowClassName="() => (canSelect ? 'custom-table-row' : '')"
     @change="handleTableChange"
-    :scroll="{ y: 186 }"
+    :scroll="scroll"
   >
+    <!-- :scroll="{ y: 186 }" -->
     <!-- 处理 scopedSlots -->
     <template v-for="slotName of scopedSlotsKeys" :slot="slotName" slot-scope="text, record, index">
       <slot :name="slotName" :text="text" :record="record" :index="index"></slot>
@@ -58,6 +59,7 @@ export default {
       type: Boolean,
       default: false,
     },
+    scroll: { type: Object },
   },
   data() {
     return {
diff --git a/src/views/abnormalAlarm/databaseMonitor/instances/conditionBox.vue b/src/views/abnormalAlarm/databaseMonitor/instances/conditionBox.vue
index 2c258c2..6ab2ab4 100644
--- a/src/views/abnormalAlarm/databaseMonitor/instances/conditionBox.vue
+++ b/src/views/abnormalAlarm/databaseMonitor/instances/conditionBox.vue
@@ -49,8 +49,7 @@
 
 <script>
 import moment from 'moment'
-import dateFormat from '@/components/jeecg/JEasyCron/format-date'
-import { getAction, postAction, httpAction, deleteAction } from '@/api/manage'
+import { getAction } from '@/api/manage'
 export default {
   props: {
     value: {
@@ -76,6 +75,9 @@ export default {
   mounted() {
     this.getDbList()
   },
+  activated() {
+    this.getDbList()
+  },
   methods: {
     getBeforeHours(num) {
       let currentTime = moment()
@@ -94,8 +96,10 @@ export default {
           // 如果url中有sourceId
           if (sourceId) {
             const find = res.result.find((item) => item.sourceId == sourceId)
-            if (find) {
+            if (find && find.hostId) {
               this.value.hostId = find.hostId
+            } else {
+              this.value.hostId = `my${find.sourceId}`
             }
           }
           if (!this.value.hostId) {
@@ -103,7 +107,7 @@ export default {
           }
 
           this.DbOptions = res.result.map((item, index) => {
-            let str = `my${index}`
+            let str = `my${item.sourceId}`
             return {
               label: item.sourceName,
               value: item.hostId || str,
diff --git a/src/views/abnormalAlarm/serverMonitor/instances/serviceProcess.vue b/src/views/abnormalAlarm/serverMonitor/instances/serviceProcess.vue
index 4f7b47a..db1d04f 100644
--- a/src/views/abnormalAlarm/serverMonitor/instances/serviceProcess.vue
+++ b/src/views/abnormalAlarm/serverMonitor/instances/serviceProcess.vue
@@ -74,35 +74,17 @@
         <div class="service-content-center">
           <a-row :gutter="20">
             <a-col :span="12">
-              <BoxTitle title="Process CPU usage(%)">
-                <!-- <template slot="right">
-                <ul class="legend-list">
-                  <li v-for="(item, index) in processCpu.legend" :key="index">
-                    <div :style="`background:${processCpu.color[index]}`" class="li-icon"></div>
-                    {{ item }}
-                  </li>
-                </ul>
-              </template> -->
-              </BoxTitle>
+              <BoxTitle title="Process CPU usage(%)" />
               <div class="service-content-center-item" id="processCpu"></div>
             </a-col>
             <a-col :span="12">
-              <BoxTitle title="Process memory usage(%)">
-                <!-- <template slot="right">
-                <ul class="legend-list">
-                  <li v-for="(item, index) in processMenbry.legend" :key="index">
-                    <div :style="`background:${processMenbry.color[index]}`" class="li-icon"></div>
-                    {{ item }}
-                  </li>
-                </ul>
-              </template> -->
-              </BoxTitle>
+              <BoxTitle title="Process memory usage(%)" />
               <div class="service-content-center-item" id="menbry"></div>
             </a-col>
           </a-row>
         </div>
         <div class="service-content-table">
-          <BoxTitle title="Service"></BoxTitle>
+          <BoxTitle title="Service" />
           <div style="padding-top: 10px">
             <TableList
               size="middle"
@@ -112,6 +94,7 @@
               :loading="loading"
               :pagination="false"
               :canSelect="false"
+              :scroll="{ y: 186 }"
             >
             </TableList>
             <!-- <a-pagination