diff --git a/src/views/projectFront/deepFoundationPitManage/dataConfig.vue b/src/views/projectFront/deepFoundationPitManage/dataConfig.vue index bc812fcd..1cf8fd1b 100644 --- a/src/views/projectFront/deepFoundationPitManage/dataConfig.vue +++ b/src/views/projectFront/deepFoundationPitManage/dataConfig.vue @@ -560,7 +560,7 @@ style="margin-right: 10px" >{{$t('message.deepFoundConfig.pointNo')}} @@ -571,7 +571,7 @@ style="margin-right: 10px" >{{$t('message.deepFoundConfig.alarmStatus')}} @@ -617,6 +617,11 @@ plain @click="selectDeepExcavationCurrentData" >{{$t('message.deepFoundConfig.search')}} + 导出 @@ -1430,9 +1435,13 @@ export default { } ], showActiveDetail: false, - devNum2: "", - alarmStatus2: "", acquisitionTime: [], + exportData:{ + alarmState:"", + measurePointNumber:"", + startTime:"", + endTime: "", + }, startX: "", startY: "", ratio: 1, @@ -1538,8 +1547,8 @@ export default { this.deleteInfo = false; }, closeActiveDetail() { - this.devNum2 = ""; - this.alarmStatus2 = ""; + this.exportData.measurePointNumber = ""; + this.exportData.alarmState = ""; this.showActiveDetail = false; this.selectDeepExcavationMonitorTypeList(); }, @@ -1756,17 +1765,11 @@ export default { }); }, selectDeepExcavationCurrentData() { - let data = { - alarmState: this.alarmStatus2 ? this.alarmStatus2 : "", - measurePointNumber: this.devNum2, - relaId: this.relaId, - projectSn: this.projectSn, - startTime: this.acquisitionTime != null ? this.acquisitionTime[0] : "", - endTime: this.acquisitionTime != null ? this.acquisitionTime[1] : "", - pageNo: this.pagInfo2.pageNo, - pageSize: this.pagInfo2.pageSize - }; - // selectDeepExcavationCurrentDataApi + let data = this.exportData + data.startTime = this.acquisitionTime != "" ? this.acquisitionTime[0] : "", + data.endTime = this.acquisitionTime != "" ? this.acquisitionTime[1] : "", + data.pageNo = this.pagInfo2.pageNo, + data.pageSize = this.pagInfo2.pageSize selectDeepExcavationCurrentDataListApi(data).then(res => { console.log(res); if (res.code == 200) { @@ -1776,6 +1779,20 @@ export default { } }); }, + // 导出数据 + exportDataFn(){ + this.exportData.startTime = this.acquisitionTime != "" ? this.acquisitionTime[0] : "", + this.exportData.endTime = this.acquisitionTime != "" ? this.acquisitionTime[1] : "", + console.log('=======导出传进去的参数',this.exportData) + window.location.href = + this.$http.defaults.baseURL + + 'xmgl/deepExcavationCurrentData/exportData?alarmState=' + this.exportData.alarmState + + '&measurePointNumber=' + this.exportData.measurePointNumber + + '&projectSn=' + this.projectSn + + '&relaId=' + this.relaId + + '&startTime=' + this.exportData.startTime + + '&endTime=' + this.exportData.endTime + }, // 获取当前时间 返回YYYY-MM-DD HH:mm:ss selectNowDate() { var date = new Date(),