From ba76a0a50a4e348caea6c59caa37c21a7fbb64cc Mon Sep 17 00:00:00 2001
From: renpy <peiyu_ren@163.com>
Date: Mon, 28 Aug 2023 15:57:36 +0800
Subject: [PATCH] =?UTF-8?q?alarm=20center=20=E6=A8=A1=E5=9D=97history?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4=EF=BC=8C?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=BF=85=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../alarmCenter/alarmHistory/index.vue        | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue b/src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue
index ff58160..7740977 100644
--- a/src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue
+++ b/src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue
@@ -13,9 +13,7 @@
               :list="dataSource"
               :loading="loading"
               :canSelect="false"
-              >
-              <!-- @change="handleTableChange" -->
-              <!-- :pagination="ipagination" -->
+            >
               <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>
@@ -140,15 +138,19 @@ export default {
       return (Math.random()+new Date().getTime()).toString(32).slice(0,8)
     },
     handleSearch({ startDate, endDate, types }) {
-      this.paramsArg = {
-        startDate,
-        endDate,
-        types
+      if (startDate&&endDate) {
+        this.paramsArg = {
+          startDate,
+          endDate,
+          types
+        }
+        this.getAlarmLogBar({ startDate, endDate, types })
+        this.getTypeAlarmPie({ startDate, endDate })
+        this.getAlarmLogTable({ startDate, endDate, types })
+        this.getAlarmTop({ startDate, endDate, types })
+      } else {
+        this.$message.warning("The Start Time Or End Time Cannot Be Empty!")
       }
-      this.getAlarmLogBar({ startDate, endDate, types })
-      this.getTypeAlarmPie({ startDate, endDate })
-      this.getAlarmLogTable({ startDate, endDate, types })
-      this.getAlarmTop({ startDate, endDate, types })
     },
     getAlarmLogBar(obj) {
       let params = {