From 89a06fab30dbd33564da045fe075c6e71099e2f9 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: Tue, 12 Mar 2024 11:52:11 +0800
Subject: [PATCH] =?UTF-8?q?Database=20Monitor=20=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=96=E5=80=BC=E5=AD=97=E6=AE=B5=EF=BC=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B6=85=E5=87=BA=E9=9A=90=E8=97=8F=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=20=E6=B7=BB=E5=8A=A0=E6=82=AC=E6=B5=AE=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E6=A1=86=EF=BC=8C=E5=8F=8A=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../databaseMonitor/alarmHistory/index.vue    | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/views/abnormalAlarm/databaseMonitor/alarmHistory/index.vue b/src/views/abnormalAlarm/databaseMonitor/alarmHistory/index.vue
index 97f82ed..b34412b 100644
--- a/src/views/abnormalAlarm/databaseMonitor/alarmHistory/index.vue
+++ b/src/views/abnormalAlarm/databaseMonitor/alarmHistory/index.vue
@@ -10,13 +10,15 @@
         :loading="loading"
         :pagination="false"
         :canSelect="false"
+        :scroll="{ y: 655 }"
       >
         <template slot="info" slot-scope="{ record }">
-          <div class="info-alarm">{{ record.alarmValue }}{{ JSON.parse(record.operator).units }}</div>
-          <div>
-            {{ JSON.parse(record.operator).name }} {{ JSON.parse(record.operator).operator }}
-            {{ JSON.parse(record.operator).threshold }}{{ JSON.parse(record.operator).units }}
-          </div>
+          <a-popover>
+            <template slot="content">
+              {{ JSON.parse(record.alarmInfo) }}{{ JSON.parse(record.operator).units }}
+            </template>
+            {{ JSON.parse(record.alarmInfo) }}{{ JSON.parse(record.operator).units }}
+          </a-popover>
         </template>
       </TableList>
       <a-pagination
@@ -60,6 +62,7 @@ const columns = [
   {
     title: 'ALARM INFO',
     align: 'left',
+    ellipsis: true,
     dataIndex: 'alarmInfo',
     scopedSlots: {
       customRender: 'info',
@@ -162,7 +165,7 @@ export default {
 
 <style lang="less" scoped>
 .server-main {
-  width: 100%;
+  // width: 100%;
   height: calc(100% - 50px);
   overflow: hidden;
   padding-top: 15px;
@@ -177,7 +180,7 @@ export default {
 }
 .info-alarm {
   font-family: ArialMT;
-  font-size: 18px;
-  color: #f62424;
+  font-size: 16px;
+  // color: #f62424;
 }
 </style>
\ No newline at end of file