diff --git a/git_commit_template.txt b/git_commit_template.txt new file mode 100644 index 0000000..2be75dd --- /dev/null +++ b/git_commit_template.txt @@ -0,0 +1,5 @@ +(): + + + +

\ No newline at end of file diff --git a/git_commit_template.txt b/git_commit_template.txt new file mode 100644 index 0000000..2be75dd --- /dev/null +++ b/git_commit_template.txt @@ -0,0 +1,5 @@ +(): + + + +

\ No newline at end of file diff --git a/src/api/data/data.js b/src/api/data/data.js index f9a1a11..2d6d209 100644 --- a/src/api/data/data.js +++ b/src/api/data/data.js @@ -2,14 +2,6 @@ * 数据管理接口 */ import request from '@/utils/request' -// 数据统计接口-查看某井监测指标 -export function getStaticData(params) { - return request({ - url: 'data/list', - method: 'get', - params - }) -} // 井盖数据查询 export function getWellData(params) { return request({ @@ -18,14 +10,79 @@ params }) } -// 井盖数据查询，不分页 -export function getWellDataSingle(params) { +// 液位数据查询 +export function getLiquidData(params) { return request({ - url: 'welldata/list', + url: 'liquiddata/list', method: 'get', params }) } +// 燃气数据查询 +export function getGasData(params) { + return request({ + url: 'gasdata/list', + method: 'get', + params + }) +} +// 管盯数据查询 +export function getTubeData(params) { + return request({ + url: 'tubedata/list', + method: 'get', + params + }) +} +// 开挖数据查询 +export function getDigData(params) { + return request({ + url: 'digdata/list', + method: 'get', + params + }) +} +// 有害气体数据查询 +export function getHarmfulData(params) { + return request({ + url: 'harmfuldata/list', + method: 'get', + params + }) +} +// 温湿度数据查询 +export function getTempData(params) { + return request({ + url: 'tempdata/list', + method: 'get', + params + }) +} +// 井盖定位监测仪数据查询 +export function getWellLocaData(params) { + return request({ + url: 'welllocadata/list', + method: 'get', + params + }) +} +// 噪声记录仪数据查询 +export function getNoiseData(params) { + return request({ + url: 'noisedata/list', + method: 'get', + params + }) +} +// 液位燃气一体化设备数据查询 +export function getLiquidGasData(params) { + return request({ + url: 'liquidGasData/list', + method: 'get', + params + }) +} + // 批量导出井盖数据 export function batchExportWellData(params) { return request({ @@ -37,15 +94,6 @@ }) } -// 液位数据查询 -export function getLiquidData(params) { - return request({ - url: 'liquiddata/list', - method: 'get', - params - }) -} - // 批量导出液位数据 export function batchExportLiquidData(params) { return request({ @@ -57,15 +105,6 @@ }) } -// 燃气数据查询 -export function getGasData(params) { - return request({ - url: 'gasdata/list', - method: 'get', - params - }) -} - // 批量导出燃气数据 export function batchExportGasData(params) { return request({ @@ -77,14 +116,6 @@ }) } -// 管盯数据查询 -export function getTubeData(params) { - return request({ - url: 'tubedata/list', - method: 'get', - params - }) -} // 批量导出管盯数据 export function batchExportTubeData(params) { return request({ @@ -95,14 +126,7 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } -// 开挖数据查询 -export function getDigData(params) { - return request({ - url: 'digdata/list', - method: 'get', - params - }) -} + // 批量导出开挖数据 export function batchExportDigData(params) { return request({ @@ -113,32 +137,7 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } -// 有害气体数据查询 -export function getHarmfulData(params) { - return request({ - url: 'harmfuldata/list', - method: 'get', - params - }) -} -// 批量导出有害气体数据 -export function batchExportHarmfulData(params) { - return request({ - url: 'harmfuldata/export', - method: 'get', - timeout: 120000, // 120s，2分钟 - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 温湿度数据查询 -export function getTempData(params) { - return request({ - url: 'tempdata/list', - method: 'get', - params - }) -} + // 批量导出温湿度数据 export function batchExportTempData(params) { return request({ @@ -150,14 +149,17 @@ }) } -// 井盖定位监测仪数据查询 -export function getWellLocaData(params) { +// 批量导出有害气体数据 +export function batchExportHarmfulData(params) { return request({ - url: 'welllocadata/list', + url: 'harmfuldata/export', method: 'get', - params + timeout: 120000, // 120s，2分钟 + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } + // 批量导出井盖定位监测仪数据 export function batchExportWellLocaData(params) { return request({ @@ -169,14 +171,6 @@ }) } -// 噪声记录仪数据查询 -export function getNoiseData(params) { - return request({ - url: 'noisedata/list', - method: 'get', - params - }) -} // 噪声记录仪数据导出 export function batchExportNoiseData(params) { return request({ @@ -187,14 +181,6 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } -// 液位燃气一体化设备数据查询 -export function getLiquidGasData(params) { - return request({ - url: 'liquidGasData/list', - method: 'get', - params - }) -} // 批量导出液位燃气一体化设备数据 export function batchExportLiquidGasData(params) { return request({ @@ -206,6 +192,15 @@ }) } +// 数据统计接口 +export function getStaticData(params) { + return request({ + url: 'data/list', + method: 'get', + params + }) +} + // 可燃气体外协数据查询 export function getGasdectorData(params) { return request({ @@ -225,7 +220,8 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } -// 激甲云台数据查询-章丘 + +// 可燃气体外协数据查询 export function getPantiltData(params) { return request({ url: '/pantilt/listpage', @@ -234,7 +230,7 @@ }) } -// 激甲云台数据导出-章丘 +// 可燃气体外协批量导出燃气数据 export function batchExportPantiltData(params) { return request({ url: '/pantilt/export', @@ -245,3 +241,22 @@ }) } +// 消防栓数据查询 +export function getHydrantData(params) { + return request({ + url: 'hydrant/list', + method: 'get', + params + }) +} + +// 批量导出消防栓数据 +export function batchExportHydrantData(params) { + return request({ + url: 'hydrant/export', + method: 'get', + timeout: 120000, // 120s，2分钟 + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} diff --git a/git_commit_template.txt b/git_commit_template.txt new file mode 100644 index 0000000..2be75dd --- /dev/null +++ b/git_commit_template.txt @@ -0,0 +1,5 @@ +(): + + + +

\ No newline at end of file diff --git a/src/api/data/data.js b/src/api/data/data.js index f9a1a11..2d6d209 100644 --- a/src/api/data/data.js +++ b/src/api/data/data.js @@ -2,14 +2,6 @@ * 数据管理接口 */ import request from '@/utils/request' -// 数据统计接口-查看某井监测指标 -export function getStaticData(params) { - return request({ - url: 'data/list', - method: 'get', - params - }) -} // 井盖数据查询 export function getWellData(params) { return request({ @@ -18,14 +10,79 @@ params }) } -// 井盖数据查询，不分页 -export function getWellDataSingle(params) { +// 液位数据查询 +export function getLiquidData(params) { return request({ - url: 'welldata/list', + url: 'liquiddata/list', method: 'get', params }) } +// 燃气数据查询 +export function getGasData(params) { + return request({ + url: 'gasdata/list', + method: 'get', + params + }) +} +// 管盯数据查询 +export function getTubeData(params) { + return request({ + url: 'tubedata/list', + method: 'get', + params + }) +} +// 开挖数据查询 +export function getDigData(params) { + return request({ + url: 'digdata/list', + method: 'get', + params + }) +} +// 有害气体数据查询 +export function getHarmfulData(params) { + return request({ + url: 'harmfuldata/list', + method: 'get', + params + }) +} +// 温湿度数据查询 +export function getTempData(params) { + return request({ + url: 'tempdata/list', + method: 'get', + params + }) +} +// 井盖定位监测仪数据查询 +export function getWellLocaData(params) { + return request({ + url: 'welllocadata/list', + method: 'get', + params + }) +} +// 噪声记录仪数据查询 +export function getNoiseData(params) { + return request({ + url: 'noisedata/list', + method: 'get', + params + }) +} +// 液位燃气一体化设备数据查询 +export function getLiquidGasData(params) { + return request({ + url: 'liquidGasData/list', + method: 'get', + params + }) +} + // 批量导出井盖数据 export function batchExportWellData(params) { return request({ @@ -37,15 +94,6 @@ }) } -// 液位数据查询 -export function getLiquidData(params) { - return request({ - url: 'liquiddata/list', - method: 'get', - params - }) -} - // 批量导出液位数据 export function batchExportLiquidData(params) { return request({ @@ -57,15 +105,6 @@ }) } -// 燃气数据查询 -export function getGasData(params) { - return request({ - url: 'gasdata/list', - method: 'get', - params - }) -} - // 批量导出燃气数据 export function batchExportGasData(params) { return request({ @@ -77,14 +116,6 @@ }) } -// 管盯数据查询 -export function getTubeData(params) { - return request({ - url: 'tubedata/list', - method: 'get', - params - }) -} // 批量导出管盯数据 export function batchExportTubeData(params) { return request({ @@ -95,14 +126,7 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } -// 开挖数据查询 -export function getDigData(params) { - return request({ - url: 'digdata/list', - method: 'get', - params - }) -} + // 批量导出开挖数据 export function batchExportDigData(params) { return request({ @@ -113,32 +137,7 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } -// 有害气体数据查询 -export function getHarmfulData(params) { - return request({ - url: 'harmfuldata/list', - method: 'get', - params - }) -} -// 批量导出有害气体数据 -export function batchExportHarmfulData(params) { - return request({ - url: 'harmfuldata/export', - method: 'get', - timeout: 120000, // 120s，2分钟 - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 温湿度数据查询 -export function getTempData(params) { - return request({ - url: 'tempdata/list', - method: 'get', - params - }) -} + // 批量导出温湿度数据 export function batchExportTempData(params) { return request({ @@ -150,14 +149,17 @@ }) } -// 井盖定位监测仪数据查询 -export function getWellLocaData(params) { +// 批量导出有害气体数据 +export function batchExportHarmfulData(params) { return request({ - url: 'welllocadata/list', + url: 'harmfuldata/export', method: 'get', - params + timeout: 120000, // 120s，2分钟 + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } + // 批量导出井盖定位监测仪数据 export function batchExportWellLocaData(params) { return request({ @@ -169,14 +171,6 @@ }) } -// 噪声记录仪数据查询 -export function getNoiseData(params) { - return request({ - url: 'noisedata/list', - method: 'get', - params - }) -} // 噪声记录仪数据导出 export function batchExportNoiseData(params) { return request({ @@ -187,14 +181,6 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } -// 液位燃气一体化设备数据查询 -export function getLiquidGasData(params) { - return request({ - url: 'liquidGasData/list', - method: 'get', - params - }) -} // 批量导出液位燃气一体化设备数据 export function batchExportLiquidGasData(params) { return request({ @@ -206,6 +192,15 @@ }) } +// 数据统计接口 +export function getStaticData(params) { + return request({ + url: 'data/list', + method: 'get', + params + }) +} + // 可燃气体外协数据查询 export function getGasdectorData(params) { return request({ @@ -225,7 +220,8 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } -// 激甲云台数据查询-章丘 + +// 可燃气体外协数据查询 export function getPantiltData(params) { return request({ url: '/pantilt/listpage', @@ -234,7 +230,7 @@ }) } -// 激甲云台数据导出-章丘 +// 可燃气体外协批量导出燃气数据 export function batchExportPantiltData(params) { return request({ url: '/pantilt/export', @@ -245,3 +241,22 @@ }) } +// 消防栓数据查询 +export function getHydrantData(params) { + return request({ + url: 'hydrant/list', + method: 'get', + params + }) +} + +// 批量导出消防栓数据 +export function batchExportHydrantData(params) { + return request({ + url: 'hydrant/export', + method: 'get', + timeout: 120000, // 120s，2分钟 + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} diff --git a/src/api/device/deviceTypeDetail.js b/src/api/device/deviceTypeDetail.js index 54a233f..c3d1c6f 100644 --- a/src/api/device/deviceTypeDetail.js +++ b/src/api/device/deviceTypeDetail.js @@ -83,4 +83,11 @@ params }) } - +// 消防栓终端查询 +export function hydrantdataList(params) { + return request({ + url: 'hydrantdata/listSimple', + method: 'get', + params + }) +} diff --git a/git_commit_template.txt b/git_commit_template.txt new file mode 100644 index 0000000..2be75dd --- /dev/null +++ b/git_commit_template.txt @@ -0,0 +1,5 @@ +(): + + + +

\ No newline at end of file diff --git a/src/api/data/data.js b/src/api/data/data.js index f9a1a11..2d6d209 100644 --- a/src/api/data/data.js +++ b/src/api/data/data.js @@ -2,14 +2,6 @@ * 数据管理接口 */ import request from '@/utils/request' -// 数据统计接口-查看某井监测指标 -export function getStaticData(params) { - return request({ - url: 'data/list', - method: 'get', - params - }) -} // 井盖数据查询 export function getWellData(params) { return request({ @@ -18,14 +10,79 @@ params }) } -// 井盖数据查询，不分页 -export function getWellDataSingle(params) { +// 液位数据查询 +export function getLiquidData(params) { return request({ - url: 'welldata/list', + url: 'liquiddata/list', method: 'get', params }) } +// 燃气数据查询 +export function getGasData(params) { + return request({ + url: 'gasdata/list', + method: 'get', + params + }) +} +// 管盯数据查询 +export function getTubeData(params) { + return request({ + url: 'tubedata/list', + method: 'get', + params + }) +} +// 开挖数据查询 +export function getDigData(params) { + return request({ + url: 'digdata/list', + method: 'get', + params + }) +} +// 有害气体数据查询 +export function getHarmfulData(params) { + return request({ + url: 'harmfuldata/list', + method: 'get', + params + }) +} +// 温湿度数据查询 +export function getTempData(params) { + return request({ + url: 'tempdata/list', + method: 'get', + params + }) +} +// 井盖定位监测仪数据查询 +export function getWellLocaData(params) { + return request({ + url: 'welllocadata/list', + method: 'get', + params + }) +} +// 噪声记录仪数据查询 +export function getNoiseData(params) { + return request({ + url: 'noisedata/list', + method: 'get', + params + }) +} +// 液位燃气一体化设备数据查询 +export function getLiquidGasData(params) { + return request({ + url: 'liquidGasData/list', + method: 'get', + params + }) +} + // 批量导出井盖数据 export function batchExportWellData(params) { return request({ @@ -37,15 +94,6 @@ }) } -// 液位数据查询 -export function getLiquidData(params) { - return request({ - url: 'liquiddata/list', - method: 'get', - params - }) -} - // 批量导出液位数据 export function batchExportLiquidData(params) { return request({ @@ -57,15 +105,6 @@ }) } -// 燃气数据查询 -export function getGasData(params) { - return request({ - url: 'gasdata/list', - method: 'get', - params - }) -} - // 批量导出燃气数据 export function batchExportGasData(params) { return request({ @@ -77,14 +116,6 @@ }) } -// 管盯数据查询 -export function getTubeData(params) { - return request({ - url: 'tubedata/list', - method: 'get', - params - }) -} // 批量导出管盯数据 export function batchExportTubeData(params) { return request({ @@ -95,14 +126,7 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } -// 开挖数据查询 -export function getDigData(params) { - return request({ - url: 'digdata/list', - method: 'get', - params - }) -} + // 批量导出开挖数据 export function batchExportDigData(params) { return request({ @@ -113,32 +137,7 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } -// 有害气体数据查询 -export function getHarmfulData(params) { - return request({ - url: 'harmfuldata/list', - method: 'get', - params - }) -} -// 批量导出有害气体数据 -export function batchExportHarmfulData(params) { - return request({ - url: 'harmfuldata/export', - method: 'get', - timeout: 120000, // 120s，2分钟 - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 温湿度数据查询 -export function getTempData(params) { - return request({ - url: 'tempdata/list', - method: 'get', - params - }) -} + // 批量导出温湿度数据 export function batchExportTempData(params) { return request({ @@ -150,14 +149,17 @@ }) } -// 井盖定位监测仪数据查询 -export function getWellLocaData(params) { +// 批量导出有害气体数据 +export function batchExportHarmfulData(params) { return request({ - url: 'welllocadata/list', + url: 'harmfuldata/export', method: 'get', - params + timeout: 120000, // 120s，2分钟 + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } + // 批量导出井盖定位监测仪数据 export function batchExportWellLocaData(params) { return request({ @@ -169,14 +171,6 @@ }) } -// 噪声记录仪数据查询 -export function getNoiseData(params) { - return request({ - url: 'noisedata/list', - method: 'get', - params - }) -} // 噪声记录仪数据导出 export function batchExportNoiseData(params) { return request({ @@ -187,14 +181,6 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } -// 液位燃气一体化设备数据查询 -export function getLiquidGasData(params) { - return request({ - url: 'liquidGasData/list', - method: 'get', - params - }) -} // 批量导出液位燃气一体化设备数据 export function batchExportLiquidGasData(params) { return request({ @@ -206,6 +192,15 @@ }) } +// 数据统计接口 +export function getStaticData(params) { + return request({ + url: 'data/list', + method: 'get', + params + }) +} + // 可燃气体外协数据查询 export function getGasdectorData(params) { return request({ @@ -225,7 +220,8 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } -// 激甲云台数据查询-章丘 + +// 可燃气体外协数据查询 export function getPantiltData(params) { return request({ url: '/pantilt/listpage', @@ -234,7 +230,7 @@ }) } -// 激甲云台数据导出-章丘 +// 可燃气体外协批量导出燃气数据 export function batchExportPantiltData(params) { return request({ url: '/pantilt/export', @@ -245,3 +241,22 @@ }) } +// 消防栓数据查询 +export function getHydrantData(params) { + return request({ + url: 'hydrant/list', + method: 'get', + params + }) +} + +// 批量导出消防栓数据 +export function batchExportHydrantData(params) { + return request({ + url: 'hydrant/export', + method: 'get', + timeout: 120000, // 120s，2分钟 + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} diff --git a/src/api/device/deviceTypeDetail.js b/src/api/device/deviceTypeDetail.js index 54a233f..c3d1c6f 100644 --- a/src/api/device/deviceTypeDetail.js +++ b/src/api/device/deviceTypeDetail.js @@ -83,4 +83,11 @@ params }) } - +// 消防栓终端查询 +export function hydrantdataList(params) { + return request({ + url: 'hydrantdata/listSimple', + method: 'get', + params + }) +} diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue index 551c2d7..228bf65 100644 --- a/src/components/DownloadTemplate/index.vue +++ b/src/components/DownloadTemplate/index.vue @@ -49,8 +49,8 @@ diff --git a/git_commit_template.txt b/git_commit_template.txt new file mode 100644 index 0000000..2be75dd --- /dev/null +++ b/git_commit_template.txt @@ -0,0 +1,5 @@ +(): + + + +

\ No newline at end of file diff --git a/src/api/data/data.js b/src/api/data/data.js index f9a1a11..2d6d209 100644 --- a/src/api/data/data.js +++ b/src/api/data/data.js @@ -2,14 +2,6 @@ * 数据管理接口 */ import request from '@/utils/request' -// 数据统计接口-查看某井监测指标 -export function getStaticData(params) { - return request({ - url: 'data/list', - method: 'get', - params - }) -} // 井盖数据查询 export function getWellData(params) { return request({ @@ -18,14 +10,79 @@ params }) } -// 井盖数据查询，不分页 -export function getWellDataSingle(params) { +// 液位数据查询 +export function getLiquidData(params) { return request({ - url: 'welldata/list', + url: 'liquiddata/list', method: 'get', params }) } +// 燃气数据查询 +export function getGasData(params) { + return request({ + url: 'gasdata/list', + method: 'get', + params + }) +} +// 管盯数据查询 +export function getTubeData(params) { + return request({ + url: 'tubedata/list', + method: 'get', + params + }) +} +// 开挖数据查询 +export function getDigData(params) { + return request({ + url: 'digdata/list', + method: 'get', + params + }) +} +// 有害气体数据查询 +export function getHarmfulData(params) { + return request({ + url: 'harmfuldata/list', + method: 'get', + params + }) +} +// 温湿度数据查询 +export function getTempData(params) { + return request({ + url: 'tempdata/list', + method: 'get', + params + }) +} +// 井盖定位监测仪数据查询 +export function getWellLocaData(params) { + return request({ + url: 'welllocadata/list', + method: 'get', + params + }) +} +// 噪声记录仪数据查询 +export function getNoiseData(params) { + return request({ + url: 'noisedata/list', + method: 'get', + params + }) +} +// 液位燃气一体化设备数据查询 +export function getLiquidGasData(params) { + return request({ + url: 'liquidGasData/list', + method: 'get', + params + }) +} + // 批量导出井盖数据 export function batchExportWellData(params) { return request({ @@ -37,15 +94,6 @@ }) } -// 液位数据查询 -export function getLiquidData(params) { - return request({ - url: 'liquiddata/list', - method: 'get', - params - }) -} - // 批量导出液位数据 export function batchExportLiquidData(params) { return request({ @@ -57,15 +105,6 @@ }) } -// 燃气数据查询 -export function getGasData(params) { - return request({ - url: 'gasdata/list', - method: 'get', - params - }) -} - // 批量导出燃气数据 export function batchExportGasData(params) { return request({ @@ -77,14 +116,6 @@ }) } -// 管盯数据查询 -export function getTubeData(params) { - return request({ - url: 'tubedata/list', - method: 'get', - params - }) -} // 批量导出管盯数据 export function batchExportTubeData(params) { return request({ @@ -95,14 +126,7 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } -// 开挖数据查询 -export function getDigData(params) { - return request({ - url: 'digdata/list', - method: 'get', - params - }) -} + // 批量导出开挖数据 export function batchExportDigData(params) { return request({ @@ -113,32 +137,7 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } -// 有害气体数据查询 -export function getHarmfulData(params) { - return request({ - url: 'harmfuldata/list', - method: 'get', - params - }) -} -// 批量导出有害气体数据 -export function batchExportHarmfulData(params) { - return request({ - url: 'harmfuldata/export', - method: 'get', - timeout: 120000, // 120s，2分钟 - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 温湿度数据查询 -export function getTempData(params) { - return request({ - url: 'tempdata/list', - method: 'get', - params - }) -} + // 批量导出温湿度数据 export function batchExportTempData(params) { return request({ @@ -150,14 +149,17 @@ }) } -// 井盖定位监测仪数据查询 -export function getWellLocaData(params) { +// 批量导出有害气体数据 +export function batchExportHarmfulData(params) { return request({ - url: 'welllocadata/list', + url: 'harmfuldata/export', method: 'get', - params + timeout: 120000, // 120s，2分钟 + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } + // 批量导出井盖定位监测仪数据 export function batchExportWellLocaData(params) { return request({ @@ -169,14 +171,6 @@ }) } -// 噪声记录仪数据查询 -export function getNoiseData(params) { - return request({ - url: 'noisedata/list', - method: 'get', - params - }) -} // 噪声记录仪数据导出 export function batchExportNoiseData(params) { return request({ @@ -187,14 +181,6 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } -// 液位燃气一体化设备数据查询 -export function getLiquidGasData(params) { - return request({ - url: 'liquidGasData/list', - method: 'get', - params - }) -} // 批量导出液位燃气一体化设备数据 export function batchExportLiquidGasData(params) { return request({ @@ -206,6 +192,15 @@ }) } +// 数据统计接口 +export function getStaticData(params) { + return request({ + url: 'data/list', + method: 'get', + params + }) +} + // 可燃气体外协数据查询 export function getGasdectorData(params) { return request({ @@ -225,7 +220,8 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } -// 激甲云台数据查询-章丘 + +// 可燃气体外协数据查询 export function getPantiltData(params) { return request({ url: '/pantilt/listpage', @@ -234,7 +230,7 @@ }) } -// 激甲云台数据导出-章丘 +// 可燃气体外协批量导出燃气数据 export function batchExportPantiltData(params) { return request({ url: '/pantilt/export', @@ -245,3 +241,22 @@ }) } +// 消防栓数据查询 +export function getHydrantData(params) { + return request({ + url: 'hydrant/list', + method: 'get', + params + }) +} + +// 批量导出消防栓数据 +export function batchExportHydrantData(params) { + return request({ + url: 'hydrant/export', + method: 'get', + timeout: 120000, // 120s，2分钟 + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} diff --git a/src/api/device/deviceTypeDetail.js b/src/api/device/deviceTypeDetail.js index 54a233f..c3d1c6f 100644 --- a/src/api/device/deviceTypeDetail.js +++ b/src/api/device/deviceTypeDetail.js @@ -83,4 +83,11 @@ params }) } - +// 消防栓终端查询 +export function hydrantdataList(params) { + return request({ + url: 'hydrantdata/listSimple', + method: 'get', + params + }) +} diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue index 551c2d7..228bf65 100644 --- a/src/components/DownloadTemplate/index.vue +++ b/src/components/DownloadTemplate/index.vue @@ -49,8 +49,8 @@ diff --git a/src/styles/index.scss b/src/styles/index.scss index 0d6a908..918c857 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -159,13 +159,3 @@ .el-table td{ padding: 4px 0px !important; } - -.upload-btn{ - display: inline-block; -} -.el-button + .upload-btn { - margin-left: 3px; -} -.upload-btn+ .el-button { - margin-left: 3px; -} diff --git a/git_commit_template.txt b/git_commit_template.txt new file mode 100644 index 0000000..2be75dd --- /dev/null +++ b/git_commit_template.txt @@ -0,0 +1,5 @@ +(): + + + +

\ No newline at end of file diff --git a/src/api/data/data.js b/src/api/data/data.js index f9a1a11..2d6d209 100644 --- a/src/api/data/data.js +++ b/src/api/data/data.js @@ -2,14 +2,6 @@ * 数据管理接口 */ import request from '@/utils/request' -// 数据统计接口-查看某井监测指标 -export function getStaticData(params) { - return request({ - url: 'data/list', - method: 'get', - params - }) -} // 井盖数据查询 export function getWellData(params) { return request({ @@ -18,14 +10,79 @@ params }) } -// 井盖数据查询，不分页 -export function getWellDataSingle(params) { +// 液位数据查询 +export function getLiquidData(params) { return request({ - url: 'welldata/list', + url: 'liquiddata/list', method: 'get', params }) } +// 燃气数据查询 +export function getGasData(params) { + return request({ + url: 'gasdata/list', + method: 'get', + params + }) +} +// 管盯数据查询 +export function getTubeData(params) { + return request({ + url: 'tubedata/list', + method: 'get', + params + }) +} +// 开挖数据查询 +export function getDigData(params) { + return request({ + url: 'digdata/list', + method: 'get', + params + }) +} +// 有害气体数据查询 +export function getHarmfulData(params) { + return request({ + url: 'harmfuldata/list', + method: 'get', + params + }) +} +// 温湿度数据查询 +export function getTempData(params) { + return request({ + url: 'tempdata/list', + method: 'get', + params + }) +} +// 井盖定位监测仪数据查询 +export function getWellLocaData(params) { + return request({ + url: 'welllocadata/list', + method: 'get', + params + }) +} +// 噪声记录仪数据查询 +export function getNoiseData(params) { + return request({ + url: 'noisedata/list', + method: 'get', + params + }) +} +// 液位燃气一体化设备数据查询 +export function getLiquidGasData(params) { + return request({ + url: 'liquidGasData/list', + method: 'get', + params + }) +} + // 批量导出井盖数据 export function batchExportWellData(params) { return request({ @@ -37,15 +94,6 @@ }) } -// 液位数据查询 -export function getLiquidData(params) { - return request({ - url: 'liquiddata/list', - method: 'get', - params - }) -} - // 批量导出液位数据 export function batchExportLiquidData(params) { return request({ @@ -57,15 +105,6 @@ }) } -// 燃气数据查询 -export function getGasData(params) { - return request({ - url: 'gasdata/list', - method: 'get', - params - }) -} - // 批量导出燃气数据 export function batchExportGasData(params) { return request({ @@ -77,14 +116,6 @@ }) } -// 管盯数据查询 -export function getTubeData(params) { - return request({ - url: 'tubedata/list', - method: 'get', - params - }) -} // 批量导出管盯数据 export function batchExportTubeData(params) { return request({ @@ -95,14 +126,7 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } -// 开挖数据查询 -export function getDigData(params) { - return request({ - url: 'digdata/list', - method: 'get', - params - }) -} + // 批量导出开挖数据 export function batchExportDigData(params) { return request({ @@ -113,32 +137,7 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } -// 有害气体数据查询 -export function getHarmfulData(params) { - return request({ - url: 'harmfuldata/list', - method: 'get', - params - }) -} -// 批量导出有害气体数据 -export function batchExportHarmfulData(params) { - return request({ - url: 'harmfuldata/export', - method: 'get', - timeout: 120000, // 120s，2分钟 - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 温湿度数据查询 -export function getTempData(params) { - return request({ - url: 'tempdata/list', - method: 'get', - params - }) -} + // 批量导出温湿度数据 export function batchExportTempData(params) { return request({ @@ -150,14 +149,17 @@ }) } -// 井盖定位监测仪数据查询 -export function getWellLocaData(params) { +// 批量导出有害气体数据 +export function batchExportHarmfulData(params) { return request({ - url: 'welllocadata/list', + url: 'harmfuldata/export', method: 'get', - params + timeout: 120000, // 120s，2分钟 + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } + // 批量导出井盖定位监测仪数据 export function batchExportWellLocaData(params) { return request({ @@ -169,14 +171,6 @@ }) } -// 噪声记录仪数据查询 -export function getNoiseData(params) { - return request({ - url: 'noisedata/list', - method: 'get', - params - }) -} // 噪声记录仪数据导出 export function batchExportNoiseData(params) { return request({ @@ -187,14 +181,6 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } -// 液位燃气一体化设备数据查询 -export function getLiquidGasData(params) { - return request({ - url: 'liquidGasData/list', - method: 'get', - params - }) -} // 批量导出液位燃气一体化设备数据 export function batchExportLiquidGasData(params) { return request({ @@ -206,6 +192,15 @@ }) } +// 数据统计接口 +export function getStaticData(params) { + return request({ + url: 'data/list', + method: 'get', + params + }) +} + // 可燃气体外协数据查询 export function getGasdectorData(params) { return request({ @@ -225,7 +220,8 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } -// 激甲云台数据查询-章丘 + +// 可燃气体外协数据查询 export function getPantiltData(params) { return request({ url: '/pantilt/listpage', @@ -234,7 +230,7 @@ }) } -// 激甲云台数据导出-章丘 +// 可燃气体外协批量导出燃气数据 export function batchExportPantiltData(params) { return request({ url: '/pantilt/export', @@ -245,3 +241,22 @@ }) } +// 消防栓数据查询 +export function getHydrantData(params) { + return request({ + url: 'hydrant/list', + method: 'get', + params + }) +} + +// 批量导出消防栓数据 +export function batchExportHydrantData(params) { + return request({ + url: 'hydrant/export', + method: 'get', + timeout: 120000, // 120s，2分钟 + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} diff --git a/src/api/device/deviceTypeDetail.js b/src/api/device/deviceTypeDetail.js index 54a233f..c3d1c6f 100644 --- a/src/api/device/deviceTypeDetail.js +++ b/src/api/device/deviceTypeDetail.js @@ -83,4 +83,11 @@ params }) } - +// 消防栓终端查询 +export function hydrantdataList(params) { + return request({ + url: 'hydrantdata/listSimple', + method: 'get', + params + }) +} diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue index 551c2d7..228bf65 100644 --- a/src/components/DownloadTemplate/index.vue +++ b/src/components/DownloadTemplate/index.vue @@ -49,8 +49,8 @@ diff --git a/src/styles/index.scss b/src/styles/index.scss index 0d6a908..918c857 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -159,13 +159,3 @@ .el-table td{ padding: 4px 0px !important; } - -.upload-btn{ - display: inline-block; -} -.el-button + .upload-btn { - margin-left: 3px; -} -.upload-btn+ .el-button { - margin-left: 3px; -} diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue index cfb9847..71be03f 100644 --- a/src/views/dataManage/dataManage.vue +++ b/src/views/dataManage/dataManage.vue @@ -21,11 +21,12 @@ import ListTubeData from './deviceData/listTubeData' import ListGasdectorData from '@/views/dataManage/deviceData/listGasdectorData' import ListPantiltData from '@/views/dataManage/deviceData/listPantiltData' +import ListHydrantData from '@/views/dataManage/deviceData/listHydrantData' import { parseUrl } from '@/utils/parseutils' export default { name: 'DataManage', - components: { ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData }, + components: { ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData }, data() { return { activeName: 'wellcover', @@ -41,7 +42,8 @@ { permission: '/liquidGasData/list', label: '燃气智能终端(一体化)', name: 'liquidgas', type: '10', comp: 'list-liquid-gas-data' }, { permission: '/tubedata/list', label: '管盯', name: 'tube', type: '12', comp: 'list-tube-data' }, { permission: '/gasdector/listPage', label: '可燃气体智能监测终端', name: 'gasdector', type: '1', comp: 'list-gasdector-data' }, - { permission: '/pantilt/listPage', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' } + { permission: '/pantilt/listPage', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' }, + { permission: '/hydrantdata/list', label: '消防栓数据列表', name: 'hydrant', type: '11', comp: 'list-hydrant-data' } ] // 所有tab列表 } }, diff --git a/git_commit_template.txt b/git_commit_template.txt new file mode 100644 index 0000000..2be75dd --- /dev/null +++ b/git_commit_template.txt @@ -0,0 +1,5 @@ +(): + + + +

\ No newline at end of file diff --git a/src/api/data/data.js b/src/api/data/data.js index f9a1a11..2d6d209 100644 --- a/src/api/data/data.js +++ b/src/api/data/data.js @@ -2,14 +2,6 @@ * 数据管理接口 */ import request from '@/utils/request' -// 数据统计接口-查看某井监测指标 -export function getStaticData(params) { - return request({ - url: 'data/list', - method: 'get', - params - }) -} // 井盖数据查询 export function getWellData(params) { return request({ @@ -18,14 +10,79 @@ params }) } -// 井盖数据查询，不分页 -export function getWellDataSingle(params) { +// 液位数据查询 +export function getLiquidData(params) { return request({ - url: 'welldata/list', + url: 'liquiddata/list', method: 'get', params }) } +// 燃气数据查询 +export function getGasData(params) { + return request({ + url: 'gasdata/list', + method: 'get', + params + }) +} +// 管盯数据查询 +export function getTubeData(params) { + return request({ + url: 'tubedata/list', + method: 'get', + params + }) +} +// 开挖数据查询 +export function getDigData(params) { + return request({ + url: 'digdata/list', + method: 'get', + params + }) +} +// 有害气体数据查询 +export function getHarmfulData(params) { + return request({ + url: 'harmfuldata/list', + method: 'get', + params + }) +} +// 温湿度数据查询 +export function getTempData(params) { + return request({ + url: 'tempdata/list', + method: 'get', + params + }) +} +// 井盖定位监测仪数据查询 +export function getWellLocaData(params) { + return request({ + url: 'welllocadata/list', + method: 'get', + params + }) +} +// 噪声记录仪数据查询 +export function getNoiseData(params) { + return request({ + url: 'noisedata/list', + method: 'get', + params + }) +} +// 液位燃气一体化设备数据查询 +export function getLiquidGasData(params) { + return request({ + url: 'liquidGasData/list', + method: 'get', + params + }) +} + // 批量导出井盖数据 export function batchExportWellData(params) { return request({ @@ -37,15 +94,6 @@ }) } -// 液位数据查询 -export function getLiquidData(params) { - return request({ - url: 'liquiddata/list', - method: 'get', - params - }) -} - // 批量导出液位数据 export function batchExportLiquidData(params) { return request({ @@ -57,15 +105,6 @@ }) } -// 燃气数据查询 -export function getGasData(params) { - return request({ - url: 'gasdata/list', - method: 'get', - params - }) -} - // 批量导出燃气数据 export function batchExportGasData(params) { return request({ @@ -77,14 +116,6 @@ }) } -// 管盯数据查询 -export function getTubeData(params) { - return request({ - url: 'tubedata/list', - method: 'get', - params - }) -} // 批量导出管盯数据 export function batchExportTubeData(params) { return request({ @@ -95,14 +126,7 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } -// 开挖数据查询 -export function getDigData(params) { - return request({ - url: 'digdata/list', - method: 'get', - params - }) -} + // 批量导出开挖数据 export function batchExportDigData(params) { return request({ @@ -113,32 +137,7 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } -// 有害气体数据查询 -export function getHarmfulData(params) { - return request({ - url: 'harmfuldata/list', - method: 'get', - params - }) -} -// 批量导出有害气体数据 -export function batchExportHarmfulData(params) { - return request({ - url: 'harmfuldata/export', - method: 'get', - timeout: 120000, // 120s，2分钟 - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 温湿度数据查询 -export function getTempData(params) { - return request({ - url: 'tempdata/list', - method: 'get', - params - }) -} + // 批量导出温湿度数据 export function batchExportTempData(params) { return request({ @@ -150,14 +149,17 @@ }) } -// 井盖定位监测仪数据查询 -export function getWellLocaData(params) { +// 批量导出有害气体数据 +export function batchExportHarmfulData(params) { return request({ - url: 'welllocadata/list', + url: 'harmfuldata/export', method: 'get', - params + timeout: 120000, // 120s，2分钟 + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } + // 批量导出井盖定位监测仪数据 export function batchExportWellLocaData(params) { return request({ @@ -169,14 +171,6 @@ }) } -// 噪声记录仪数据查询 -export function getNoiseData(params) { - return request({ - url: 'noisedata/list', - method: 'get', - params - }) -} // 噪声记录仪数据导出 export function batchExportNoiseData(params) { return request({ @@ -187,14 +181,6 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } -// 液位燃气一体化设备数据查询 -export function getLiquidGasData(params) { - return request({ - url: 'liquidGasData/list', - method: 'get', - params - }) -} // 批量导出液位燃气一体化设备数据 export function batchExportLiquidGasData(params) { return request({ @@ -206,6 +192,15 @@ }) } +// 数据统计接口 +export function getStaticData(params) { + return request({ + url: 'data/list', + method: 'get', + params + }) +} + // 可燃气体外协数据查询 export function getGasdectorData(params) { return request({ @@ -225,7 +220,8 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } -// 激甲云台数据查询-章丘 + +// 可燃气体外协数据查询 export function getPantiltData(params) { return request({ url: '/pantilt/listpage', @@ -234,7 +230,7 @@ }) } -// 激甲云台数据导出-章丘 +// 可燃气体外协批量导出燃气数据 export function batchExportPantiltData(params) { return request({ url: '/pantilt/export', @@ -245,3 +241,22 @@ }) } +// 消防栓数据查询 +export function getHydrantData(params) { + return request({ + url: 'hydrant/list', + method: 'get', + params + }) +} + +// 批量导出消防栓数据 +export function batchExportHydrantData(params) { + return request({ + url: 'hydrant/export', + method: 'get', + timeout: 120000, // 120s，2分钟 + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} diff --git a/src/api/device/deviceTypeDetail.js b/src/api/device/deviceTypeDetail.js index 54a233f..c3d1c6f 100644 --- a/src/api/device/deviceTypeDetail.js +++ b/src/api/device/deviceTypeDetail.js @@ -83,4 +83,11 @@ params }) } - +// 消防栓终端查询 +export function hydrantdataList(params) { + return request({ + url: 'hydrantdata/listSimple', + method: 'get', + params + }) +} diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue index 551c2d7..228bf65 100644 --- a/src/components/DownloadTemplate/index.vue +++ b/src/components/DownloadTemplate/index.vue @@ -49,8 +49,8 @@ diff --git a/src/styles/index.scss b/src/styles/index.scss index 0d6a908..918c857 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -159,13 +159,3 @@ .el-table td{ padding: 4px 0px !important; } - -.upload-btn{ - display: inline-block; -} -.el-button + .upload-btn { - margin-left: 3px; -} -.upload-btn+ .el-button { - margin-left: 3px; -} diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue index cfb9847..71be03f 100644 --- a/src/views/dataManage/dataManage.vue +++ b/src/views/dataManage/dataManage.vue @@ -21,11 +21,12 @@ import ListTubeData from './deviceData/listTubeData' import ListGasdectorData from '@/views/dataManage/deviceData/listGasdectorData' import ListPantiltData from '@/views/dataManage/deviceData/listPantiltData' +import ListHydrantData from '@/views/dataManage/deviceData/listHydrantData' import { parseUrl } from '@/utils/parseutils' export default { name: 'DataManage', - components: { ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData }, + components: { ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData }, data() { return { activeName: 'wellcover', @@ -41,7 +42,8 @@ { permission: '/liquidGasData/list', label: '燃气智能终端(一体化)', name: 'liquidgas', type: '10', comp: 'list-liquid-gas-data' }, { permission: '/tubedata/list', label: '管盯', name: 'tube', type: '12', comp: 'list-tube-data' }, { permission: '/gasdector/listPage', label: '可燃气体智能监测终端', name: 'gasdector', type: '1', comp: 'list-gasdector-data' }, - { permission: '/pantilt/listPage', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' } + { permission: '/pantilt/listPage', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' }, + { permission: '/hydrantdata/list', label: '消防栓数据列表', name: 'hydrant', type: '11', comp: 'list-hydrant-data' } ] // 所有tab列表 } }, diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue index a92db03..2a0b33e 100644 --- a/src/views/dataManage/deviceData/listGasData.vue +++ b/src/views/dataManage/deviceData/listGasData.vue @@ -21,30 +21,31 @@ - - - - +

+ + + + +

@@ -135,7 +136,7 @@ methods: { // 批量导出 batchExport() { - // this.handleDateTime() + this.handleDateTime() // 全屏加载动画 const loading = this.$loading({ lock: true, @@ -145,7 +146,7 @@ }) batchExportGasData(this.listQuery).then(res => { loading.close() // 关闭加载动画 - let fileName = `${this.name}数据-${this.listQuery.beginTime}-${this.listQuery.endTime}.xlsx` + let fileName = `${this.name}数据_${this.listQuery.beginTime}_${this.listQuery.endTime}.xlsx` fileName = fileName.replace(/-|:| /g, '') const blob = new Blob([res.data]) exportFile(blob, fileName) @@ -201,6 +202,35 @@ diff --git a/src/styles/index.scss b/src/styles/index.scss index 0d6a908..918c857 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -159,13 +159,3 @@ .el-table td{ padding: 4px 0px !important; } - -.upload-btn{ - display: inline-block; -} -.el-button + .upload-btn { - margin-left: 3px; -} -.upload-btn+ .el-button { - margin-left: 3px; -} diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue index cfb9847..71be03f 100644 --- a/src/views/dataManage/dataManage.vue +++ b/src/views/dataManage/dataManage.vue @@ -21,11 +21,12 @@ import ListTubeData from './deviceData/listTubeData' import ListGasdectorData from '@/views/dataManage/deviceData/listGasdectorData' import ListPantiltData from '@/views/dataManage/deviceData/listPantiltData' +import ListHydrantData from '@/views/dataManage/deviceData/listHydrantData' import { parseUrl } from '@/utils/parseutils' export default { name: 'DataManage', - components: { ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData }, + components: { ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData }, data() { return { activeName: 'wellcover', @@ -41,7 +42,8 @@ { permission: '/liquidGasData/list', label: '燃气智能终端(一体化)', name: 'liquidgas', type: '10', comp: 'list-liquid-gas-data' }, { permission: '/tubedata/list', label: '管盯', name: 'tube', type: '12', comp: 'list-tube-data' }, { permission: '/gasdector/listPage', label: '可燃气体智能监测终端', name: 'gasdector', type: '1', comp: 'list-gasdector-data' }, - { permission: '/pantilt/listPage', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' } + { permission: '/pantilt/listPage', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' }, + { permission: '/hydrantdata/list', label: '消防栓数据列表', name: 'hydrant', type: '11', comp: 'list-hydrant-data' } ] // 所有tab列表 } }, diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue index a92db03..2a0b33e 100644 --- a/src/views/dataManage/deviceData/listGasData.vue +++ b/src/views/dataManage/deviceData/listGasData.vue @@ -21,30 +21,31 @@ - - - - +

+ + + + +

@@ -135,7 +136,7 @@ methods: { // 批量导出 batchExport() { - // this.handleDateTime() + this.handleDateTime() // 全屏加载动画 const loading = this.$loading({ lock: true, @@ -145,7 +146,7 @@ }) batchExportGasData(this.listQuery).then(res => { loading.close() // 关闭加载动画 - let fileName = `${this.name}数据-${this.listQuery.beginTime}-${this.listQuery.endTime}.xlsx` + let fileName = `${this.name}数据_${this.listQuery.beginTime}_${this.listQuery.endTime}.xlsx` fileName = fileName.replace(/-|:| /g, '') const blob = new Blob([res.data]) exportFile(blob, fileName) @@ -201,6 +202,35 @@ diff --git a/git_commit_template.txt b/git_commit_template.txt new file mode 100644 index 0000000..2be75dd --- /dev/null +++ b/git_commit_template.txt @@ -0,0 +1,5 @@ +(): + + + +

\ No newline at end of file diff --git a/src/api/data/data.js b/src/api/data/data.js index f9a1a11..2d6d209 100644 --- a/src/api/data/data.js +++ b/src/api/data/data.js @@ -2,14 +2,6 @@ * 数据管理接口 */ import request from '@/utils/request' -// 数据统计接口-查看某井监测指标 -export function getStaticData(params) { - return request({ - url: 'data/list', - method: 'get', - params - }) -} // 井盖数据查询 export function getWellData(params) { return request({ @@ -18,14 +10,79 @@ params }) } -// 井盖数据查询，不分页 -export function getWellDataSingle(params) { +// 液位数据查询 +export function getLiquidData(params) { return request({ - url: 'welldata/list', + url: 'liquiddata/list', method: 'get', params }) } +// 燃气数据查询 +export function getGasData(params) { + return request({ + url: 'gasdata/list', + method: 'get', + params + }) +} +// 管盯数据查询 +export function getTubeData(params) { + return request({ + url: 'tubedata/list', + method: 'get', + params + }) +} +// 开挖数据查询 +export function getDigData(params) { + return request({ + url: 'digdata/list', + method: 'get', + params + }) +} +// 有害气体数据查询 +export function getHarmfulData(params) { + return request({ + url: 'harmfuldata/list', + method: 'get', + params + }) +} +// 温湿度数据查询 +export function getTempData(params) { + return request({ + url: 'tempdata/list', + method: 'get', + params + }) +} +// 井盖定位监测仪数据查询 +export function getWellLocaData(params) { + return request({ + url: 'welllocadata/list', + method: 'get', + params + }) +} +// 噪声记录仪数据查询 +export function getNoiseData(params) { + return request({ + url: 'noisedata/list', + method: 'get', + params + }) +} +// 液位燃气一体化设备数据查询 +export function getLiquidGasData(params) { + return request({ + url: 'liquidGasData/list', + method: 'get', + params + }) +} + // 批量导出井盖数据 export function batchExportWellData(params) { return request({ @@ -37,15 +94,6 @@ }) } -// 液位数据查询 -export function getLiquidData(params) { - return request({ - url: 'liquiddata/list', - method: 'get', - params - }) -} - // 批量导出液位数据 export function batchExportLiquidData(params) { return request({ @@ -57,15 +105,6 @@ }) } -// 燃气数据查询 -export function getGasData(params) { - return request({ - url: 'gasdata/list', - method: 'get', - params - }) -} - // 批量导出燃气数据 export function batchExportGasData(params) { return request({ @@ -77,14 +116,6 @@ }) } -// 管盯数据查询 -export function getTubeData(params) { - return request({ - url: 'tubedata/list', - method: 'get', - params - }) -} // 批量导出管盯数据 export function batchExportTubeData(params) { return request({ @@ -95,14 +126,7 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } -// 开挖数据查询 -export function getDigData(params) { - return request({ - url: 'digdata/list', - method: 'get', - params - }) -} + // 批量导出开挖数据 export function batchExportDigData(params) { return request({ @@ -113,32 +137,7 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } -// 有害气体数据查询 -export function getHarmfulData(params) { - return request({ - url: 'harmfuldata/list', - method: 'get', - params - }) -} -// 批量导出有害气体数据 -export function batchExportHarmfulData(params) { - return request({ - url: 'harmfuldata/export', - method: 'get', - timeout: 120000, // 120s，2分钟 - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 温湿度数据查询 -export function getTempData(params) { - return request({ - url: 'tempdata/list', - method: 'get', - params - }) -} + // 批量导出温湿度数据 export function batchExportTempData(params) { return request({ @@ -150,14 +149,17 @@ }) } -// 井盖定位监测仪数据查询 -export function getWellLocaData(params) { +// 批量导出有害气体数据 +export function batchExportHarmfulData(params) { return request({ - url: 'welllocadata/list', + url: 'harmfuldata/export', method: 'get', - params + timeout: 120000, // 120s，2分钟 + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } + // 批量导出井盖定位监测仪数据 export function batchExportWellLocaData(params) { return request({ @@ -169,14 +171,6 @@ }) } -// 噪声记录仪数据查询 -export function getNoiseData(params) { - return request({ - url: 'noisedata/list', - method: 'get', - params - }) -} // 噪声记录仪数据导出 export function batchExportNoiseData(params) { return request({ @@ -187,14 +181,6 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } -// 液位燃气一体化设备数据查询 -export function getLiquidGasData(params) { - return request({ - url: 'liquidGasData/list', - method: 'get', - params - }) -} // 批量导出液位燃气一体化设备数据 export function batchExportLiquidGasData(params) { return request({ @@ -206,6 +192,15 @@ }) } +// 数据统计接口 +export function getStaticData(params) { + return request({ + url: 'data/list', + method: 'get', + params + }) +} + // 可燃气体外协数据查询 export function getGasdectorData(params) { return request({ @@ -225,7 +220,8 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } -// 激甲云台数据查询-章丘 + +// 可燃气体外协数据查询 export function getPantiltData(params) { return request({ url: '/pantilt/listpage', @@ -234,7 +230,7 @@ }) } -// 激甲云台数据导出-章丘 +// 可燃气体外协批量导出燃气数据 export function batchExportPantiltData(params) { return request({ url: '/pantilt/export', @@ -245,3 +241,22 @@ }) } +// 消防栓数据查询 +export function getHydrantData(params) { + return request({ + url: 'hydrant/list', + method: 'get', + params + }) +} + +// 批量导出消防栓数据 +export function batchExportHydrantData(params) { + return request({ + url: 'hydrant/export', + method: 'get', + timeout: 120000, // 120s，2分钟 + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} diff --git a/src/api/device/deviceTypeDetail.js b/src/api/device/deviceTypeDetail.js index 54a233f..c3d1c6f 100644 --- a/src/api/device/deviceTypeDetail.js +++ b/src/api/device/deviceTypeDetail.js @@ -83,4 +83,11 @@ params }) } - +// 消防栓终端查询 +export function hydrantdataList(params) { + return request({ + url: 'hydrantdata/listSimple', + method: 'get', + params + }) +} diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue index 551c2d7..228bf65 100644 --- a/src/components/DownloadTemplate/index.vue +++ b/src/components/DownloadTemplate/index.vue @@ -49,8 +49,8 @@ diff --git a/src/styles/index.scss b/src/styles/index.scss index 0d6a908..918c857 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -159,13 +159,3 @@ .el-table td{ padding: 4px 0px !important; } - -.upload-btn{ - display: inline-block; -} -.el-button + .upload-btn { - margin-left: 3px; -} -.upload-btn+ .el-button { - margin-left: 3px; -} diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue index cfb9847..71be03f 100644 --- a/src/views/dataManage/dataManage.vue +++ b/src/views/dataManage/dataManage.vue @@ -21,11 +21,12 @@ import ListTubeData from './deviceData/listTubeData' import ListGasdectorData from '@/views/dataManage/deviceData/listGasdectorData' import ListPantiltData from '@/views/dataManage/deviceData/listPantiltData' +import ListHydrantData from '@/views/dataManage/deviceData/listHydrantData' import { parseUrl } from '@/utils/parseutils' export default { name: 'DataManage', - components: { ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData }, + components: { ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData }, data() { return { activeName: 'wellcover', @@ -41,7 +42,8 @@ { permission: '/liquidGasData/list', label: '燃气智能终端(一体化)', name: 'liquidgas', type: '10', comp: 'list-liquid-gas-data' }, { permission: '/tubedata/list', label: '管盯', name: 'tube', type: '12', comp: 'list-tube-data' }, { permission: '/gasdector/listPage', label: '可燃气体智能监测终端', name: 'gasdector', type: '1', comp: 'list-gasdector-data' }, - { permission: '/pantilt/listPage', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' } + { permission: '/pantilt/listPage', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' }, + { permission: '/hydrantdata/list', label: '消防栓数据列表', name: 'hydrant', type: '11', comp: 'list-hydrant-data' } ] // 所有tab列表 } }, diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue index a92db03..2a0b33e 100644 --- a/src/views/dataManage/deviceData/listGasData.vue +++ b/src/views/dataManage/deviceData/listGasData.vue @@ -21,30 +21,31 @@ - - - - +

+ + + + +

@@ -135,7 +136,7 @@ methods: { // 批量导出 batchExport() { - // this.handleDateTime() + this.handleDateTime() // 全屏加载动画 const loading = this.$loading({ lock: true, @@ -145,7 +146,7 @@ }) batchExportGasData(this.listQuery).then(res => { loading.close() // 关闭加载动画 - let fileName = `${this.name}数据-${this.listQuery.beginTime}-${this.listQuery.endTime}.xlsx` + let fileName = `${this.name}数据_${this.listQuery.beginTime}_${this.listQuery.endTime}.xlsx` fileName = fileName.replace(/-|:| /g, '') const blob = new Blob([res.data]) exportFile(blob, fileName) @@ -201,6 +202,35 @@ diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue index d7ec85f..4b199c4 100644 --- a/src/views/dataManage/deviceData/listWellCoverData.vue +++ b/src/views/dataManage/deviceData/listWellCoverData.vue @@ -5,12 +5,11 @@

- +

@@ -27,30 +26,43 @@ - - - @@ -59,7 +71,6 @@ import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' import { getSearchLastWeekTime } from '@/utils/dateutils' -import { exportFile } from '@/utils/exportutils' export default { name: 'ListWellCoverData', @@ -71,7 +82,7 @@ }, // 设备类型 name: { type: String, - default: '' + default: '激光甲烷遥测云台' } // 设备名称 }, data() { @@ -121,15 +132,24 @@ align: 'center' } ], // 显示列 + multipleSelection: [], // 多选选中项 list: [], // 列表数据 total: 0, // 数据总数 - options: { - needIndex: true, // 是否需要序号列 - border: true // 是否需要上方边框 - }, + deviceTypeList: [], // 井盖类型列表 + deptProps: { + parent: 'pid', + value: 'id', + label: 'name', + children: 'children' + }, // 权属单位树形下拉菜单 + deptTreeList: null, // 组织树列表数据 + showDeptTree: 0, // 是否显示权属单位下拉 + showDeviceType: true, // 是否显示设备类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 - editShow: false // 是否显示编辑框 + editShow: false, // 是否显示编辑框 + detailShow: false, // 是否显示编辑框 + deptShowTop: false } }, mounted() { @@ -157,7 +177,6 @@ methods: { // 批量导出 batchExport() { - // this.handleDateTime() // 全屏加载动画 const loading = this.$loading({ lock: true, @@ -167,10 +186,16 @@ }) batchExportWellData(this.listQuery).then(res => { loading.close() // 关闭加载动画 - let fileName = `${this.name}数据-${this.listQuery.beginTime}-${this.listQuery.endTime}.xlsx` - fileName = fileName.replace(/-|:| /g, '') + console.log('download===', res) const blob = new Blob([res.data]) - exportFile(blob, fileName) + const downloadElement = document.createElement('a') + const href = window.URL.createObjectURL(blob) // 创建下载的链接 + downloadElement.href = href + downloadElement.download = `井盖状态监测仪数据.xlsx` // 下载后文件名 + document.body.appendChild(downloadElement) + downloadElement.click() // 点击下载 + document.body.removeChild(downloadElement) // 下载完成移除元素 + window.URL.revokeObjectURL(href) // 释放blob对象 }).catch((res) => { loading.close() }) @@ -185,15 +210,6 @@ if (!isNowPage) { // 是否显示当前页，否则跳转第一页 this.listQuery.offset = 1 } - this.handleDateTime() - getWellData(this.listQuery).then(response => { - this.list = response.data.rows - this.total = response.data.total - this.listLoading = false - }) - }, - // 处理时间 - handleDateTime() { if (this.timeRange && this.timeRange.length > 0) { this.listQuery.beginTime = this.timeRange[0] this.listQuery.endTime = this.timeRange[1] @@ -201,27 +217,68 @@ this.listQuery.beginTime = '' this.listQuery.endTime = '' } + getWellData(this.listQuery).then(response => { + this.list = response.data.rows + this.total = response.data.total + this.listLoading = false + }) }, checkState(row) { if (row.status !== '0') { return 'warning-state' } }, - // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写 - changePage(val) { - if (val && val.size) { - this.listQuery.limit = val.size - } - if (val && val.page) { - this.listQuery.offset = val.page - } + indexMethod(index) { + return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1 + }, + // 改变页容量 + handleSizeChange(val) { + this.listQuery.limit = val this.fetchData() + }, + // 改变当前页 + handleCurrentChange(val) { + this.listQuery.offset = val + this.fetchData() + }, + // 多选触发方法 + handleSelectionChange(val) { + this.multipleSelection = val } } } diff --git a/src/styles/index.scss b/src/styles/index.scss index 0d6a908..918c857 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -159,13 +159,3 @@ .el-table td{ padding: 4px 0px !important; } - -.upload-btn{ - display: inline-block; -} -.el-button + .upload-btn { - margin-left: 3px; -} -.upload-btn+ .el-button { - margin-left: 3px; -} diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue index cfb9847..71be03f 100644 --- a/src/views/dataManage/dataManage.vue +++ b/src/views/dataManage/dataManage.vue @@ -21,11 +21,12 @@ import ListTubeData from './deviceData/listTubeData' import ListGasdectorData from '@/views/dataManage/deviceData/listGasdectorData' import ListPantiltData from '@/views/dataManage/deviceData/listPantiltData' +import ListHydrantData from '@/views/dataManage/deviceData/listHydrantData' import { parseUrl } from '@/utils/parseutils' export default { name: 'DataManage', - components: { ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData }, + components: { ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData }, data() { return { activeName: 'wellcover', @@ -41,7 +42,8 @@ { permission: '/liquidGasData/list', label: '燃气智能终端(一体化)', name: 'liquidgas', type: '10', comp: 'list-liquid-gas-data' }, { permission: '/tubedata/list', label: '管盯', name: 'tube', type: '12', comp: 'list-tube-data' }, { permission: '/gasdector/listPage', label: '可燃气体智能监测终端', name: 'gasdector', type: '1', comp: 'list-gasdector-data' }, - { permission: '/pantilt/listPage', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' } + { permission: '/pantilt/listPage', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' }, + { permission: '/hydrantdata/list', label: '消防栓数据列表', name: 'hydrant', type: '11', comp: 'list-hydrant-data' } ] // 所有tab列表 } }, diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue index a92db03..2a0b33e 100644 --- a/src/views/dataManage/deviceData/listGasData.vue +++ b/src/views/dataManage/deviceData/listGasData.vue @@ -21,30 +21,31 @@ - - - - +

+ + + + +

@@ -135,7 +136,7 @@ methods: { // 批量导出 batchExport() { - // this.handleDateTime() + this.handleDateTime() // 全屏加载动画 const loading = this.$loading({ lock: true, @@ -145,7 +146,7 @@ }) batchExportGasData(this.listQuery).then(res => { loading.close() // 关闭加载动画 - let fileName = `${this.name}数据-${this.listQuery.beginTime}-${this.listQuery.endTime}.xlsx` + let fileName = `${this.name}数据_${this.listQuery.beginTime}_${this.listQuery.endTime}.xlsx` fileName = fileName.replace(/-|:| /g, '') const blob = new Blob([res.data]) exportFile(blob, fileName) @@ -201,6 +202,35 @@ diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue index d7ec85f..4b199c4 100644 --- a/src/views/dataManage/deviceData/listWellCoverData.vue +++ b/src/views/dataManage/deviceData/listWellCoverData.vue @@ -5,12 +5,11 @@

- +

@@ -27,30 +26,43 @@ - - - @@ -59,7 +71,6 @@ import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' import { getSearchLastWeekTime } from '@/utils/dateutils' -import { exportFile } from '@/utils/exportutils' export default { name: 'ListWellCoverData', @@ -71,7 +82,7 @@ }, // 设备类型 name: { type: String, - default: '' + default: '激光甲烷遥测云台' } // 设备名称 }, data() { @@ -121,15 +132,24 @@ align: 'center' } ], // 显示列 + multipleSelection: [], // 多选选中项 list: [], // 列表数据 total: 0, // 数据总数 - options: { - needIndex: true, // 是否需要序号列 - border: true // 是否需要上方边框 - }, + deviceTypeList: [], // 井盖类型列表 + deptProps: { + parent: 'pid', + value: 'id', + label: 'name', + children: 'children' + }, // 权属单位树形下拉菜单 + deptTreeList: null, // 组织树列表数据 + showDeptTree: 0, // 是否显示权属单位下拉 + showDeviceType: true, // 是否显示设备类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 - editShow: false // 是否显示编辑框 + editShow: false, // 是否显示编辑框 + detailShow: false, // 是否显示编辑框 + deptShowTop: false } }, mounted() { @@ -157,7 +177,6 @@ methods: { // 批量导出 batchExport() { - // this.handleDateTime() // 全屏加载动画 const loading = this.$loading({ lock: true, @@ -167,10 +186,16 @@ }) batchExportWellData(this.listQuery).then(res => { loading.close() // 关闭加载动画 - let fileName = `${this.name}数据-${this.listQuery.beginTime}-${this.listQuery.endTime}.xlsx` - fileName = fileName.replace(/-|:| /g, '') + console.log('download===', res) const blob = new Blob([res.data]) - exportFile(blob, fileName) + const downloadElement = document.createElement('a') + const href = window.URL.createObjectURL(blob) // 创建下载的链接 + downloadElement.href = href + downloadElement.download = `井盖状态监测仪数据.xlsx` // 下载后文件名 + document.body.appendChild(downloadElement) + downloadElement.click() // 点击下载 + document.body.removeChild(downloadElement) // 下载完成移除元素 + window.URL.revokeObjectURL(href) // 释放blob对象 }).catch((res) => { loading.close() }) @@ -185,15 +210,6 @@ if (!isNowPage) { // 是否显示当前页，否则跳转第一页 this.listQuery.offset = 1 } - this.handleDateTime() - getWellData(this.listQuery).then(response => { - this.list = response.data.rows - this.total = response.data.total - this.listLoading = false - }) - }, - // 处理时间 - handleDateTime() { if (this.timeRange && this.timeRange.length > 0) { this.listQuery.beginTime = this.timeRange[0] this.listQuery.endTime = this.timeRange[1] @@ -201,27 +217,68 @@ this.listQuery.beginTime = '' this.listQuery.endTime = '' } + getWellData(this.listQuery).then(response => { + this.list = response.data.rows + this.total = response.data.total + this.listLoading = false + }) }, checkState(row) { if (row.status !== '0') { return 'warning-state' } }, - // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写 - changePage(val) { - if (val && val.size) { - this.listQuery.limit = val.size - } - if (val && val.page) { - this.listQuery.offset = val.page - } + indexMethod(index) { + return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1 + }, + // 改变页容量 + handleSizeChange(val) { + this.listQuery.limit = val this.fetchData() + }, + // 改变当前页 + handleCurrentChange(val) { + this.listQuery.offset = val + this.fetchData() + }, + // 多选触发方法 + handleSelectionChange(val) { + this.multipleSelection = val } } } diff --git a/git_commit_template.txt b/git_commit_template.txt new file mode 100644 index 0000000..2be75dd --- /dev/null +++ b/git_commit_template.txt @@ -0,0 +1,5 @@ +(): + + + +

\ No newline at end of file diff --git a/src/api/data/data.js b/src/api/data/data.js index f9a1a11..2d6d209 100644 --- a/src/api/data/data.js +++ b/src/api/data/data.js @@ -2,14 +2,6 @@ * 数据管理接口 */ import request from '@/utils/request' -// 数据统计接口-查看某井监测指标 -export function getStaticData(params) { - return request({ - url: 'data/list', - method: 'get', - params - }) -} // 井盖数据查询 export function getWellData(params) { return request({ @@ -18,14 +10,79 @@ params }) } -// 井盖数据查询，不分页 -export function getWellDataSingle(params) { +// 液位数据查询 +export function getLiquidData(params) { return request({ - url: 'welldata/list', + url: 'liquiddata/list', method: 'get', params }) } +// 燃气数据查询 +export function getGasData(params) { + return request({ + url: 'gasdata/list', + method: 'get', + params + }) +} +// 管盯数据查询 +export function getTubeData(params) { + return request({ + url: 'tubedata/list', + method: 'get', + params + }) +} +// 开挖数据查询 +export function getDigData(params) { + return request({ + url: 'digdata/list', + method: 'get', + params + }) +} +// 有害气体数据查询 +export function getHarmfulData(params) { + return request({ + url: 'harmfuldata/list', + method: 'get', + params + }) +} +// 温湿度数据查询 +export function getTempData(params) { + return request({ + url: 'tempdata/list', + method: 'get', + params + }) +} +// 井盖定位监测仪数据查询 +export function getWellLocaData(params) { + return request({ + url: 'welllocadata/list', + method: 'get', + params + }) +} +// 噪声记录仪数据查询 +export function getNoiseData(params) { + return request({ + url: 'noisedata/list', + method: 'get', + params + }) +} +// 液位燃气一体化设备数据查询 +export function getLiquidGasData(params) { + return request({ + url: 'liquidGasData/list', + method: 'get', + params + }) +} + // 批量导出井盖数据 export function batchExportWellData(params) { return request({ @@ -37,15 +94,6 @@ }) } -// 液位数据查询 -export function getLiquidData(params) { - return request({ - url: 'liquiddata/list', - method: 'get', - params - }) -} - // 批量导出液位数据 export function batchExportLiquidData(params) { return request({ @@ -57,15 +105,6 @@ }) } -// 燃气数据查询 -export function getGasData(params) { - return request({ - url: 'gasdata/list', - method: 'get', - params - }) -} - // 批量导出燃气数据 export function batchExportGasData(params) { return request({ @@ -77,14 +116,6 @@ }) } -// 管盯数据查询 -export function getTubeData(params) { - return request({ - url: 'tubedata/list', - method: 'get', - params - }) -} // 批量导出管盯数据 export function batchExportTubeData(params) { return request({ @@ -95,14 +126,7 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } -// 开挖数据查询 -export function getDigData(params) { - return request({ - url: 'digdata/list', - method: 'get', - params - }) -} + // 批量导出开挖数据 export function batchExportDigData(params) { return request({ @@ -113,32 +137,7 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } -// 有害气体数据查询 -export function getHarmfulData(params) { - return request({ - url: 'harmfuldata/list', - method: 'get', - params - }) -} -// 批量导出有害气体数据 -export function batchExportHarmfulData(params) { - return request({ - url: 'harmfuldata/export', - method: 'get', - timeout: 120000, // 120s，2分钟 - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 温湿度数据查询 -export function getTempData(params) { - return request({ - url: 'tempdata/list', - method: 'get', - params - }) -} + // 批量导出温湿度数据 export function batchExportTempData(params) { return request({ @@ -150,14 +149,17 @@ }) } -// 井盖定位监测仪数据查询 -export function getWellLocaData(params) { +// 批量导出有害气体数据 +export function batchExportHarmfulData(params) { return request({ - url: 'welllocadata/list', + url: 'harmfuldata/export', method: 'get', - params + timeout: 120000, // 120s，2分钟 + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } + // 批量导出井盖定位监测仪数据 export function batchExportWellLocaData(params) { return request({ @@ -169,14 +171,6 @@ }) } -// 噪声记录仪数据查询 -export function getNoiseData(params) { - return request({ - url: 'noisedata/list', - method: 'get', - params - }) -} // 噪声记录仪数据导出 export function batchExportNoiseData(params) { return request({ @@ -187,14 +181,6 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } -// 液位燃气一体化设备数据查询 -export function getLiquidGasData(params) { - return request({ - url: 'liquidGasData/list', - method: 'get', - params - }) -} // 批量导出液位燃气一体化设备数据 export function batchExportLiquidGasData(params) { return request({ @@ -206,6 +192,15 @@ }) } +// 数据统计接口 +export function getStaticData(params) { + return request({ + url: 'data/list', + method: 'get', + params + }) +} + // 可燃气体外协数据查询 export function getGasdectorData(params) { return request({ @@ -225,7 +220,8 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } -// 激甲云台数据查询-章丘 + +// 可燃气体外协数据查询 export function getPantiltData(params) { return request({ url: '/pantilt/listpage', @@ -234,7 +230,7 @@ }) } -// 激甲云台数据导出-章丘 +// 可燃气体外协批量导出燃气数据 export function batchExportPantiltData(params) { return request({ url: '/pantilt/export', @@ -245,3 +241,22 @@ }) } +// 消防栓数据查询 +export function getHydrantData(params) { + return request({ + url: 'hydrant/list', + method: 'get', + params + }) +} + +// 批量导出消防栓数据 +export function batchExportHydrantData(params) { + return request({ + url: 'hydrant/export', + method: 'get', + timeout: 120000, // 120s，2分钟 + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} diff --git a/src/api/device/deviceTypeDetail.js b/src/api/device/deviceTypeDetail.js index 54a233f..c3d1c6f 100644 --- a/src/api/device/deviceTypeDetail.js +++ b/src/api/device/deviceTypeDetail.js @@ -83,4 +83,11 @@ params }) } - +// 消防栓终端查询 +export function hydrantdataList(params) { + return request({ + url: 'hydrantdata/listSimple', + method: 'get', + params + }) +} diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue index 551c2d7..228bf65 100644 --- a/src/components/DownloadTemplate/index.vue +++ b/src/components/DownloadTemplate/index.vue @@ -49,8 +49,8 @@ diff --git a/src/styles/index.scss b/src/styles/index.scss index 0d6a908..918c857 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -159,13 +159,3 @@ .el-table td{ padding: 4px 0px !important; } - -.upload-btn{ - display: inline-block; -} -.el-button + .upload-btn { - margin-left: 3px; -} -.upload-btn+ .el-button { - margin-left: 3px; -} diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue index cfb9847..71be03f 100644 --- a/src/views/dataManage/dataManage.vue +++ b/src/views/dataManage/dataManage.vue @@ -21,11 +21,12 @@ import ListTubeData from './deviceData/listTubeData' import ListGasdectorData from '@/views/dataManage/deviceData/listGasdectorData' import ListPantiltData from '@/views/dataManage/deviceData/listPantiltData' +import ListHydrantData from '@/views/dataManage/deviceData/listHydrantData' import { parseUrl } from '@/utils/parseutils' export default { name: 'DataManage', - components: { ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData }, + components: { ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData }, data() { return { activeName: 'wellcover', @@ -41,7 +42,8 @@ { permission: '/liquidGasData/list', label: '燃气智能终端(一体化)', name: 'liquidgas', type: '10', comp: 'list-liquid-gas-data' }, { permission: '/tubedata/list', label: '管盯', name: 'tube', type: '12', comp: 'list-tube-data' }, { permission: '/gasdector/listPage', label: '可燃气体智能监测终端', name: 'gasdector', type: '1', comp: 'list-gasdector-data' }, - { permission: '/pantilt/listPage', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' } + { permission: '/pantilt/listPage', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' }, + { permission: '/hydrantdata/list', label: '消防栓数据列表', name: 'hydrant', type: '11', comp: 'list-hydrant-data' } ] // 所有tab列表 } }, diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue index a92db03..2a0b33e 100644 --- a/src/views/dataManage/deviceData/listGasData.vue +++ b/src/views/dataManage/deviceData/listGasData.vue @@ -21,30 +21,31 @@ - - - - +

+ + + + +

@@ -135,7 +136,7 @@ methods: { // 批量导出 batchExport() { - // this.handleDateTime() + this.handleDateTime() // 全屏加载动画 const loading = this.$loading({ lock: true, @@ -145,7 +146,7 @@ }) batchExportGasData(this.listQuery).then(res => { loading.close() // 关闭加载动画 - let fileName = `${this.name}数据-${this.listQuery.beginTime}-${this.listQuery.endTime}.xlsx` + let fileName = `${this.name}数据_${this.listQuery.beginTime}_${this.listQuery.endTime}.xlsx` fileName = fileName.replace(/-|:| /g, '') const blob = new Blob([res.data]) exportFile(blob, fileName) @@ -201,6 +202,35 @@ diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue index d7ec85f..4b199c4 100644 --- a/src/views/dataManage/deviceData/listWellCoverData.vue +++ b/src/views/dataManage/deviceData/listWellCoverData.vue @@ -5,12 +5,11 @@

- +

@@ -27,30 +26,43 @@ - - - @@ -59,7 +71,6 @@ import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' import { getSearchLastWeekTime } from '@/utils/dateutils' -import { exportFile } from '@/utils/exportutils' export default { name: 'ListWellCoverData', @@ -71,7 +82,7 @@ }, // 设备类型 name: { type: String, - default: '' + default: '激光甲烷遥测云台' } // 设备名称 }, data() { @@ -121,15 +132,24 @@ align: 'center' } ], // 显示列 + multipleSelection: [], // 多选选中项 list: [], // 列表数据 total: 0, // 数据总数 - options: { - needIndex: true, // 是否需要序号列 - border: true // 是否需要上方边框 - }, + deviceTypeList: [], // 井盖类型列表 + deptProps: { + parent: 'pid', + value: 'id', + label: 'name', + children: 'children' + }, // 权属单位树形下拉菜单 + deptTreeList: null, // 组织树列表数据 + showDeptTree: 0, // 是否显示权属单位下拉 + showDeviceType: true, // 是否显示设备类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 - editShow: false // 是否显示编辑框 + editShow: false, // 是否显示编辑框 + detailShow: false, // 是否显示编辑框 + deptShowTop: false } }, mounted() { @@ -157,7 +177,6 @@ methods: { // 批量导出 batchExport() { - // this.handleDateTime() // 全屏加载动画 const loading = this.$loading({ lock: true, @@ -167,10 +186,16 @@ }) batchExportWellData(this.listQuery).then(res => { loading.close() // 关闭加载动画 - let fileName = `${this.name}数据-${this.listQuery.beginTime}-${this.listQuery.endTime}.xlsx` - fileName = fileName.replace(/-|:| /g, '') + console.log('download===', res) const blob = new Blob([res.data]) - exportFile(blob, fileName) + const downloadElement = document.createElement('a') + const href = window.URL.createObjectURL(blob) // 创建下载的链接 + downloadElement.href = href + downloadElement.download = `井盖状态监测仪数据.xlsx` // 下载后文件名 + document.body.appendChild(downloadElement) + downloadElement.click() // 点击下载 + document.body.removeChild(downloadElement) // 下载完成移除元素 + window.URL.revokeObjectURL(href) // 释放blob对象 }).catch((res) => { loading.close() }) @@ -185,15 +210,6 @@ if (!isNowPage) { // 是否显示当前页，否则跳转第一页 this.listQuery.offset = 1 } - this.handleDateTime() - getWellData(this.listQuery).then(response => { - this.list = response.data.rows - this.total = response.data.total - this.listLoading = false - }) - }, - // 处理时间 - handleDateTime() { if (this.timeRange && this.timeRange.length > 0) { this.listQuery.beginTime = this.timeRange[0] this.listQuery.endTime = this.timeRange[1] @@ -201,27 +217,68 @@ this.listQuery.beginTime = '' this.listQuery.endTime = '' } + getWellData(this.listQuery).then(response => { + this.list = response.data.rows + this.total = response.data.total + this.listLoading = false + }) }, checkState(row) { if (row.status !== '0') { return 'warning-state' } }, - // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写 - changePage(val) { - if (val && val.size) { - this.listQuery.limit = val.size - } - if (val && val.page) { - this.listQuery.offset = val.page - } + indexMethod(index) { + return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1 + }, + // 改变页容量 + handleSizeChange(val) { + this.listQuery.limit = val this.fetchData() + }, + // 改变当前页 + handleCurrentChange(val) { + this.listQuery.offset = val + this.fetchData() + }, + // 多选触发方法 + handleSelectionChange(val) { + this.multipleSelection = val } } } diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue index c78bb74..f93cd14 100644 --- a/src/views/system/area/listArea.vue +++ b/src/views/system/area/listArea.vue @@ -9,7 +9,7 @@

@@ -21,10 +21,10 @@ diff --git a/git_commit_template.txt b/git_commit_template.txt new file mode 100644 index 0000000..2be75dd --- /dev/null +++ b/git_commit_template.txt @@ -0,0 +1,5 @@ +(): + + + +

\ No newline at end of file diff --git a/src/api/data/data.js b/src/api/data/data.js index f9a1a11..2d6d209 100644 --- a/src/api/data/data.js +++ b/src/api/data/data.js @@ -2,14 +2,6 @@ * 数据管理接口 */ import request from '@/utils/request' -// 数据统计接口-查看某井监测指标 -export function getStaticData(params) { - return request({ - url: 'data/list', - method: 'get', - params - }) -} // 井盖数据查询 export function getWellData(params) { return request({ @@ -18,14 +10,79 @@ params }) } -// 井盖数据查询，不分页 -export function getWellDataSingle(params) { +// 液位数据查询 +export function getLiquidData(params) { return request({ - url: 'welldata/list', + url: 'liquiddata/list', method: 'get', params }) } +// 燃气数据查询 +export function getGasData(params) { + return request({ + url: 'gasdata/list', + method: 'get', + params + }) +} +// 管盯数据查询 +export function getTubeData(params) { + return request({ + url: 'tubedata/list', + method: 'get', + params + }) +} +// 开挖数据查询 +export function getDigData(params) { + return request({ + url: 'digdata/list', + method: 'get', + params + }) +} +// 有害气体数据查询 +export function getHarmfulData(params) { + return request({ + url: 'harmfuldata/list', + method: 'get', + params + }) +} +// 温湿度数据查询 +export function getTempData(params) { + return request({ + url: 'tempdata/list', + method: 'get', + params + }) +} +// 井盖定位监测仪数据查询 +export function getWellLocaData(params) { + return request({ + url: 'welllocadata/list', + method: 'get', + params + }) +} +// 噪声记录仪数据查询 +export function getNoiseData(params) { + return request({ + url: 'noisedata/list', + method: 'get', + params + }) +} +// 液位燃气一体化设备数据查询 +export function getLiquidGasData(params) { + return request({ + url: 'liquidGasData/list', + method: 'get', + params + }) +} + // 批量导出井盖数据 export function batchExportWellData(params) { return request({ @@ -37,15 +94,6 @@ }) } -// 液位数据查询 -export function getLiquidData(params) { - return request({ - url: 'liquiddata/list', - method: 'get', - params - }) -} - // 批量导出液位数据 export function batchExportLiquidData(params) { return request({ @@ -57,15 +105,6 @@ }) } -// 燃气数据查询 -export function getGasData(params) { - return request({ - url: 'gasdata/list', - method: 'get', - params - }) -} - // 批量导出燃气数据 export function batchExportGasData(params) { return request({ @@ -77,14 +116,6 @@ }) } -// 管盯数据查询 -export function getTubeData(params) { - return request({ - url: 'tubedata/list', - method: 'get', - params - }) -} // 批量导出管盯数据 export function batchExportTubeData(params) { return request({ @@ -95,14 +126,7 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } -// 开挖数据查询 -export function getDigData(params) { - return request({ - url: 'digdata/list', - method: 'get', - params - }) -} + // 批量导出开挖数据 export function batchExportDigData(params) { return request({ @@ -113,32 +137,7 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } -// 有害气体数据查询 -export function getHarmfulData(params) { - return request({ - url: 'harmfuldata/list', - method: 'get', - params - }) -} -// 批量导出有害气体数据 -export function batchExportHarmfulData(params) { - return request({ - url: 'harmfuldata/export', - method: 'get', - timeout: 120000, // 120s，2分钟 - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 温湿度数据查询 -export function getTempData(params) { - return request({ - url: 'tempdata/list', - method: 'get', - params - }) -} + // 批量导出温湿度数据 export function batchExportTempData(params) { return request({ @@ -150,14 +149,17 @@ }) } -// 井盖定位监测仪数据查询 -export function getWellLocaData(params) { +// 批量导出有害气体数据 +export function batchExportHarmfulData(params) { return request({ - url: 'welllocadata/list', + url: 'harmfuldata/export', method: 'get', - params + timeout: 120000, // 120s，2分钟 + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } + // 批量导出井盖定位监测仪数据 export function batchExportWellLocaData(params) { return request({ @@ -169,14 +171,6 @@ }) } -// 噪声记录仪数据查询 -export function getNoiseData(params) { - return request({ - url: 'noisedata/list', - method: 'get', - params - }) -} // 噪声记录仪数据导出 export function batchExportNoiseData(params) { return request({ @@ -187,14 +181,6 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } -// 液位燃气一体化设备数据查询 -export function getLiquidGasData(params) { - return request({ - url: 'liquidGasData/list', - method: 'get', - params - }) -} // 批量导出液位燃气一体化设备数据 export function batchExportLiquidGasData(params) { return request({ @@ -206,6 +192,15 @@ }) } +// 数据统计接口 +export function getStaticData(params) { + return request({ + url: 'data/list', + method: 'get', + params + }) +} + // 可燃气体外协数据查询 export function getGasdectorData(params) { return request({ @@ -225,7 +220,8 @@ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) } -// 激甲云台数据查询-章丘 + +// 可燃气体外协数据查询 export function getPantiltData(params) { return request({ url: '/pantilt/listpage', @@ -234,7 +230,7 @@ }) } -// 激甲云台数据导出-章丘 +// 可燃气体外协批量导出燃气数据 export function batchExportPantiltData(params) { return request({ url: '/pantilt/export', @@ -245,3 +241,22 @@ }) } +// 消防栓数据查询 +export function getHydrantData(params) { + return request({ + url: 'hydrant/list', + method: 'get', + params + }) +} + +// 批量导出消防栓数据 +export function batchExportHydrantData(params) { + return request({ + url: 'hydrant/export', + method: 'get', + timeout: 120000, // 120s，2分钟 + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} diff --git a/src/api/device/deviceTypeDetail.js b/src/api/device/deviceTypeDetail.js index 54a233f..c3d1c6f 100644 --- a/src/api/device/deviceTypeDetail.js +++ b/src/api/device/deviceTypeDetail.js @@ -83,4 +83,11 @@ params }) } - +// 消防栓终端查询 +export function hydrantdataList(params) { + return request({ + url: 'hydrantdata/listSimple', + method: 'get', + params + }) +} diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue index 551c2d7..228bf65 100644 --- a/src/components/DownloadTemplate/index.vue +++ b/src/components/DownloadTemplate/index.vue @@ -49,8 +49,8 @@ diff --git a/src/styles/index.scss b/src/styles/index.scss index 0d6a908..918c857 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -159,13 +159,3 @@ .el-table td{ padding: 4px 0px !important; } - -.upload-btn{ - display: inline-block; -} -.el-button + .upload-btn { - margin-left: 3px; -} -.upload-btn+ .el-button { - margin-left: 3px; -} diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue index cfb9847..71be03f 100644 --- a/src/views/dataManage/dataManage.vue +++ b/src/views/dataManage/dataManage.vue @@ -21,11 +21,12 @@ import ListTubeData from './deviceData/listTubeData' import ListGasdectorData from '@/views/dataManage/deviceData/listGasdectorData' import ListPantiltData from '@/views/dataManage/deviceData/listPantiltData' +import ListHydrantData from '@/views/dataManage/deviceData/listHydrantData' import { parseUrl } from '@/utils/parseutils' export default { name: 'DataManage', - components: { ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData }, + components: { ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData }, data() { return { activeName: 'wellcover', @@ -41,7 +42,8 @@ { permission: '/liquidGasData/list', label: '燃气智能终端(一体化)', name: 'liquidgas', type: '10', comp: 'list-liquid-gas-data' }, { permission: '/tubedata/list', label: '管盯', name: 'tube', type: '12', comp: 'list-tube-data' }, { permission: '/gasdector/listPage', label: '可燃气体智能监测终端', name: 'gasdector', type: '1', comp: 'list-gasdector-data' }, - { permission: '/pantilt/listPage', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' } + { permission: '/pantilt/listPage', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' }, + { permission: '/hydrantdata/list', label: '消防栓数据列表', name: 'hydrant', type: '11', comp: 'list-hydrant-data' } ] // 所有tab列表 } }, diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue index a92db03..2a0b33e 100644 --- a/src/views/dataManage/deviceData/listGasData.vue +++ b/src/views/dataManage/deviceData/listGasData.vue @@ -21,30 +21,31 @@ - - - - +

+ + + + +

@@ -135,7 +136,7 @@ methods: { // 批量导出 batchExport() { - // this.handleDateTime() + this.handleDateTime() // 全屏加载动画 const loading = this.$loading({ lock: true, @@ -145,7 +146,7 @@ }) batchExportGasData(this.listQuery).then(res => { loading.close() // 关闭加载动画 - let fileName = `${this.name}数据-${this.listQuery.beginTime}-${this.listQuery.endTime}.xlsx` + let fileName = `${this.name}数据_${this.listQuery.beginTime}_${this.listQuery.endTime}.xlsx` fileName = fileName.replace(/-|:| /g, '') const blob = new Blob([res.data]) exportFile(blob, fileName) @@ -201,6 +202,35 @@ diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue index d7ec85f..4b199c4 100644 --- a/src/views/dataManage/deviceData/listWellCoverData.vue +++ b/src/views/dataManage/deviceData/listWellCoverData.vue @@ -5,12 +5,11 @@

- +

@@ -27,30 +26,43 @@ - - - @@ -59,7 +71,6 @@ import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' import { getSearchLastWeekTime } from '@/utils/dateutils' -import { exportFile } from '@/utils/exportutils' export default { name: 'ListWellCoverData', @@ -71,7 +82,7 @@ }, // 设备类型 name: { type: String, - default: '' + default: '激光甲烷遥测云台' } // 设备名称 }, data() { @@ -121,15 +132,24 @@ align: 'center' } ], // 显示列 + multipleSelection: [], // 多选选中项 list: [], // 列表数据 total: 0, // 数据总数 - options: { - needIndex: true, // 是否需要序号列 - border: true // 是否需要上方边框 - }, + deviceTypeList: [], // 井盖类型列表 + deptProps: { + parent: 'pid', + value: 'id', + label: 'name', + children: 'children' + }, // 权属单位树形下拉菜单 + deptTreeList: null, // 组织树列表数据 + showDeptTree: 0, // 是否显示权属单位下拉 + showDeviceType: true, // 是否显示设备类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 - editShow: false // 是否显示编辑框 + editShow: false, // 是否显示编辑框 + detailShow: false, // 是否显示编辑框 + deptShowTop: false } }, mounted() { @@ -157,7 +177,6 @@ methods: { // 批量导出 batchExport() { - // this.handleDateTime() // 全屏加载动画 const loading = this.$loading({ lock: true, @@ -167,10 +186,16 @@ }) batchExportWellData(this.listQuery).then(res => { loading.close() // 关闭加载动画 - let fileName = `${this.name}数据-${this.listQuery.beginTime}-${this.listQuery.endTime}.xlsx` - fileName = fileName.replace(/-|:| /g, '') + console.log('download===', res) const blob = new Blob([res.data]) - exportFile(blob, fileName) + const downloadElement = document.createElement('a') + const href = window.URL.createObjectURL(blob) // 创建下载的链接 + downloadElement.href = href + downloadElement.download = `井盖状态监测仪数据.xlsx` // 下载后文件名 + document.body.appendChild(downloadElement) + downloadElement.click() // 点击下载 + document.body.removeChild(downloadElement) // 下载完成移除元素 + window.URL.revokeObjectURL(href) // 释放blob对象 }).catch((res) => { loading.close() }) @@ -185,15 +210,6 @@ if (!isNowPage) { // 是否显示当前页，否则跳转第一页 this.listQuery.offset = 1 } - this.handleDateTime() - getWellData(this.listQuery).then(response => { - this.list = response.data.rows - this.total = response.data.total - this.listLoading = false - }) - }, - // 处理时间 - handleDateTime() { if (this.timeRange && this.timeRange.length > 0) { this.listQuery.beginTime = this.timeRange[0] this.listQuery.endTime = this.timeRange[1] @@ -201,27 +217,68 @@ this.listQuery.beginTime = '' this.listQuery.endTime = '' } + getWellData(this.listQuery).then(response => { + this.list = response.data.rows + this.total = response.data.total + this.listLoading = false + }) }, checkState(row) { if (row.status !== '0') { return 'warning-state' } }, - // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写 - changePage(val) { - if (val && val.size) { - this.listQuery.limit = val.size - } - if (val && val.page) { - this.listQuery.offset = val.page - } + indexMethod(index) { + return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1 + }, + // 改变页容量 + handleSizeChange(val) { + this.listQuery.limit = val this.fetchData() + }, + // 改变当前页 + handleCurrentChange(val) { + this.listQuery.offset = val + this.fetchData() + }, + // 多选触发方法 + handleSelectionChange(val) { + this.multipleSelection = val } } } diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue index c78bb74..f93cd14 100644 --- a/src/views/system/area/listArea.vue +++ b/src/views/system/area/listArea.vue @@ -9,7 +9,7 @@

@@ -21,10 +21,10 @@ diff --git a/src/views/wellManage/listWell.vue b/src/views/wellManage/listWell.vue index 9c9e892..2392699 100644 --- a/src/views/wellManage/listWell.vue +++ b/src/views/wellManage/listWell.vue @@ -19,53 +19,53 @@ - - - - - + + + +

+ +

+ -

@@ -122,20 +135,60 @@ order: 'asc' }, // 筛选条件 columns: [ - { text: '点位编号', value: 'wellCode', align: 'center' }, - { text: '点位名称', value: 'wellName', align: 'center' }, - { text: '井深(m)', value: 'deep', align: 'center' }, - { text: '详细地址', value: 'position', align: 'center' }, - { text: '点位类型', value: 'wellTypeName', align: 'center' }, - { text: '权属单位', value: 'deptName', align: 'center' }, - { text: '设备数量', value: 'deviceCount', align: 'center', type: 'Button' }, - { text: '布防状态', value: 'bfztName', align: 'center' } + { + text: '点位编号', + value: 'wellCode', + align: 'center' + }, + { + text: '点位名称', + value: 'wellName', + align: 'center' + }, + { + text: '井深(m)', + value: 'deep', + align: 'center' + }, + { + text: '详细地址', + value: 'position', + align: 'center' + }, + { + text: '点位类型', + value: 'wellTypeName', + align: 'center' + }, + { + text: '权属单位', + value: 'deptName', + align: 'center' + }, + { + text: '设备数量', + value: 'deviceCount', + align: 'center', + type: 'Button' + }, + { + text: '布防状态', + value: 'bfztName', + align: 'center' + } ], // 显示列 multipleSelection: [], // 多选选中项 list: [], // 列表数据 total: 0, // 数据总数 showWellType: true, // 是否显示点位类型下拉 - wellTypeList: [], // 点位类型列表 + wellTypeList: null, // 点位类型列表 + deptProps: { + parent: 'pid', + value: 'id', + label: 'name', + children: 'children' + }, // 权属单位树形下拉菜单 + deptTreeList: null, // 组织树列表数据 deptShowTop: false, // 权属单位下拉是否显示顶级 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 @@ -164,6 +217,7 @@ methods: { // 打开详情对话框 detail(row) { + console.log(row, '============++++') this.detailShow = true this.$refs.detailwell.initDialog(true, row) }, @@ -180,6 +234,7 @@ }, // 编辑井信息 edit(row) { + console.log(row, '===row====') this.dialogFormVisible = true this.editShow = true this.$refs.editwell.initDialog(this.dialogFormVisible, row) @@ -413,18 +468,23 @@ goDeviceList(row) { this.$router.push({ name: 'DeviceList', query: { wellCode: row.wellCode }}) }, - // 去报警记录页 goAlarmRecords(row) { this.$router.push({ name: 'AlarmRecords', query: { wellCode: row.wellCode }}) }, - // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写 - changePage(val) { - if (val && val.size) { - this.listQuery.limit = val.size - } - if (val && val.page) { - this.listQuery.offset = val.page - } + handleSuccess() { + console.log('handleSuccess') + }, + indexMethod(index) { + return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1 + }, + // 改变页容量 + handleSizeChange(val) { + this.listQuery.limit = val + this.fetchData() + }, + // 改变当前页 + handleCurrentChange(val) { + this.listQuery.offset = val this.fetchData() }, // 多选触发方法 @@ -436,5 +496,30 @@