From 88eb8d89b7c4f722aac1ad59b3e9a2e6f6c39700 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 14:57:48 +0800
Subject: [PATCH] =?UTF-8?q?center=20=E6=9C=8D=E5=8A=A1=E5=99=A8=20?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=20=E9=82=AE=E7=AE=B1=20=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=BD=A2=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../alarmCenter/alarmHistory/index.vue            | 12 +++++++-----
 .../emailMonitor/alarmHistory/index.vue           | 15 +++++++++------
 .../serverMonitor/alarmHistory/index.vue          | 15 +++++++++------
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue b/src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue
index 080e624..67b9c98 100644
--- a/src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue
+++ b/src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue
@@ -15,11 +15,12 @@
               :canSelect="false"
             >
               <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>
             </custom-table>
           </div>
@@ -91,6 +92,7 @@ const columns = [
   {
     title: 'ALARM INFO',
     align: 'left',
+    ellipsis: true,
     dataIndex: 'alarmInfo',
     scopedSlots: {
       customRender: 'info',
diff --git a/src/views/abnormalAlarm/emailMonitor/alarmHistory/index.vue b/src/views/abnormalAlarm/emailMonitor/alarmHistory/index.vue
index 2bac943..ee3e663 100644
--- a/src/views/abnormalAlarm/emailMonitor/alarmHistory/index.vue
+++ b/src/views/abnormalAlarm/emailMonitor/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;
diff --git a/src/views/abnormalAlarm/serverMonitor/alarmHistory/index.vue b/src/views/abnormalAlarm/serverMonitor/alarmHistory/index.vue
index d421b2c..18c1ba1 100644
--- a/src/views/abnormalAlarm/serverMonitor/alarmHistory/index.vue
+++ b/src/views/abnormalAlarm/serverMonitor/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;