From 9c30a2d773aede8f1ff1b96e38b43ee187fdb777 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: Wed, 15 Nov 2023 13:38:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=20alarm=20=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=EF=BC=8CDB=20Monitor=20overview=20=E9=A1=B5=E9=9D=A2=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=8F=8A=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E5=A4=84=E7=90=86=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E7=9A=84=E6=A0=A1=E9=AA=8C=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20=E8=B0=83=E6=95=B4instances=20tablespace=20=E9=A1=B5?=
 =?UTF-8?q?=E7=AD=BE=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E5=8F=8A=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../databaseMonitor/instances/tableSpace.vue  | 10 ++++-----
 .../databaseMonitor/overview/index.vue        | 22 ++++++++++---------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/views/abnormalAlarm/databaseMonitor/instances/tableSpace.vue b/src/views/abnormalAlarm/databaseMonitor/instances/tableSpace.vue
index 488d337..7f6e08a 100644
--- a/src/views/abnormalAlarm/databaseMonitor/instances/tableSpace.vue
+++ b/src/views/abnormalAlarm/databaseMonitor/instances/tableSpace.vue
@@ -2,8 +2,8 @@
   <div style="height: 100%">
     <div class="monitor-search">
       <a-row type="flex" :gutter="10">
-        <a-col flex="335px">
-          <span class="item-label">Database name</span>
+        <a-col flex="305px">
+          <span class="item-label">DataSource</span>
           <a-select
             style="width: 180px"
             v-model="name"
@@ -154,7 +154,7 @@ export default {
     },
     getDbNameList() {
       let params = {
-        dbType: 'ORACLE',
+        sourceId: this.name,
       }
       getAction('/sysDatabase/dbNames', params).then((res) => {
         if (res.success) {
@@ -176,8 +176,8 @@ export default {
     ondbNameChange(val) {
       this.loading = true
       let params = {
-        dbType: 'ORACLE',
-        dataBase: val,
+        sourceId: this.name,
+        dbName: val,
       }
       getAction('/sysDatabase/dbInfo', params).then((res) => {
         this.loading = false
diff --git a/src/views/abnormalAlarm/databaseMonitor/overview/index.vue b/src/views/abnormalAlarm/databaseMonitor/overview/index.vue
index d47726f..9a92eae 100644
--- a/src/views/abnormalAlarm/databaseMonitor/overview/index.vue
+++ b/src/views/abnormalAlarm/databaseMonitor/overview/index.vue
@@ -104,11 +104,11 @@
           />
         </a-form-item>
         <a-form-item label="Drive">
-          <a-input-number
+          <a-input
             v-decorator="[
               'dbDriver',
               {
-                rules: [{ required: true, message: 'Please input port!' }],
+                rules: [{ required: true, message: 'Please input drive!' }],
                 initialVale: this.formVal.dbDriver,
               },
             ]"
@@ -119,7 +119,7 @@
             v-decorator="[
               'dbUrl',
               {
-                rules: [{ required: true, message: 'Please input ip address!' }],
+                rules: [{ required: true, message: 'Please input url!' }],
                 initialVale: this.formVal.dbUrl,
               },
             ]"
@@ -176,20 +176,22 @@ const columns = [
       customRender: 'status',
     },
   },
-  {
-    title: 'IP ADDRESS',
-    align: 'center',
-    dataIndex: 'ipAddress',
-  },
+  // {
+  //   title: 'IP ADDRESS',
+  //   align: 'center',
+  //   dataIndex: 'ipAddress',
+  // },
   {
     title: 'DB TYPE',
     align: 'center',
     dataIndex: 'dataBaseType',
   },
   {
-    title: 'PROT',
+    title: 'URL',
     align: 'center',
-    dataIndex: 'port',
+    dataIndex: 'url',
+    ellipsis: true,
+    width: 300,
   },
   {
     title: 'SLOW QUERY',