diff --git a/src/views/projectFront/deepFoundationPitManage/dataConfig.vue b/src/views/projectFront/deepFoundationPitManage/dataConfig.vue
index fc2d7332..701b34e8 100644
--- a/src/views/projectFront/deepFoundationPitManage/dataConfig.vue
+++ b/src/views/projectFront/deepFoundationPitManage/dataConfig.vue
@@ -418,6 +418,7 @@
end-placeholder="结束日期"
:picker-options="pickerOptions">
-->
+
@@ -435,7 +434,12 @@
-
+
+
+
+
+
+
@@ -935,6 +939,7 @@ export default {
formType: '', // 1.新增基坑 2.编辑基坑
editId: "",
monitorTypeId: "",
+ relaId:'',
deepExcavationId: "",
activeImgUrl: "",
showAddImg: false,
@@ -1189,17 +1194,17 @@ export default {
},
selectDeepExcavationCurrentData(){
let data = {
- // acquisitionTime
alarmState: this.alarmStatus2 ? this.alarmStatus2 : "",
measurePointNumber: this.devNum2,
- monitorTypeId: this.monitorTypeId,
+ relaId: this.relaId,
projectSn: this.projectSn,
- startTime: this.acquisitionTime.length>0 ? this.acquisitionTime[0]:'',
- endTime: this.acquisitionTime.length>0 ? this.acquisitionTime[1]:'',
+ startTime: this.acquisitionTime != null ? this.acquisitionTime[0]:'',
+ endTime: this.acquisitionTime != null ? this.acquisitionTime[1]:'',
pageNo: this.pagInfo2.pageNo,
pageSize: this.pagInfo2.pageSize
}
- selectDeepExcavationCurrentDataApi(data).then(res=>{
+ // selectDeepExcavationCurrentDataApi
+ selectDeepExcavationCurrentDataListApi(data).then(res=>{
console.log(res)
if(res.code == 200){
this.currentPointDetail = res.result.records
@@ -1249,7 +1254,7 @@ export default {
})
// data.thresholdList = this.testPointData
// data.deepExcavationId = this.deepExcavationList[this.activeDeep].id
- data.monitorTypeId = this.monitorTypeId
+ data.relaId = this.relaId
// console.log(data)
// data.sensorList = this.testPointForm
console.log('新增参数',data)
@@ -1351,6 +1356,7 @@ export default {
selectDeepExcavationMonitorTypeListApi(data).then(res=>{
if(res.code == 200){
console.log(res.result.records)
+ console.log('监测信息',res)
this.tableData = res.result.records
this.pagInfo.total = res.result.total
}
@@ -1656,7 +1662,7 @@ export default {
this.resetForm()
},
previewDetail(val, type){
- this.monitorTypeId = val.id
+ this.relaId = val.id
console.log(val)
if(type == 1){
this.selectMeasurePointList()
@@ -1704,7 +1710,7 @@ export default {
let data = {
alarmState: this.alarmStatus ? this.alarmStatus:"",
measurePointNumber: this.devNum,
- monitorTypeId: this.monitorTypeId,
+ relaId: this.relaId,
pageNo: this.pagInfo.pageNo,
pageSize: this.pagInfo.pageSize,
}