admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

深基坑系统(基坑配置)：实时数据渲染 接口对接

Browse Source
This commit is contained in:
骆乐 2022-08-22 11:45:21 +08:00
parent 722e32f0a8
commit 5c1f3e3c32
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/views/projectFront/deepFoundationPitManage/dataConfig.vue
View File

@ -418,6 +418,7 @@
end-placeholder="结束日期"
:picker-options="pickerOptions">
</el-date-picker> -->
<!-- :default-time="['00:00:00', '23:59:59']" -->
<el-date-picker
v-model="acquisitionTime"
type="datetimerange"
@ -425,8 +426,6 @@
:range-separator="$t('message.deepFoundConfig.to')"
:start-placeholder="$t('message.deepFoundConfig.startTime')"
:end-placeholder="$t('message.deepFoundConfig.endTime')"
:default-time="['00:00:00', '23:59:59']"
:clearable="false"
align="right">
</el-date-picker>
</div>
@ -435,7 +434,12 @@
</div>
<el-table :data="currentPointDetail" class="tables" height="560">
<!-- 测点编号 -->
<el-table-column prop="measuringPointSn" :label="$t('message.deepFoundConfig.pointNo')"></el-table-column>
<el-table-column prop="measurePointNumber" :label="$t('message.deepFoundConfig.pointNo')"></el-table-column>
<!-- 测点名称 -->
<el-table-column prop="measurePointName" label="测点名称"></el-table-column>
<el-table-column prop="sensorSn" label="传感器编号"></el-table-column>
<el-table-column prop="sensorTypeName" label="传感器类型"></el-table-column>
<el-table-column prop="data" label="值"></el-table-column>
<el-table-column v-for="(item,index) in currentTableData" :key="index" :prop="item.targetField" :label="item.targetName"></el-table-column>
<!-- 采集时间 -->
<el-table-column prop="receiveTime" :label="$t('message.deepFoundConfig.gatherTime')"></el-table-column>
@ -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,
}