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, } diff --git a/src/views/projectFront/deepFoundationPitManage/monitorData.vue b/src/views/projectFront/deepFoundationPitManage/monitorData.vue index d9c12611..33acbb33 100644 --- a/src/views/projectFront/deepFoundationPitManage/monitorData.vue +++ b/src/views/projectFront/deepFoundationPitManage/monitorData.vue @@ -368,9 +368,12 @@ - + + + + - + @@ -433,6 +436,7 @@ export default { safeList:["一级","二级","三级","四级","五级","六级"], deepExcavation: "", //基坑id monitorTypeId: "", //监测内容id + relaId:'', colorList: ['#44D7B6', '#44D7B6','#F67F52', '#FF0000'], colorList2:['#7953F6','#F67F52'], colorList3:['#44D7B6','#5484F6'], @@ -531,27 +535,30 @@ export default { selectDeepExcavationCurrentDataList(){ selectDeepExcavationCurrentDataListApi({ measurePointNumber: this.checkList, - monitorTypeId: this.monitorTypeId, + relaId: this.relaId, projectSn: this.projectSn, - startTime: this.dateTime[0], - endTime: this.dateTime[1] + // startTime: this.dateTime[0], + // endTime: this.dateTime[1] }).then(res=>{ console.log(res) if(res.code == 200 && res.result){ - this.tableData2 = res.result + console.log('下面的数据',res) + this.tableData2 = res.result.records this.echartData7={ xAxis: [], data: [] } this.detailData.tableHeader.forEach(item=>{ - if(item.key == 'data1'){ + console.log('----item---',item) + if(item.key == 'data'){ this.echartData7.unit = '('+item.keyName.split('(')[1] } }) - res.result.forEach(item=>{ + res.result.records.forEach(item=>{ this.echartData7.xAxis.push(item.receiveTime.split(' ')[1]) - this.echartData7.data.push(item.data1) + this.echartData7.data.push(item.data) }) + // console.log('图标的值',this.echartData7) this.createdEchart7() } }) @@ -560,9 +567,9 @@ export default { selectDeepExcavationAllMeasurePointList(){ selectDeepExcavationAllMeasurePointListApi({ deepExcavationId: this.deepExcavation, - monitorTypeId: this.monitorTypeId + relaId: this.relaId }).then(res=>{ - // console.log(res) + console.log('列表查询测点',res) if(res.code == 200 && res.result){ this.options = res.result let arr = [] @@ -570,7 +577,7 @@ export default { arr.push(item.measurePointName) }) this.detailData.point = arr.join('，') - console.log(res.result) + console.log('this.detailData.point',this.detailData.point) if(res.result.length>0){ this.checkList = res.result[0].measurePointNumber } @@ -1431,22 +1438,22 @@ export default { }, showDetail(val){ this.visibleDialog = true - console.log(val) - this.monitorTypeId = val.id + console.log('当前点击行的值',val) + this.relaId = val.id this.checkList = "" - let arr = [] - for(let key in JSON.parse(val.dataField)){ - arr.push({ - key, - keyName: JSON.parse(val.dataField)[key] - }) - } - this.detailData = { - name: val.monitorTypeName, - // '否':'是' - status: val.alarmType == 1 ? this.$t('message.deepFoundConfig.no'):this.$t('message.deepFoundConfig.yes'), - tableHeader: arr - } + // let arr = [] + // for(let key in JSON.parse(val.dataField)){ + // arr.push({ + // key, + // keyName: JSON.parse(val.dataField)[key] + // }) + // } + // this.detailData = { + // name: val.monitorTypeName, + // // '否':'是' + // status: val.alarmType == 1 ? this.$t('message.deepFoundConfig.no'):this.$t('message.deepFoundConfig.yes'), + // tableHeader: arr + // } let nowTime = this.selectNowDate() this.dateTime = [nowTime.split(' ')[0] + ' ' + '00:00:00',nowTime] // this.queryByIdDeepExcavationMonitorType(val.id)