diff --git a/src/api/smartAnalysis.js b/src/api/smartAnalysis.js index 408e75f..9590218 100644 --- a/src/api/smartAnalysis.js +++ b/src/api/smartAnalysis.js @@ -5,7 +5,7 @@ // 内涝评估分析数据查询 export function getWaterData(params) { return request({ - url: 'welldata/list', + url: 'analysis/levelAnalysisLogs', method: 'get', params }) @@ -14,24 +14,24 @@ // 燃气管线泄漏点分析数据 export function getGasLeakageData(params) { return request({ - url: 'liquiddata/list', + url: 'analysis/rtuAnalysisLogs', method: 'get', params }) } -// 燃气数据查询 +// 开挖 export function getHotLeakageData(params) { return request({ - url: 'gasdata/list', + url: 'analysis/digAnalysisLogs', method: 'get', params }) } -// 批量导出井盖数据 +// 批量导出内涝 export function batchExportWaterData(params) { return request({ - url: 'welldata/export', + url: 'analysis/exportLevelAnalysisLogs', method: 'get', timeout: 120000, params, @@ -39,10 +39,10 @@ }) } -// 批量导出液位数据 +// 批量导出燃气 export function batchExportGasLeakageData(params) { return request({ - url: 'liquiddata/export', + url: 'analysis/exportRtuAnalysisLogs', method: 'get', timeout: 120000, params, @@ -53,7 +53,7 @@ // 批量导出燃气数据 export function batchExportHotLeakageData(params) { return request({ - url: 'gasdata/export', + url: 'analysis/exportDigAnalysisLogs', method: 'get', timeout: 120000, // 120s，2分钟 params, diff --git a/src/api/smartAnalysis.js b/src/api/smartAnalysis.js index 408e75f..9590218 100644 --- a/src/api/smartAnalysis.js +++ b/src/api/smartAnalysis.js @@ -5,7 +5,7 @@ // 内涝评估分析数据查询 export function getWaterData(params) { return request({ - url: 'welldata/list', + url: 'analysis/levelAnalysisLogs', method: 'get', params }) @@ -14,24 +14,24 @@ // 燃气管线泄漏点分析数据 export function getGasLeakageData(params) { return request({ - url: 'liquiddata/list', + url: 'analysis/rtuAnalysisLogs', method: 'get', params }) } -// 燃气数据查询 +// 开挖 export function getHotLeakageData(params) { return request({ - url: 'gasdata/list', + url: 'analysis/digAnalysisLogs', method: 'get', params }) } -// 批量导出井盖数据 +// 批量导出内涝 export function batchExportWaterData(params) { return request({ - url: 'welldata/export', + url: 'analysis/exportLevelAnalysisLogs', method: 'get', timeout: 120000, params, @@ -39,10 +39,10 @@ }) } -// 批量导出液位数据 +// 批量导出燃气 export function batchExportGasLeakageData(params) { return request({ - url: 'liquiddata/export', + url: 'analysis/exportRtuAnalysisLogs', method: 'get', timeout: 120000, params, @@ -53,7 +53,7 @@ // 批量导出燃气数据 export function batchExportHotLeakageData(params) { return request({ - url: 'gasdata/export', + url: 'analysis/exportDigAnalysisLogs', method: 'get', timeout: 120000, // 120s，2分钟 params, diff --git a/src/views/smartAnalysis/components/listGasLeakage.vue b/src/views/smartAnalysis/components/listGasLeakage.vue index 6afc575..7a84031 100644 --- a/src/views/smartAnalysis/components/listGasLeakage.vue +++ b/src/views/smartAnalysis/components/listGasLeakage.vue @@ -87,16 +87,16 @@ }, { text: '燃气浓度(%LEL)', - value: 'strength', + value: 'analysisValue', align: 'center' }, { text: '影响面积', - value: 'affectArea', + value: 'area', align: 'center' }, { - text: '阀门编号', + text: '关阀编号', value: 'valveCode', width: 100, align: 'center', @@ -104,7 +104,7 @@ }, { text: '记录创建时间', - value: 'createtime', + value: 'createTime', width: 170, align: 'center' } @@ -170,7 +170,6 @@ methods: { // 批量导出 batchExport() { - console.log('批量导出开挖配置') // 全屏加载动画 const loading = this.$loading({ lock: true, @@ -208,9 +207,7 @@ this.list = response.data.rows this.total = parseInt(response.data.total) // 虚拟数据 - this.list = [ - { wellCode: 'NT3323', position: '永定路52号院，航天二院东区北门', strength: '2', affectArea: '55', valveCode: '155421', createtime: '2019-11-28 00:00:00' } - ] + this.list = response.data.rows this.listLoading = false }) }, diff --git a/src/api/smartAnalysis.js b/src/api/smartAnalysis.js index 408e75f..9590218 100644 --- a/src/api/smartAnalysis.js +++ b/src/api/smartAnalysis.js @@ -5,7 +5,7 @@ // 内涝评估分析数据查询 export function getWaterData(params) { return request({ - url: 'welldata/list', + url: 'analysis/levelAnalysisLogs', method: 'get', params }) @@ -14,24 +14,24 @@ // 燃气管线泄漏点分析数据 export function getGasLeakageData(params) { return request({ - url: 'liquiddata/list', + url: 'analysis/rtuAnalysisLogs', method: 'get', params }) } -// 燃气数据查询 +// 开挖 export function getHotLeakageData(params) { return request({ - url: 'gasdata/list', + url: 'analysis/digAnalysisLogs', method: 'get', params }) } -// 批量导出井盖数据 +// 批量导出内涝 export function batchExportWaterData(params) { return request({ - url: 'welldata/export', + url: 'analysis/exportLevelAnalysisLogs', method: 'get', timeout: 120000, params, @@ -39,10 +39,10 @@ }) } -// 批量导出液位数据 +// 批量导出燃气 export function batchExportGasLeakageData(params) { return request({ - url: 'liquiddata/export', + url: 'analysis/exportRtuAnalysisLogs', method: 'get', timeout: 120000, params, @@ -53,7 +53,7 @@ // 批量导出燃气数据 export function batchExportHotLeakageData(params) { return request({ - url: 'gasdata/export', + url: 'analysis/exportDigAnalysisLogs', method: 'get', timeout: 120000, // 120s，2分钟 params, diff --git a/src/views/smartAnalysis/components/listGasLeakage.vue b/src/views/smartAnalysis/components/listGasLeakage.vue index 6afc575..7a84031 100644 --- a/src/views/smartAnalysis/components/listGasLeakage.vue +++ b/src/views/smartAnalysis/components/listGasLeakage.vue @@ -87,16 +87,16 @@ }, { text: '燃气浓度(%LEL)', - value: 'strength', + value: 'analysisValue', align: 'center' }, { text: '影响面积', - value: 'affectArea', + value: 'area', align: 'center' }, { - text: '阀门编号', + text: '关阀编号', value: 'valveCode', width: 100, align: 'center', @@ -104,7 +104,7 @@ }, { text: '记录创建时间', - value: 'createtime', + value: 'createTime', width: 170, align: 'center' } @@ -170,7 +170,6 @@ methods: { // 批量导出 batchExport() { - console.log('批量导出开挖配置') // 全屏加载动画 const loading = this.$loading({ lock: true, @@ -208,9 +207,7 @@ this.list = response.data.rows this.total = parseInt(response.data.total) // 虚拟数据 - this.list = [ - { wellCode: 'NT3323', position: '永定路52号院，航天二院东区北门', strength: '2', affectArea: '55', valveCode: '155421', createtime: '2019-11-28 00:00:00' } - ] + this.list = response.data.rows this.listLoading = false }) }, diff --git a/src/views/smartAnalysis/components/listHotLeakage.vue b/src/views/smartAnalysis/components/listHotLeakage.vue index 81f613b..cdd46cc 100644 --- a/src/views/smartAnalysis/components/listHotLeakage.vue +++ b/src/views/smartAnalysis/components/listHotLeakage.vue @@ -87,17 +87,22 @@ }, { text: '影响面积', - value: 'affectArea', + value: 'area', align: 'center' }, { - text: '阀门编号', + text: '噪声值(mg)', + value: 'analysisValue', + align: 'center' + }, + { + text: '关阀编号', value: 'valveCode', align: 'center' }, { text: '记录创建时间', - value: 'createtime', + value: 'createTime', width: 170, align: 'center' } @@ -163,7 +168,6 @@ methods: { // 批量导出 batchExport() { - console.log('批量导出开挖配置') // 全屏加载动画 const loading = this.$loading({ lock: true, @@ -201,9 +205,7 @@ this.list = response.data.rows this.total = parseInt(response.data.total) // 虚拟数据 - this.list = [ - { wellCode: 'NT3323', position: '永定路52号院，航天二院东区北门', strength: '2', affectArea: '55', valveCode: '155421', createtime: '2019-11-28 00:00:00' } - ] + this.list = response.data.rows this.listLoading = false }) }, diff --git a/src/api/smartAnalysis.js b/src/api/smartAnalysis.js index 408e75f..9590218 100644 --- a/src/api/smartAnalysis.js +++ b/src/api/smartAnalysis.js @@ -5,7 +5,7 @@ // 内涝评估分析数据查询 export function getWaterData(params) { return request({ - url: 'welldata/list', + url: 'analysis/levelAnalysisLogs', method: 'get', params }) @@ -14,24 +14,24 @@ // 燃气管线泄漏点分析数据 export function getGasLeakageData(params) { return request({ - url: 'liquiddata/list', + url: 'analysis/rtuAnalysisLogs', method: 'get', params }) } -// 燃气数据查询 +// 开挖 export function getHotLeakageData(params) { return request({ - url: 'gasdata/list', + url: 'analysis/digAnalysisLogs', method: 'get', params }) } -// 批量导出井盖数据 +// 批量导出内涝 export function batchExportWaterData(params) { return request({ - url: 'welldata/export', + url: 'analysis/exportLevelAnalysisLogs', method: 'get', timeout: 120000, params, @@ -39,10 +39,10 @@ }) } -// 批量导出液位数据 +// 批量导出燃气 export function batchExportGasLeakageData(params) { return request({ - url: 'liquiddata/export', + url: 'analysis/exportRtuAnalysisLogs', method: 'get', timeout: 120000, params, @@ -53,7 +53,7 @@ // 批量导出燃气数据 export function batchExportHotLeakageData(params) { return request({ - url: 'gasdata/export', + url: 'analysis/exportDigAnalysisLogs', method: 'get', timeout: 120000, // 120s，2分钟 params, diff --git a/src/views/smartAnalysis/components/listGasLeakage.vue b/src/views/smartAnalysis/components/listGasLeakage.vue index 6afc575..7a84031 100644 --- a/src/views/smartAnalysis/components/listGasLeakage.vue +++ b/src/views/smartAnalysis/components/listGasLeakage.vue @@ -87,16 +87,16 @@ }, { text: '燃气浓度(%LEL)', - value: 'strength', + value: 'analysisValue', align: 'center' }, { text: '影响面积', - value: 'affectArea', + value: 'area', align: 'center' }, { - text: '阀门编号', + text: '关阀编号', value: 'valveCode', width: 100, align: 'center', @@ -104,7 +104,7 @@ }, { text: '记录创建时间', - value: 'createtime', + value: 'createTime', width: 170, align: 'center' } @@ -170,7 +170,6 @@ methods: { // 批量导出 batchExport() { - console.log('批量导出开挖配置') // 全屏加载动画 const loading = this.$loading({ lock: true, @@ -208,9 +207,7 @@ this.list = response.data.rows this.total = parseInt(response.data.total) // 虚拟数据 - this.list = [ - { wellCode: 'NT3323', position: '永定路52号院，航天二院东区北门', strength: '2', affectArea: '55', valveCode: '155421', createtime: '2019-11-28 00:00:00' } - ] + this.list = response.data.rows this.listLoading = false }) }, diff --git a/src/views/smartAnalysis/components/listHotLeakage.vue b/src/views/smartAnalysis/components/listHotLeakage.vue index 81f613b..cdd46cc 100644 --- a/src/views/smartAnalysis/components/listHotLeakage.vue +++ b/src/views/smartAnalysis/components/listHotLeakage.vue @@ -87,17 +87,22 @@ }, { text: '影响面积', - value: 'affectArea', + value: 'area', align: 'center' }, { - text: '阀门编号', + text: '噪声值(mg)', + value: 'analysisValue', + align: 'center' + }, + { + text: '关阀编号', value: 'valveCode', align: 'center' }, { text: '记录创建时间', - value: 'createtime', + value: 'createTime', width: 170, align: 'center' } @@ -163,7 +168,6 @@ methods: { // 批量导出 batchExport() { - console.log('批量导出开挖配置') // 全屏加载动画 const loading = this.$loading({ lock: true, @@ -201,9 +205,7 @@ this.list = response.data.rows this.total = parseInt(response.data.total) // 虚拟数据 - this.list = [ - { wellCode: 'NT3323', position: '永定路52号院，航天二院东区北门', strength: '2', affectArea: '55', valveCode: '155421', createtime: '2019-11-28 00:00:00' } - ] + this.list = response.data.rows this.listLoading = false }) }, diff --git a/src/views/smartAnalysis/components/listWater.vue b/src/views/smartAnalysis/components/listWater.vue index 36d3824..a03ad87 100644 --- a/src/views/smartAnalysis/components/listWater.vue +++ b/src/views/smartAnalysis/components/listWater.vue @@ -87,17 +87,17 @@ }, { text: '液位值', - value: 'liquidData', + value: 'analysisValue', align: 'center' }, { text: '影响面积', - value: 'affectArea', + value: 'area', align: 'center' }, { text: '记录创建时间', - value: 'createtime', + value: 'createTime', width: 170, align: 'center' } @@ -163,7 +163,6 @@ methods: { // 批量导出 batchExport() { - console.log('批量导出开挖配置') // 全屏加载动画 const loading = this.$loading({ lock: true, @@ -178,7 +177,7 @@ const downloadElement = document.createElement('a') const href = window.URL.createObjectURL(blob) // 创建下载的链接 downloadElement.href = href - downloadElement.download = `开挖监测仪数s据.xlsx` // 下载后文件名 + downloadElement.download = `内涝评估分析记录.xlsx` // 下载后文件名 document.body.appendChild(downloadElement) downloadElement.click() // 点击下载 document.body.removeChild(downloadElement) // 下载完成移除元素 @@ -201,10 +200,7 @@ this.list = response.data.rows this.total = parseInt(response.data.total) // 虚拟数据 - this.list = [ - { wellCode: 'NT3323', position: '永定路52号院，航天二院东区北门', liquidData: '23', affectArea: '55', createtime: '2019-11-28 00:00:00' } - ] - + this.list = response.data.rows this.listLoading = false }) },