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 @@