From 995931c822c5e735b4a960e24df2a9e43daea6c3 Mon Sep 17 00:00:00 2001
From: renpy <peiyu_ren@163.com>
Date: Tue, 1 Aug 2023 10:34:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=88=86=E9=A1=B5=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/manage.js                                |  4 ++++
 .../alarmCenter/alarmHistory/index.vue           | 16 +++++++++++-----
 .../databaseMonitor/alarmHistory/index.vue       | 16 +++++++++++-----
 .../emailMonitor/alarmHistory/index.vue          | 16 +++++++++++-----
 .../serverMonitor/alarmHistory/index.vue         | 16 +++++++++++-----
 5 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/src/api/manage.js b/src/api/manage.js
index 5ce1de7..411538c 100644
--- a/src/api/manage.js
+++ b/src/api/manage.js
@@ -1,6 +1,7 @@
 import Vue from 'vue'
 import { axios } from '@/utils/request'
 import signMd5Utils from '@/utils/encryption/signMd5Utils'
+import qs from "qs";
 
 const api = {
   user: '/mock/api/user',
@@ -65,6 +66,9 @@ export function getAction(url,parameter) {
     url: url,
     method: 'get',
     params: parameter,
+    paramsSerializer: function (params) {  
+      return qs.stringify(params, { arrayFormat: "repeat" });  
+    },
     headers: signHeader
   })
 }
diff --git a/src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue b/src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue
index ab70151..31d31f6 100644
--- a/src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue
+++ b/src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue
@@ -128,7 +128,8 @@ export default {
       url: {
         list: '/alarmLog/findPage'
       },
-      pieTotal:0
+      pieTotal: 0,
+      paramsArg: {}
     }
   },
   mounted () {
@@ -138,7 +139,12 @@ export default {
     getUid() {
       return (Math.random()+new Date().getTime()).toString(32).slice(0,8)
     },
-    handleSearch({ startDate, endDate,types }) {
+    handleSearch({ startDate, endDate, types }) {
+      this.paramsArg = {
+        startDate,
+        endDate,
+        types
+      }
       this.getAlarmLogBar({ startDate, endDate })
       this.getTypeAlarmPie({ startDate, endDate })
       this.getAlarmLogTable({ startDate, endDate, types })
@@ -164,7 +170,7 @@ export default {
       let params = {
         pageNo: this.ipagination.current,
         pageSize: this.ipagination.pageSize,
-        type:obj.types,
+        type:obj.types || null,
         startDate:obj.startDate,
         endDate:obj.endDate
       }
@@ -261,12 +267,12 @@ export default {
     handlePageChange(page, pageSize) {
       this.ipagination.current = page
       this.ipagination.pageSize = pageSize
-      this.getAlarmLogTable()
+      this.getAlarmLogTable(this.paramsArg)
     },
     handleSizeChange(current, size) {
       this.ipagination.current = current
       this.ipagination.pageSize = size
-      this.getAlarmLogTable()
+      this.getAlarmLogTable(this.paramsArg)
     },
     handleTabChange(key) {
       console.log(key);
diff --git a/src/views/abnormalAlarm/databaseMonitor/alarmHistory/index.vue b/src/views/abnormalAlarm/databaseMonitor/alarmHistory/index.vue
index 0dcdb0f..2876055 100644
--- a/src/views/abnormalAlarm/databaseMonitor/alarmHistory/index.vue
+++ b/src/views/abnormalAlarm/databaseMonitor/alarmHistory/index.vue
@@ -34,6 +34,7 @@
 </template>
 
 <script>
+import dateFormat from '@/components/jeecg/JEasyCron/format-date'
 import SearchBar from '../../components/searchBar';
 import TableList from '../../components/tableList.vue';
 import { getAction,postAction,httpAction,deleteAction } from '@/api/manage'
@@ -79,11 +80,12 @@ export default {
       nameOptions: [],
       dataSource: [],
       loading: false,
-      
+      paramsArg: {}
     }
   },
   mounted () {
     this.getDbList();
+    this.getDbAlarmHistory({startDate:dateFormat(new Date(), 'yyyy-MM-dd'),endDate:dateFormat(new Date(), 'yyyy-MM-dd')})
   },
   methods: {
     getDbList() {
@@ -101,13 +103,17 @@ export default {
       })
     },
     handleSearch({ startDate, endDate, names }) {
-      console.log(startDate, endDate, names);
+      this.paramsArg = {
+        startDate,
+        endDate,
+        names
+      }
       this.getDbAlarmHistory({ startDate, endDate, names })
     },
     getDbAlarmHistory(obj) {
       this.loading = true
       let params = {
-        sourceId: obj.names,
+        sourceId: obj.names||null,
         startDate:obj.startDate,
         endDate: obj.endDate,
         pageNo: this.ipagination.current,
@@ -129,12 +135,12 @@ export default {
     handlePageChange(page, pageSize) {
       this.ipagination.current = page
       this.ipagination.pageSize = pageSize
-      this.getDbAlarmHistory()
+      this.getDbAlarmHistory(this.paramsArg)
     },
     handleSizeChange(current, size) {
       this.ipagination.current = current
       this.ipagination.pageSize = size
-      this.getDbAlarmHistory()
+      this.getDbAlarmHistory(this.paramsArg)
     },
   },
 }
diff --git a/src/views/abnormalAlarm/emailMonitor/alarmHistory/index.vue b/src/views/abnormalAlarm/emailMonitor/alarmHistory/index.vue
index 5e794d0..1e5e932 100644
--- a/src/views/abnormalAlarm/emailMonitor/alarmHistory/index.vue
+++ b/src/views/abnormalAlarm/emailMonitor/alarmHistory/index.vue
@@ -34,6 +34,7 @@
 </template>
 
 <script>
+import dateFormat from '@/components/jeecg/JEasyCron/format-date'
 import SearchBar from '../../components/searchBar';
 import TableList from '../../components/tableList.vue';
 import { getAction,postAction,httpAction,deleteAction } from '@/api/manage'
@@ -79,11 +80,12 @@ export default {
       nameOptions: [],
       dataSource: [],
       loading: false,
-      
+      paramsArg: {}
     }
   },
   mounted () {
     this.getEmailList();
+    this.getEmailAlarmHistory({startDate:dateFormat(new Date(), 'yyyy-MM-dd'),endDate:dateFormat(new Date(), 'yyyy-MM-dd')})
   },
   methods: {
     getEmailList() {
@@ -101,13 +103,17 @@ export default {
       })
     },
     handleSearch({ startDate, endDate, names }) {
-      console.log(startDate, endDate, names);
+      this.paramsArg = {
+        startDate,
+        endDate,
+        names
+      }
       this.getEmailAlarmHistory({ startDate, endDate, names })
     },
     getEmailAlarmHistory(obj) {
       this.loading = true
       let params = {
-        sourceId: obj.names,
+        sourceId: obj.names||null,
         startDate:obj.startDate,
         endDate: obj.endDate,
         pageNo: this.ipagination.current,
@@ -129,12 +135,12 @@ export default {
     handlePageChange(page, pageSize) {
       this.ipagination.current = page
       this.ipagination.pageSize = pageSize
-      this.getEmailAlarmHistory()
+      this.getEmailAlarmHistory(this.paramsArg)
     },
     handleSizeChange(current, size) {
       this.ipagination.current = current
       this.ipagination.pageSize = size
-      this.getEmailAlarmHistory()
+      this.getEmailAlarmHistory(this.paramsArg)
     },
   },
 }
diff --git a/src/views/abnormalAlarm/serverMonitor/alarmHistory/index.vue b/src/views/abnormalAlarm/serverMonitor/alarmHistory/index.vue
index 6bfb7a0..c7bf57b 100644
--- a/src/views/abnormalAlarm/serverMonitor/alarmHistory/index.vue
+++ b/src/views/abnormalAlarm/serverMonitor/alarmHistory/index.vue
@@ -34,6 +34,7 @@
 </template>
 
 <script>
+import dateFormat from '@/components/jeecg/JEasyCron/format-date'
 import SearchBar from '../../components/searchBar';
 import TableList from '../../components/tableList.vue';
 import { getAction,postAction,httpAction,deleteAction } from '@/api/manage'
@@ -79,11 +80,12 @@ export default {
       nameOptions: [],
       dataSource: [],
       loading: false,
-      
+      paramsArg: {}
     }
   },
   mounted () {
     this.getServerList();
+    this.getServerAlarmHistory({startDate:dateFormat(new Date(), 'yyyy-MM-dd'),endDate:dateFormat(new Date(), 'yyyy-MM-dd')})
   },
   methods: {
     getServerList() {
@@ -101,13 +103,17 @@ export default {
       })
     },
     handleSearch({ startDate, endDate, names }) {
-      console.log(startDate, endDate, names);
+      this.paramsArg = {
+        startDate,
+        endDate,
+        names
+      }
       this.getServerAlarmHistory({ startDate, endDate, names })
     },
     getServerAlarmHistory(obj) {
       this.loading = true
       let params = {
-        sourceId: obj.names,
+        sourceId: obj.names||null,
         startDate:obj.startDate,
         endDate: obj.endDate,
         pageNo: this.ipagination.current,
@@ -129,12 +135,12 @@ export default {
     handlePageChange(page, pageSize) {
       this.ipagination.current = page
       this.ipagination.pageSize = pageSize
-      this.getServerAlarmHistory()
+      this.getServerAlarmHistory(this.paramsArg)
     },
     handleSizeChange(current, size) {
       this.ipagination.current = current
       this.ipagination.pageSize = size
-      this.getServerAlarmHistory()
+      this.getServerAlarmHistory(this.paramsArg)
     },
   },
 }