From a80cfedfc2b78fb0e602df230b47680b2e8bd13f Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Thu, 4 Jan 2024 16:37:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DDatabase=20name=20?=
 =?UTF-8?q?=E5=8F=96=E5=80=BC=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../databaseMonitor/instances/areaChart.vue         |  1 -
 .../databaseMonitor/instances/conditionBox.vue      | 13 ++++++++++++-
 .../databaseMonitor/instances/monitor.vue           |  9 ++++-----
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/views/abnormalAlarm/databaseMonitor/instances/areaChart.vue b/src/views/abnormalAlarm/databaseMonitor/instances/areaChart.vue
index 1726024..a4aa736 100644
--- a/src/views/abnormalAlarm/databaseMonitor/instances/areaChart.vue
+++ b/src/views/abnormalAlarm/databaseMonitor/instances/areaChart.vue
@@ -119,7 +119,6 @@ export default {
   },
   watch: {
     dataSource() {
-      console.log('%c [  ]-128', 'font-size:13px; background:pink; color:#bf2c9f;')
       this.drawChart()
     },
   },
diff --git a/src/views/abnormalAlarm/databaseMonitor/instances/conditionBox.vue b/src/views/abnormalAlarm/databaseMonitor/instances/conditionBox.vue
index fee8b9b..baf392b 100644
--- a/src/views/abnormalAlarm/databaseMonitor/instances/conditionBox.vue
+++ b/src/views/abnormalAlarm/databaseMonitor/instances/conditionBox.vue
@@ -92,7 +92,18 @@ export default {
     getDbList() {
       getAction("/sysDatabase/sourceList").then(res => {
         if (res.success) {
-          this.value.hostId = this.$route.query.id || res.result[0].hostId
+          const sourceId = this.$route.query.id
+          // 如果url中有sourceId
+          if(sourceId) {
+            const find = res.result.find(item => item.sourceId == sourceId)
+            if(find) {
+              this.value.hostId = find.hostId
+            }
+          }
+          if(!this.value.hostId) {
+            this.value.hostId = res.result[0].hostId
+          }
+          
           this.DbOptions = res.result.map(item => {
             return {
               label: item.sourceName,
diff --git a/src/views/abnormalAlarm/databaseMonitor/instances/monitor.vue b/src/views/abnormalAlarm/databaseMonitor/instances/monitor.vue
index 08b17e8..2695d99 100644
--- a/src/views/abnormalAlarm/databaseMonitor/instances/monitor.vue
+++ b/src/views/abnormalAlarm/databaseMonitor/instances/monitor.vue
@@ -2,8 +2,8 @@
   <div style="height: 100%">
     <ConditionBox :value="queryParams" @change="getData" @refresh="getData"></ConditionBox>
     <div class="monitor-content">
-      <a-row :gutter="10" style="height: auto">
-        <a-col :span="12" style="height: 240px" v-for="(el, i) in chartData" :key="i">
+      <a-row :gutter="10" style="height: 100%">
+        <a-col :span="12" style="height: 33.3333%" v-for="(el, i) in chartData" :key="i">
           <div class="monitor-content-item">
             <AreaChart
               :title="el.title"
@@ -17,7 +17,7 @@
           </div>
         </a-col>
       </a-row>
-      <div style="height: auto; margin-top: 15px; padding-right: 10px">
+      <!-- <div style="height: auto; margin-top: 15px; padding-right: 10px">
         <BoxTitle title="Connect List"></BoxTitle>
         <a-row :gutter="20" style="height: auto; margin-top: 15px">
           <a-col :span="8" v-for="(el, i) in mailData" :key="i">
@@ -38,7 +38,7 @@
             </div>
           </a-col>
         </a-row>
-      </div>
+      </div> -->
     </div>
   </div>
 </template>
@@ -376,7 +376,6 @@ export default {
                 val.value = Number(this.dataConversion(number, item.newUnits))
               })
             }
-            console.log('%c [  ]-379', 'font-size:13px; background:pink; color:#bf2c9f;', item.list)
             Object.assign(chartItem, item)
           })
         } else {