diff --git a/src/api/alarm/deviceStatics.js b/src/api/alarm/deviceStatics.js index 943603d..c375ac5 100644 --- a/src/api/alarm/deviceStatics.js +++ b/src/api/alarm/deviceStatics.js @@ -3,24 +3,6 @@ */ import request from '@/utils/request' -// 报警情况统计 -export function deviceStaticsByDept(params) { - return request({ - url: 'statics/alarmStaticsByStatus', - method: 'get', - params - }) -} - -// 井下各类报警排名 -export function alarmStaticsByContent(params) { - return request({ - url: 'statics/alarmStaticsByContent', - method: 'get', - params - }) -} - // 报警设备查询 export function getDeviceAlarmList(params) { return request({ diff --git a/src/api/alarm/deviceStatics.js b/src/api/alarm/deviceStatics.js index 943603d..c375ac5 100644 --- a/src/api/alarm/deviceStatics.js +++ b/src/api/alarm/deviceStatics.js @@ -3,24 +3,6 @@ */ import request from '@/utils/request' -// 报警情况统计 -export function deviceStaticsByDept(params) { - return request({ - url: 'statics/alarmStaticsByStatus', - method: 'get', - params - }) -} - -// 井下各类报警排名 -export function alarmStaticsByContent(params) { - return request({ - url: 'statics/alarmStaticsByContent', - method: 'get', - params - }) -} - // 报警设备查询 export function getDeviceAlarmList(params) { return request({ diff --git a/src/api/data/data.js b/src/api/data/data.js index 9d23a3e..d87e74a 100644 --- a/src/api/data/data.js +++ b/src/api/data/data.js @@ -366,3 +366,31 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } + +// 硫化氢数据查询，不分页 +export function getH2SDataSingle(params) { + return request({ + url: 'h2s/list', + method: 'get', + params + }) +} + +// 硫化氢数据查询 +export function getH2SData(params) { + return request({ + url: 'h2s/list-page', + method: 'get', + params + }) +} +// 批量导出硫化氢数据 +export function batchExportH2SData(params) { + return request({ + url: 'h2s/export', + method: 'get', + timeout: 120000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} diff --git a/src/api/alarm/deviceStatics.js b/src/api/alarm/deviceStatics.js index 943603d..c375ac5 100644 --- a/src/api/alarm/deviceStatics.js +++ b/src/api/alarm/deviceStatics.js @@ -3,24 +3,6 @@ */ import request from '@/utils/request' -// 报警情况统计 -export function deviceStaticsByDept(params) { - return request({ - url: 'statics/alarmStaticsByStatus', - method: 'get', - params - }) -} - -// 井下各类报警排名 -export function alarmStaticsByContent(params) { - return request({ - url: 'statics/alarmStaticsByContent', - method: 'get', - params - }) -} - // 报警设备查询 export function getDeviceAlarmList(params) { return request({ diff --git a/src/api/data/data.js b/src/api/data/data.js index 9d23a3e..d87e74a 100644 --- a/src/api/data/data.js +++ b/src/api/data/data.js @@ -366,3 +366,31 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } + +// 硫化氢数据查询，不分页 +export function getH2SDataSingle(params) { + return request({ + url: 'h2s/list', + method: 'get', + params + }) +} + +// 硫化氢数据查询 +export function getH2SData(params) { + return request({ + url: 'h2s/list-page', + method: 'get', + params + }) +} +// 批量导出硫化氢数据 +export function batchExportH2SData(params) { + return request({ + url: 'h2s/export', + method: 'get', + timeout: 120000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js index d6b7a72..56a1ea4 100644 --- a/src/api/data/dataStatics.js +++ b/src/api/data/dataStatics.js @@ -46,6 +46,15 @@ }) } +// 根据设备类型统计设备数量 +export function deviceOfflineByType(params) { + return request({ + url: '/statics/deviceStaticsByStatusAndType', + method: 'get', + params + }) +} + // 离线设备数量 export function deviceStaticsByOnline(params) { return request({ @@ -126,3 +135,20 @@ }) } +// 井下各类报警排名 +export function alarmStaticsByContent(params) { + return request({ + url: '/statics/alarmStaticsByContent', + method: 'get', + params + }) +} + +// 报警的井排名 +export function alarmWellRank(params) { + return request({ + url: '/statics/alarmWellListPage', + method: 'get', + params + }) +} diff --git a/src/api/alarm/deviceStatics.js b/src/api/alarm/deviceStatics.js index 943603d..c375ac5 100644 --- a/src/api/alarm/deviceStatics.js +++ b/src/api/alarm/deviceStatics.js @@ -3,24 +3,6 @@ */ import request from '@/utils/request' -// 报警情况统计 -export function deviceStaticsByDept(params) { - return request({ - url: 'statics/alarmStaticsByStatus', - method: 'get', - params - }) -} - -// 井下各类报警排名 -export function alarmStaticsByContent(params) { - return request({ - url: 'statics/alarmStaticsByContent', - method: 'get', - params - }) -} - // 报警设备查询 export function getDeviceAlarmList(params) { return request({ diff --git a/src/api/data/data.js b/src/api/data/data.js index 9d23a3e..d87e74a 100644 --- a/src/api/data/data.js +++ b/src/api/data/data.js @@ -366,3 +366,31 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } + +// 硫化氢数据查询，不分页 +export function getH2SDataSingle(params) { + return request({ + url: 'h2s/list', + method: 'get', + params + }) +} + +// 硫化氢数据查询 +export function getH2SData(params) { + return request({ + url: 'h2s/list-page', + method: 'get', + params + }) +} +// 批量导出硫化氢数据 +export function batchExportH2SData(params) { + return request({ + url: 'h2s/export', + method: 'get', + timeout: 120000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js index d6b7a72..56a1ea4 100644 --- a/src/api/data/dataStatics.js +++ b/src/api/data/dataStatics.js @@ -46,6 +46,15 @@ }) } +// 根据设备类型统计设备数量 +export function deviceOfflineByType(params) { + return request({ + url: '/statics/deviceStaticsByStatusAndType', + method: 'get', + params + }) +} + // 离线设备数量 export function deviceStaticsByOnline(params) { return request({ @@ -126,3 +135,20 @@ }) } +// 井下各类报警排名 +export function alarmStaticsByContent(params) { + return request({ + url: '/statics/alarmStaticsByContent', + method: 'get', + params + }) +} + +// 报警的井排名 +export function alarmWellRank(params) { + return request({ + url: '/statics/alarmWellListPage', + method: 'get', + params + }) +} diff --git a/src/api/device/device.js b/src/api/device/device.js index 43b8535..e48db8d 100644 --- a/src/api/device/device.js +++ b/src/api/device/device.js @@ -91,3 +91,12 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } + +// 设备查询 +export function getOfflineDeviceList(params) { + return request({ + url: '/device/offline-list-page', + method: 'get', + params + }) +} diff --git a/src/api/alarm/deviceStatics.js b/src/api/alarm/deviceStatics.js index 943603d..c375ac5 100644 --- a/src/api/alarm/deviceStatics.js +++ b/src/api/alarm/deviceStatics.js @@ -3,24 +3,6 @@ */ import request from '@/utils/request' -// 报警情况统计 -export function deviceStaticsByDept(params) { - return request({ - url: 'statics/alarmStaticsByStatus', - method: 'get', - params - }) -} - -// 井下各类报警排名 -export function alarmStaticsByContent(params) { - return request({ - url: 'statics/alarmStaticsByContent', - method: 'get', - params - }) -} - // 报警设备查询 export function getDeviceAlarmList(params) { return request({ diff --git a/src/api/data/data.js b/src/api/data/data.js index 9d23a3e..d87e74a 100644 --- a/src/api/data/data.js +++ b/src/api/data/data.js @@ -366,3 +366,31 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } + +// 硫化氢数据查询，不分页 +export function getH2SDataSingle(params) { + return request({ + url: 'h2s/list', + method: 'get', + params + }) +} + +// 硫化氢数据查询 +export function getH2SData(params) { + return request({ + url: 'h2s/list-page', + method: 'get', + params + }) +} +// 批量导出硫化氢数据 +export function batchExportH2SData(params) { + return request({ + url: 'h2s/export', + method: 'get', + timeout: 120000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js index d6b7a72..56a1ea4 100644 --- a/src/api/data/dataStatics.js +++ b/src/api/data/dataStatics.js @@ -46,6 +46,15 @@ }) } +// 根据设备类型统计设备数量 +export function deviceOfflineByType(params) { + return request({ + url: '/statics/deviceStaticsByStatusAndType', + method: 'get', + params + }) +} + // 离线设备数量 export function deviceStaticsByOnline(params) { return request({ @@ -126,3 +135,20 @@ }) } +// 井下各类报警排名 +export function alarmStaticsByContent(params) { + return request({ + url: '/statics/alarmStaticsByContent', + method: 'get', + params + }) +} + +// 报警的井排名 +export function alarmWellRank(params) { + return request({ + url: '/statics/alarmWellListPage', + method: 'get', + params + }) +} diff --git a/src/api/device/device.js b/src/api/device/device.js index 43b8535..e48db8d 100644 --- a/src/api/device/device.js +++ b/src/api/device/device.js @@ -91,3 +91,12 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } + +// 设备查询 +export function getOfflineDeviceList(params) { + return request({ + url: '/device/offline-list-page', + method: 'get', + params + }) +} diff --git a/src/api/device/deviceTypeDetail.js b/src/api/device/deviceTypeDetail.js index c3d1c6f..a45921d 100644 --- a/src/api/device/deviceTypeDetail.js +++ b/src/api/device/deviceTypeDetail.js @@ -91,3 +91,11 @@ params }) } +// 硫化氢终端查询 +export function H2SdataList(params) { + return request({ + url: 'H2Sdata/listSimple', + method: 'get', + params + }) +} diff --git a/src/api/alarm/deviceStatics.js b/src/api/alarm/deviceStatics.js index 943603d..c375ac5 100644 --- a/src/api/alarm/deviceStatics.js +++ b/src/api/alarm/deviceStatics.js @@ -3,24 +3,6 @@ */ import request from '@/utils/request' -// 报警情况统计 -export function deviceStaticsByDept(params) { - return request({ - url: 'statics/alarmStaticsByStatus', - method: 'get', - params - }) -} - -// 井下各类报警排名 -export function alarmStaticsByContent(params) { - return request({ - url: 'statics/alarmStaticsByContent', - method: 'get', - params - }) -} - // 报警设备查询 export function getDeviceAlarmList(params) { return request({ diff --git a/src/api/data/data.js b/src/api/data/data.js index 9d23a3e..d87e74a 100644 --- a/src/api/data/data.js +++ b/src/api/data/data.js @@ -366,3 +366,31 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } + +// 硫化氢数据查询，不分页 +export function getH2SDataSingle(params) { + return request({ + url: 'h2s/list', + method: 'get', + params + }) +} + +// 硫化氢数据查询 +export function getH2SData(params) { + return request({ + url: 'h2s/list-page', + method: 'get', + params + }) +} +// 批量导出硫化氢数据 +export function batchExportH2SData(params) { + return request({ + url: 'h2s/export', + method: 'get', + timeout: 120000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js index d6b7a72..56a1ea4 100644 --- a/src/api/data/dataStatics.js +++ b/src/api/data/dataStatics.js @@ -46,6 +46,15 @@ }) } +// 根据设备类型统计设备数量 +export function deviceOfflineByType(params) { + return request({ + url: '/statics/deviceStaticsByStatusAndType', + method: 'get', + params + }) +} + // 离线设备数量 export function deviceStaticsByOnline(params) { return request({ @@ -126,3 +135,20 @@ }) } +// 井下各类报警排名 +export function alarmStaticsByContent(params) { + return request({ + url: '/statics/alarmStaticsByContent', + method: 'get', + params + }) +} + +// 报警的井排名 +export function alarmWellRank(params) { + return request({ + url: '/statics/alarmWellListPage', + method: 'get', + params + }) +} diff --git a/src/api/device/device.js b/src/api/device/device.js index 43b8535..e48db8d 100644 --- a/src/api/device/device.js +++ b/src/api/device/device.js @@ -91,3 +91,12 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } + +// 设备查询 +export function getOfflineDeviceList(params) { + return request({ + url: '/device/offline-list-page', + method: 'get', + params + }) +} diff --git a/src/api/device/deviceTypeDetail.js b/src/api/device/deviceTypeDetail.js index c3d1c6f..a45921d 100644 --- a/src/api/device/deviceTypeDetail.js +++ b/src/api/device/deviceTypeDetail.js @@ -91,3 +91,11 @@ params }) } +// 硫化氢终端查询 +export function H2SdataList(params) { + return request({ + url: 'H2Sdata/listSimple', + method: 'get', + params + }) +} diff --git a/src/components/BigData/Card/simpleCard.vue b/src/components/BigData/Card/simpleCard.vue new file mode 100644 index 0000000..320d591 --- /dev/null +++ b/src/components/BigData/Card/simpleCard.vue @@ -0,0 +1,48 @@ + + + + + diff --git a/src/api/alarm/deviceStatics.js b/src/api/alarm/deviceStatics.js index 943603d..c375ac5 100644 --- a/src/api/alarm/deviceStatics.js +++ b/src/api/alarm/deviceStatics.js @@ -3,24 +3,6 @@ */ import request from '@/utils/request' -// 报警情况统计 -export function deviceStaticsByDept(params) { - return request({ - url: 'statics/alarmStaticsByStatus', - method: 'get', - params - }) -} - -// 井下各类报警排名 -export function alarmStaticsByContent(params) { - return request({ - url: 'statics/alarmStaticsByContent', - method: 'get', - params - }) -} - // 报警设备查询 export function getDeviceAlarmList(params) { return request({ diff --git a/src/api/data/data.js b/src/api/data/data.js index 9d23a3e..d87e74a 100644 --- a/src/api/data/data.js +++ b/src/api/data/data.js @@ -366,3 +366,31 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } + +// 硫化氢数据查询，不分页 +export function getH2SDataSingle(params) { + return request({ + url: 'h2s/list', + method: 'get', + params + }) +} + +// 硫化氢数据查询 +export function getH2SData(params) { + return request({ + url: 'h2s/list-page', + method: 'get', + params + }) +} +// 批量导出硫化氢数据 +export function batchExportH2SData(params) { + return request({ + url: 'h2s/export', + method: 'get', + timeout: 120000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js index d6b7a72..56a1ea4 100644 --- a/src/api/data/dataStatics.js +++ b/src/api/data/dataStatics.js @@ -46,6 +46,15 @@ }) } +// 根据设备类型统计设备数量 +export function deviceOfflineByType(params) { + return request({ + url: '/statics/deviceStaticsByStatusAndType', + method: 'get', + params + }) +} + // 离线设备数量 export function deviceStaticsByOnline(params) { return request({ @@ -126,3 +135,20 @@ }) } +// 井下各类报警排名 +export function alarmStaticsByContent(params) { + return request({ + url: '/statics/alarmStaticsByContent', + method: 'get', + params + }) +} + +// 报警的井排名 +export function alarmWellRank(params) { + return request({ + url: '/statics/alarmWellListPage', + method: 'get', + params + }) +} diff --git a/src/api/device/device.js b/src/api/device/device.js index 43b8535..e48db8d 100644 --- a/src/api/device/device.js +++ b/src/api/device/device.js @@ -91,3 +91,12 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } + +// 设备查询 +export function getOfflineDeviceList(params) { + return request({ + url: '/device/offline-list-page', + method: 'get', + params + }) +} diff --git a/src/api/device/deviceTypeDetail.js b/src/api/device/deviceTypeDetail.js index c3d1c6f..a45921d 100644 --- a/src/api/device/deviceTypeDetail.js +++ b/src/api/device/deviceTypeDetail.js @@ -91,3 +91,11 @@ params }) } +// 硫化氢终端查询 +export function H2SdataList(params) { + return request({ + url: 'H2Sdata/listSimple', + method: 'get', + params + }) +} diff --git a/src/components/BigData/Card/simpleCard.vue b/src/components/BigData/Card/simpleCard.vue new file mode 100644 index 0000000..320d591 --- /dev/null +++ b/src/components/BigData/Card/simpleCard.vue @@ -0,0 +1,48 @@ + + + + + diff --git a/src/components/BigData/TimeButtons.vue b/src/components/BigData/TimeButtons.vue new file mode 100644 index 0000000..347bdae --- /dev/null +++ b/src/components/BigData/TimeButtons.vue @@ -0,0 +1,97 @@ + + + + + diff --git a/src/api/alarm/deviceStatics.js b/src/api/alarm/deviceStatics.js index 943603d..c375ac5 100644 --- a/src/api/alarm/deviceStatics.js +++ b/src/api/alarm/deviceStatics.js @@ -3,24 +3,6 @@ */ import request from '@/utils/request' -// 报警情况统计 -export function deviceStaticsByDept(params) { - return request({ - url: 'statics/alarmStaticsByStatus', - method: 'get', - params - }) -} - -// 井下各类报警排名 -export function alarmStaticsByContent(params) { - return request({ - url: 'statics/alarmStaticsByContent', - method: 'get', - params - }) -} - // 报警设备查询 export function getDeviceAlarmList(params) { return request({ diff --git a/src/api/data/data.js b/src/api/data/data.js index 9d23a3e..d87e74a 100644 --- a/src/api/data/data.js +++ b/src/api/data/data.js @@ -366,3 +366,31 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } + +// 硫化氢数据查询，不分页 +export function getH2SDataSingle(params) { + return request({ + url: 'h2s/list', + method: 'get', + params + }) +} + +// 硫化氢数据查询 +export function getH2SData(params) { + return request({ + url: 'h2s/list-page', + method: 'get', + params + }) +} +// 批量导出硫化氢数据 +export function batchExportH2SData(params) { + return request({ + url: 'h2s/export', + method: 'get', + timeout: 120000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js index d6b7a72..56a1ea4 100644 --- a/src/api/data/dataStatics.js +++ b/src/api/data/dataStatics.js @@ -46,6 +46,15 @@ }) } +// 根据设备类型统计设备数量 +export function deviceOfflineByType(params) { + return request({ + url: '/statics/deviceStaticsByStatusAndType', + method: 'get', + params + }) +} + // 离线设备数量 export function deviceStaticsByOnline(params) { return request({ @@ -126,3 +135,20 @@ }) } +// 井下各类报警排名 +export function alarmStaticsByContent(params) { + return request({ + url: '/statics/alarmStaticsByContent', + method: 'get', + params + }) +} + +// 报警的井排名 +export function alarmWellRank(params) { + return request({ + url: '/statics/alarmWellListPage', + method: 'get', + params + }) +} diff --git a/src/api/device/device.js b/src/api/device/device.js index 43b8535..e48db8d 100644 --- a/src/api/device/device.js +++ b/src/api/device/device.js @@ -91,3 +91,12 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } + +// 设备查询 +export function getOfflineDeviceList(params) { + return request({ + url: '/device/offline-list-page', + method: 'get', + params + }) +} diff --git a/src/api/device/deviceTypeDetail.js b/src/api/device/deviceTypeDetail.js index c3d1c6f..a45921d 100644 --- a/src/api/device/deviceTypeDetail.js +++ b/src/api/device/deviceTypeDetail.js @@ -91,3 +91,11 @@ params }) } +// 硫化氢终端查询 +export function H2SdataList(params) { + return request({ + url: 'H2Sdata/listSimple', + method: 'get', + params + }) +} diff --git a/src/components/BigData/Card/simpleCard.vue b/src/components/BigData/Card/simpleCard.vue new file mode 100644 index 0000000..320d591 --- /dev/null +++ b/src/components/BigData/Card/simpleCard.vue @@ -0,0 +1,48 @@ + + + + + diff --git a/src/components/BigData/TimeButtons.vue b/src/components/BigData/TimeButtons.vue new file mode 100644 index 0000000..347bdae --- /dev/null +++ b/src/components/BigData/TimeButtons.vue @@ -0,0 +1,97 @@ + + + + + diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index ece1818..ae7ae6d 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -20,10 +20,44 @@ ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7) return ct_month } -export function getLastMonth() { // 默认显示上个月 - const ct_month = new Date() - ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30) - return ct_month +/** + * 获取近n天日期 + * @param n + * @returns {Date} + */ +export function getRecentDay(n = 3) { + const datenow = new Date() + datenow.setDate(datenow.getDate() - n) // 获取n天前的日期 + return datenow +} + +/** + * 获取近n月日期 + * @param n + * @returns {Date} + */ +export function getRecentMonthDate(n = 3) { + const datenow = new Date() + datenow.setMonth(datenow.getMonth() - n) + return datenow +} +/** + * 获取上个月 + * @returns {Date} + */ +export function getLastMonth() { + const nowdays = new Date() + let year = nowdays.getFullYear() + let month = nowdays.getMonth() + if (month === 0) { + month = 12 + year = year - 1 + } + if (month < 10) { + month = '0' + month + } + const date = nowdays.getDate() + return new Date(year, month, date) } export function formatDate(date, fmt) { @@ -55,12 +89,55 @@ } /** - * 获取上周日志范围 + * 获取近1周日期范围 * @returns {*[]} */ -export function getSearchLastWeekTime() { // 默认7天内 +export function getSearchLastWeekTime() { const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss') const endTime = getToday('yyyy-MM-dd hh:mm:ss') return [startTime, endTime] } +/** + * 获取近1月日期范围 + * @returns {*[]} + */ +export function getSearchLastMonthTime() { + const today = new Date() + const startTime = getRecentMonthDate(1).Format('yyyy-MM-dd hh:mm:ss') + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} +/** + * 获取近3月日期范围 + * @returns {*[]} + */ +export function getSearch3MonthTime() { + const datenow = new Date() + datenow.setMonth(datenow.getMonth() - 3) + const startTime = datenow.Format('yyyy-MM-dd hh:mm:ss') + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} +/** + * 获取近3月日期范围 + * @returns {*[]} + */ +export function getSearch6MonthTime() { + const datenow = new Date() + datenow.setMonth(datenow.getMonth() - 6) + const startTime = datenow.Format('yyyy-MM-dd hh:mm:ss') + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} +/** + * 获取近1年日期范围 + * @returns {*[]} + */ +export function getSearch1YearTime() { + const datenow = new Date() + datenow.setFullYear(datenow.getFullYear() - 1) + const startTime = datenow.Format('yyyy-MM-dd hh:mm:ss') + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} diff --git a/src/api/alarm/deviceStatics.js b/src/api/alarm/deviceStatics.js index 943603d..c375ac5 100644 --- a/src/api/alarm/deviceStatics.js +++ b/src/api/alarm/deviceStatics.js @@ -3,24 +3,6 @@ */ import request from '@/utils/request' -// 报警情况统计 -export function deviceStaticsByDept(params) { - return request({ - url: 'statics/alarmStaticsByStatus', - method: 'get', - params - }) -} - -// 井下各类报警排名 -export function alarmStaticsByContent(params) { - return request({ - url: 'statics/alarmStaticsByContent', - method: 'get', - params - }) -} - // 报警设备查询 export function getDeviceAlarmList(params) { return request({ diff --git a/src/api/data/data.js b/src/api/data/data.js index 9d23a3e..d87e74a 100644 --- a/src/api/data/data.js +++ b/src/api/data/data.js @@ -366,3 +366,31 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } + +// 硫化氢数据查询，不分页 +export function getH2SDataSingle(params) { + return request({ + url: 'h2s/list', + method: 'get', + params + }) +} + +// 硫化氢数据查询 +export function getH2SData(params) { + return request({ + url: 'h2s/list-page', + method: 'get', + params + }) +} +// 批量导出硫化氢数据 +export function batchExportH2SData(params) { + return request({ + url: 'h2s/export', + method: 'get', + timeout: 120000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js index d6b7a72..56a1ea4 100644 --- a/src/api/data/dataStatics.js +++ b/src/api/data/dataStatics.js @@ -46,6 +46,15 @@ }) } +// 根据设备类型统计设备数量 +export function deviceOfflineByType(params) { + return request({ + url: '/statics/deviceStaticsByStatusAndType', + method: 'get', + params + }) +} + // 离线设备数量 export function deviceStaticsByOnline(params) { return request({ @@ -126,3 +135,20 @@ }) } +// 井下各类报警排名 +export function alarmStaticsByContent(params) { + return request({ + url: '/statics/alarmStaticsByContent', + method: 'get', + params + }) +} + +// 报警的井排名 +export function alarmWellRank(params) { + return request({ + url: '/statics/alarmWellListPage', + method: 'get', + params + }) +} diff --git a/src/api/device/device.js b/src/api/device/device.js index 43b8535..e48db8d 100644 --- a/src/api/device/device.js +++ b/src/api/device/device.js @@ -91,3 +91,12 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } + +// 设备查询 +export function getOfflineDeviceList(params) { + return request({ + url: '/device/offline-list-page', + method: 'get', + params + }) +} diff --git a/src/api/device/deviceTypeDetail.js b/src/api/device/deviceTypeDetail.js index c3d1c6f..a45921d 100644 --- a/src/api/device/deviceTypeDetail.js +++ b/src/api/device/deviceTypeDetail.js @@ -91,3 +91,11 @@ params }) } +// 硫化氢终端查询 +export function H2SdataList(params) { + return request({ + url: 'H2Sdata/listSimple', + method: 'get', + params + }) +} diff --git a/src/components/BigData/Card/simpleCard.vue b/src/components/BigData/Card/simpleCard.vue new file mode 100644 index 0000000..320d591 --- /dev/null +++ b/src/components/BigData/Card/simpleCard.vue @@ -0,0 +1,48 @@ + + + + + diff --git a/src/components/BigData/TimeButtons.vue b/src/components/BigData/TimeButtons.vue new file mode 100644 index 0000000..347bdae --- /dev/null +++ b/src/components/BigData/TimeButtons.vue @@ -0,0 +1,97 @@ + + + + + diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index ece1818..ae7ae6d 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -20,10 +20,44 @@ ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7) return ct_month } -export function getLastMonth() { // 默认显示上个月 - const ct_month = new Date() - ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30) - return ct_month +/** + * 获取近n天日期 + * @param n + * @returns {Date} + */ +export function getRecentDay(n = 3) { + const datenow = new Date() + datenow.setDate(datenow.getDate() - n) // 获取n天前的日期 + return datenow +} + +/** + * 获取近n月日期 + * @param n + * @returns {Date} + */ +export function getRecentMonthDate(n = 3) { + const datenow = new Date() + datenow.setMonth(datenow.getMonth() - n) + return datenow +} +/** + * 获取上个月 + * @returns {Date} + */ +export function getLastMonth() { + const nowdays = new Date() + let year = nowdays.getFullYear() + let month = nowdays.getMonth() + if (month === 0) { + month = 12 + year = year - 1 + } + if (month < 10) { + month = '0' + month + } + const date = nowdays.getDate() + return new Date(year, month, date) } export function formatDate(date, fmt) { @@ -55,12 +89,55 @@ } /** - * 获取上周日志范围 + * 获取近1周日期范围 * @returns {*[]} */ -export function getSearchLastWeekTime() { // 默认7天内 +export function getSearchLastWeekTime() { const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss') const endTime = getToday('yyyy-MM-dd hh:mm:ss') return [startTime, endTime] } +/** + * 获取近1月日期范围 + * @returns {*[]} + */ +export function getSearchLastMonthTime() { + const today = new Date() + const startTime = getRecentMonthDate(1).Format('yyyy-MM-dd hh:mm:ss') + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} +/** + * 获取近3月日期范围 + * @returns {*[]} + */ +export function getSearch3MonthTime() { + const datenow = new Date() + datenow.setMonth(datenow.getMonth() - 3) + const startTime = datenow.Format('yyyy-MM-dd hh:mm:ss') + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} +/** + * 获取近3月日期范围 + * @returns {*[]} + */ +export function getSearch6MonthTime() { + const datenow = new Date() + datenow.setMonth(datenow.getMonth() - 6) + const startTime = datenow.Format('yyyy-MM-dd hh:mm:ss') + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} +/** + * 获取近1年日期范围 + * @returns {*[]} + */ +export function getSearch1YearTime() { + const datenow = new Date() + datenow.setFullYear(datenow.getFullYear() - 1) + const startTime = datenow.Format('yyyy-MM-dd hh:mm:ss') + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue index da6c393..baf8cba 100644 --- a/src/views/alarmStatics/alarmStatics.vue +++ b/src/views/alarmStatics/alarmStatics.vue @@ -1,35 +1,56 @@ diff --git a/src/api/alarm/deviceStatics.js b/src/api/alarm/deviceStatics.js index 943603d..c375ac5 100644 --- a/src/api/alarm/deviceStatics.js +++ b/src/api/alarm/deviceStatics.js @@ -3,24 +3,6 @@ */ import request from '@/utils/request' -// 报警情况统计 -export function deviceStaticsByDept(params) { - return request({ - url: 'statics/alarmStaticsByStatus', - method: 'get', - params - }) -} - -// 井下各类报警排名 -export function alarmStaticsByContent(params) { - return request({ - url: 'statics/alarmStaticsByContent', - method: 'get', - params - }) -} - // 报警设备查询 export function getDeviceAlarmList(params) { return request({ diff --git a/src/api/data/data.js b/src/api/data/data.js index 9d23a3e..d87e74a 100644 --- a/src/api/data/data.js +++ b/src/api/data/data.js @@ -366,3 +366,31 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } + +// 硫化氢数据查询，不分页 +export function getH2SDataSingle(params) { + return request({ + url: 'h2s/list', + method: 'get', + params + }) +} + +// 硫化氢数据查询 +export function getH2SData(params) { + return request({ + url: 'h2s/list-page', + method: 'get', + params + }) +} +// 批量导出硫化氢数据 +export function batchExportH2SData(params) { + return request({ + url: 'h2s/export', + method: 'get', + timeout: 120000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js index d6b7a72..56a1ea4 100644 --- a/src/api/data/dataStatics.js +++ b/src/api/data/dataStatics.js @@ -46,6 +46,15 @@ }) } +// 根据设备类型统计设备数量 +export function deviceOfflineByType(params) { + return request({ + url: '/statics/deviceStaticsByStatusAndType', + method: 'get', + params + }) +} + // 离线设备数量 export function deviceStaticsByOnline(params) { return request({ @@ -126,3 +135,20 @@ }) } +// 井下各类报警排名 +export function alarmStaticsByContent(params) { + return request({ + url: '/statics/alarmStaticsByContent', + method: 'get', + params + }) +} + +// 报警的井排名 +export function alarmWellRank(params) { + return request({ + url: '/statics/alarmWellListPage', + method: 'get', + params + }) +} diff --git a/src/api/device/device.js b/src/api/device/device.js index 43b8535..e48db8d 100644 --- a/src/api/device/device.js +++ b/src/api/device/device.js @@ -91,3 +91,12 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } + +// 设备查询 +export function getOfflineDeviceList(params) { + return request({ + url: '/device/offline-list-page', + method: 'get', + params + }) +} diff --git a/src/api/device/deviceTypeDetail.js b/src/api/device/deviceTypeDetail.js index c3d1c6f..a45921d 100644 --- a/src/api/device/deviceTypeDetail.js +++ b/src/api/device/deviceTypeDetail.js @@ -91,3 +91,11 @@ params }) } +// 硫化氢终端查询 +export function H2SdataList(params) { + return request({ + url: 'H2Sdata/listSimple', + method: 'get', + params + }) +} diff --git a/src/components/BigData/Card/simpleCard.vue b/src/components/BigData/Card/simpleCard.vue new file mode 100644 index 0000000..320d591 --- /dev/null +++ b/src/components/BigData/Card/simpleCard.vue @@ -0,0 +1,48 @@ + + + + + diff --git a/src/components/BigData/TimeButtons.vue b/src/components/BigData/TimeButtons.vue new file mode 100644 index 0000000..347bdae --- /dev/null +++ b/src/components/BigData/TimeButtons.vue @@ -0,0 +1,97 @@ + + + + + diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index ece1818..ae7ae6d 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -20,10 +20,44 @@ ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7) return ct_month } -export function getLastMonth() { // 默认显示上个月 - const ct_month = new Date() - ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30) - return ct_month +/** + * 获取近n天日期 + * @param n + * @returns {Date} + */ +export function getRecentDay(n = 3) { + const datenow = new Date() + datenow.setDate(datenow.getDate() - n) // 获取n天前的日期 + return datenow +} + +/** + * 获取近n月日期 + * @param n + * @returns {Date} + */ +export function getRecentMonthDate(n = 3) { + const datenow = new Date() + datenow.setMonth(datenow.getMonth() - n) + return datenow +} +/** + * 获取上个月 + * @returns {Date} + */ +export function getLastMonth() { + const nowdays = new Date() + let year = nowdays.getFullYear() + let month = nowdays.getMonth() + if (month === 0) { + month = 12 + year = year - 1 + } + if (month < 10) { + month = '0' + month + } + const date = nowdays.getDate() + return new Date(year, month, date) } export function formatDate(date, fmt) { @@ -55,12 +89,55 @@ } /** - * 获取上周日志范围 + * 获取近1周日期范围 * @returns {*[]} */ -export function getSearchLastWeekTime() { // 默认7天内 +export function getSearchLastWeekTime() { const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss') const endTime = getToday('yyyy-MM-dd hh:mm:ss') return [startTime, endTime] } +/** + * 获取近1月日期范围 + * @returns {*[]} + */ +export function getSearchLastMonthTime() { + const today = new Date() + const startTime = getRecentMonthDate(1).Format('yyyy-MM-dd hh:mm:ss') + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} +/** + * 获取近3月日期范围 + * @returns {*[]} + */ +export function getSearch3MonthTime() { + const datenow = new Date() + datenow.setMonth(datenow.getMonth() - 3) + const startTime = datenow.Format('yyyy-MM-dd hh:mm:ss') + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} +/** + * 获取近3月日期范围 + * @returns {*[]} + */ +export function getSearch6MonthTime() { + const datenow = new Date() + datenow.setMonth(datenow.getMonth() - 6) + const startTime = datenow.Format('yyyy-MM-dd hh:mm:ss') + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} +/** + * 获取近1年日期范围 + * @returns {*[]} + */ +export function getSearch1YearTime() { + const datenow = new Date() + datenow.setFullYear(datenow.getFullYear() - 1) + const startTime = datenow.Format('yyyy-MM-dd hh:mm:ss') + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue index da6c393..baf8cba 100644 --- a/src/views/alarmStatics/alarmStatics.vue +++ b/src/views/alarmStatics/alarmStatics.vue @@ -1,35 +1,56 @@ diff --git a/src/views/alarmStatics/components/alarmHistoryByType.vue b/src/views/alarmStatics/components/alarmHistoryByType.vue index 7e137ea..4f1b656 100644 --- a/src/views/alarmStatics/components/alarmHistoryByType.vue +++ b/src/views/alarmStatics/components/alarmHistoryByType.vue @@ -1,124 +1,63 @@