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

深基坑系统(基坑配置):查询图表bug修复

Browse Source
This commit is contained in:
骆乐 2022-08-27 10:35:02 +08:00
parent 248b54a115
commit 9d3106c02f
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
dist.zip
View File

Binary file not shown.

37
src/views/projectFront/deepFoundationPitManage/monitorData.vue
View File

@ -152,11 +152,11 @@
</div> </div>
<vue-scroll style="height: 200px"> <vue-scroll style="height: 200px">
<div class="point-content"> <div class="point-content">
<div v-for="(item2,index2) in item.sensorlist" :key="index2"> <div v-for="(item2,index2) in item.sensorlist" :key="index2">
<p>传感器编号：{{item2.sensorSn}}</p> <p>传感器编号：{{item2.sensorSn}}</p>
<p>传感器类型：{{item2.sensorTypeName == null ? '无' : item2.sensorTypeName }}</p> <p>传感器类型：{{item2.sensorTypeName == null ? '无' : item2.sensorTypeName }}</p>
<p>采集时间：{{item2.receiveTime == null ? '无' : item2.receiveTime}}</p> <p>采集时间：{{item2.receiveTime == null ? '无' : item2.receiveTime}}</p>
</div> </div>
<!-- 检测类型 --> <!-- 检测类型 -->
<!-- <p>{{$t('message.deepFoundConfig.detectionType')}}：{{item.monitorTypeName}}</p> <!-- <p>{{$t('message.deepFoundConfig.detectionType')}}：{{item.monitorTypeName}}</p>
<p <p
@ -693,7 +693,9 @@ export default {
this.echartData7.data.push(item.data); this.echartData7.data.push(item.data);
}); });
// console.log('图标的值',this.echartData7) // console.log('图标的值',this.echartData7)
this.createdEchart7(); this.$nextTick(() => {
this.createdEchart7();
});
} }
}); });
}, },
@ -712,10 +714,12 @@ export default {
}); });
this.detailData.point = arr.join("，"); this.detailData.point = arr.join("，");
console.log("this.detailData.point", this.detailData.point); console.log("this.detailData.point", this.detailData.point);
// 第一次进入默认选择第一个
if (res.result.length > 0) { if (res.result.length > 0) {
this.checkList = res.result[0].measurePointNumber; this.checkList = res.result[0].measurePointNumber;
this.checkNum(this.checkList);
} }
this.selectDeepExcavationCurrentDataList(); // this.selectDeepExcavationCurrentDataList();
} }
}); });
}, },
@ -1495,6 +1499,7 @@ export default {
chart6.setOption(this.option6); chart6.setOption(this.option6);
}, },
createdEchart7() { createdEchart7() {
if(this.tableData2.length != 0){
let chart7 = echarts.init(this.$refs["echart7"]); let chart7 = echarts.init(this.$refs["echart7"]);
this.chart7 = chart7; this.chart7 = chart7;
chart7.clear(); chart7.clear();
@ -1606,6 +1611,7 @@ export default {
] ]
}; };
chart7.setOption(this.option7); chart7.setOption(this.option7);
}
}, },
// 获取当前时间 返回YYYY-MM-DD HH:mm:ss // 获取当前时间 返回YYYY-MM-DD HH:mm:ss
selectNowDate() { selectNowDate() {
@ -1638,7 +1644,7 @@ export default {
}, },
showDetail(val) { showDetail(val) {
this.visibleDialog = true; this.visibleDialog = true;
console.log("当前点击行的值", val); // console.log("当前点击行的值", val);
this.relaId = val.id; this.relaId = val.id;
this.checkList = ""; this.checkList = "";
this.checkList2 = ""; this.checkList2 = "";
@ -1730,23 +1736,23 @@ export default {
this.type = val.id; this.type = val.id;
// this.createdEchart7() // this.createdEchart7()
}, },
// 第一个选择
checkNum(val) { checkNum(val) {
this.firstSelect = val; this.firstSelect = val;
// console.log("当前选择", val); // console.log("第一个选择", val);
getSensorListApi({ measurePointNumber: this.firstSelect }).then(res => { getSensorListApi({ measurePointNumber: this.firstSelect }).then(res => {
if (res.code == 200 && res.result) { if (res.code == 200 && res.result) {
// console.log("---------", res);
this.getSensorList = res.result; this.getSensorList = res.result;
if (this.getSensorList.length != 0) { if (this.getSensorList.length != 0) {
this.checkList2 = this.getSensorList[0].sensorSn; this.checkList2 = this.getSensorList[0].sensorSn;
this.getEchartsData(this.checkList2); this.getEchartsData(this.checkList2);
} }
} }
}); });
}, },
// 第二个选择
getEchartsData(val) { getEchartsData(val) {
console.log("第二个选择", val); // console.log("第二个选择", val);
selectDeepExcavationCurrentDataListApi({ selectDeepExcavationCurrentDataListApi({
measurePointNumber: this.checkList, measurePointNumber: this.checkList,
relaId: this.relaId, relaId: this.relaId,
@ -1757,7 +1763,6 @@ export default {
}).then(res => { }).then(res => {
// console.log("有数据吗", res); // console.log("有数据吗", res);
if (res.code == 200 && res.result) { if (res.code == 200 && res.result) {
// console.log('下面的数据',res)
this.tableData2 = res.result.data.records; this.tableData2 = res.result.data.records;
this.echartData7 = { this.echartData7 = {
xAxis: [], xAxis: [],
@ -1772,7 +1777,9 @@ export default {
this.echartData7.xAxis.push(item.receiveTime.split(" ")[0]); this.echartData7.xAxis.push(item.receiveTime.split(" ")[0]);
this.echartData7.data.push(item.data); this.echartData7.data.push(item.data);
}); });
this.createdEchart7(); this.$nextTick(() => {
this.createdEchart7();
});
} }
}); });
}, },