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

深基坑实时数据以及项目监测处理

Browse Source
This commit is contained in:
骆乐 2022-10-09 17:57:11 +08:00
parent d61deafbf8
commit f6180c2729
6 changed files with 95 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
dist.zip
View File

Binary file not shown.

4
src/assets/js/http.js
View File

@ -41,7 +41,7 @@ if (process.env.NODE_ENV == 'development') {
// tag: 本地
// axios.defaults.baseURL = 'http://192.168.34.174:6023/' // 老大本地
// axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地
// axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地
// axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
// axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
// axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上
@ -50,7 +50,7 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL = 'http://47.97.202.104:6023/';
// axios.defaults.baseURL = 'http://139.9.66.234:8/';
// axios.defaults.baseURL = 'http://120.196.217.6:7000/'; // 鹤洲
// axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西
axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西
// axios.defaults.baseURL = 'http://120.196.217.6:7000/' //鹤洲
// axios.defaults.baseURL = 'http://117.156.17.59:9090/'; //

7
src/views/home/login_v1.vue
View File

@ -326,6 +326,13 @@ export default {
window._paq.push(["trackEvent", "点击", "登录", "使用账号登录"]);
}
},
// form:{
// immediate: true,
// deep: true,
// handler(newVal,oldVal){
// }
// }
},
created() {
this.company = COMPANY;

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

@ -1769,7 +1769,8 @@ export default {
data.startTime = this.acquisitionTime != "" ? this.acquisitionTime[0] : "",
data.endTime = this.acquisitionTime != "" ? this.acquisitionTime[1] : "",
data.pageNo = this.pagInfo2.pageNo,
data.pageSize = this.pagInfo2.pageSize
data.pageSize = this.pagInfo2.pageSize,
data.relaId = this.relaId
selectDeepExcavationCurrentDataListApi(data).then(res => {
console.log(res);
if (res.code == 200) {

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

@ -620,10 +620,10 @@ export default {
option7: {},
pageNo1: 1,
pageSize1: 10,
total1: 6,
total1: 0,
pageNo: 1,
pageSize: 10,
total: 6,
total: 0,
visibleDialog: false,
navList: [
{
@ -670,7 +670,7 @@ export default {
echartData7: {
xAxis: [],
data: [],
unit: ""
unit: 'mm'
}
};
},
@ -690,35 +690,31 @@ export default {
},
methods: {
// 查询实时数据
selectDeepExcavationCurrentDataList() {
selectDeepExcavationCurrentDataList(val) {
console.log('默认第一次带sn了吗',this.checkList2)
selectDeepExcavationCurrentDataListApi({
measurePointNumber: this.checkList,
relaId: this.relaId,
projectSn: this.projectSn,
sensorSn: this.checkList2 ,
sensorSn: val ,
startTime: this.dateTime != null ? this.dateTime[0] : "",
endTime: this.dateTime != null ? this.dateTime[1] : ""
endTime: this.dateTime != null ? this.dateTime[1] : "",
pageNo:this.pageNo1,
pageSize:this.pageSize1,
}).then(res => {
// console.log("有数据吗有数据吗", res);
this.echartData7.unit = res.result.unit;
console.log("默认第一次进来的时候单位", this.echartData7.unit)
if (res.code == 200 && res.result) {
// console.log('下面的数据',res)
this.total1 = res.result.data.total
this.tableData2 = res.result.data.records;
this.echartData7 = {
xAxis: [],
data: []
};
// this.detailData.tableHeader.forEach(item => {
// if (item.key == "data") {
// this.echartData7.unit = "(" + item.keyName.split("(")[1];
// }
// });
this.echartData7.unit = res.result.unit
res.result.data.records.forEach(item => {
this.echartData7.xAxis.unshift(item.receiveTime);
this.echartData7.data.push(item.data);
this.echartData7.data.unshift(item.data);
});
// console.log('图标的值',this.echartData7)
this.$nextTick(() => {
this.createdEchart7();
});
@ -731,7 +727,7 @@ export default {
deepExcavationId: this.deepExcavation,
relaId: this.relaId
}).then(res => {
console.log("列表查询测点", res);
console.log("查询到测点名称", res);
if (res.code == 200 && res.result) {
this.options = res.result;
let arr = [];
@ -745,7 +741,6 @@ export default {
this.checkList = res.result[0].measurePointNumber;
this.checkNum(this.checkList);
}
// this.selectDeepExcavationCurrentDataList();
}
});
},
@ -1360,25 +1355,25 @@ export default {
};
chart4.setOption(this.option4);
},
handleSizeChange(val) {
this.pageSize = val;
// this.selectDeepExcavationMonitorTypeList()
console.log(val);
},
handleCurrentChange(val) {
this.pageNo = val;
// this.selectDeepExcavationMonitorTypeList()
console.log(val);
},
// handleSizeChange(val) {
// this.pageSize = val;
// this.selectDeepExcavationMonitorTypeList()
// console.log(val);
// },
// handleCurrentChange(val) {
// this.pageNo = val;
// this.selectDeepExcavationMonitorTypeList()
// console.log(val);
// },
handleSizeChange1(val) {
this.pageSize1 = val;
this.selectDeepExcavationAllMeasurePointList()
console.log(val);
console.log('分页',val);
this.selectDeepExcavationCurrentDataList(this.checkList2);
},
handleCurrentChange1(val) {
this.pageNo1 = val;
this.selectDeepExcavationAllMeasurePointList()
console.log(val);
console.log('分页分页',val);
this.selectDeepExcavationCurrentDataList(this.checkList2);
},
createdEchart5() {
// console.log(this.$refs['echart5'])
@ -1547,8 +1542,20 @@ export default {
chart7.clear();
this.option7 = {
tooltip: {
trigger: "axis"
trigger: "axis",
position: function (pt) {
return [pt[0], '10%'];
}
},
toolbox: {
feature: {
dataZoom: {
yAxisIndex: 'none'
},
restore: {},
saveAsImage: {}
}
},
legend: {
show: false
},
@ -1556,7 +1563,7 @@ export default {
top: "30px",
left: "60px",
right: "35px",
bottom: "30px"
bottom: "50px"
},
xAxis: {
type: "category",
@ -1577,8 +1584,9 @@ export default {
},
yAxis: {
type: "value",
// name: this.echartData7.unit,
name:`${'单位/'} ${this.echartData7.unit }`,
name:'单位/mm',
// name:`${'单位/'} ${this.echartData7.unit }`,
boundaryGap: [0, '100%'],
splitLine: {
lineStyle: {
color: "#F4F5F8",
@ -1595,6 +1603,18 @@ export default {
color: "#7F8694"
}
},
dataZoom: [
{
type: 'inside',
start: 0,
end: 20
},
{
start: 0,
end: 20,
top:"90%",
}
],
axisPointer: {
lineStyle: {
color: "#F4F5F8",
@ -1687,35 +1707,18 @@ export default {
return timer;
},
showDetail(val) {
// console.log('当前点击的详情',val)
this.dateTime = []
this.pageSize1= 10,
this.pageNo= 1,
this.visibleDialog = true;
// console.log("当前点击行的值", val);
this.relaId = val.id;
this.checkList = "";
this.checkList2 = "";
// 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)
this.selectDeepExcavationAllMeasurePointList();
this.$nextTick(() => {
// this.createdEchart5()
// this.createdEchart6()
this.createdEchart7();
});
this.selectDeepExcavationAllMeasurePointList(); // 获取测点名称
// this.$nextTick(() => {
// // this.createdEchart5()
// // this.createdEchart6()
// this.createdEchart7();
// });
},
checkDate(val) {
this.searchDate = val;
@ -1787,27 +1790,34 @@ export default {
// console.log("第一个选择", val);
getSensorListApi({ measurePointNumber: this.firstSelect }).then(res => {
if (res.code == 200 && res.result) {
// console.log('第二个选择的列表',res.result)
this.getSensorList = res.result;
console.log('====第一个选择调用的事件', res.result)
if (this.getSensorList.length != 0) {
this.checkList2 = this.getSensorList[0].sensorSn;
console.log('=====',this.checkList2 )
this.getEchartsData(this.checkList2);
// console.log('传感器编号',this.checkList2)
this.selectDeepExcavationCurrentDataList(this.checkList2) //默认第一次进来时带传感器编号获取实时数据
this.getEchartsData()
this.$nextTick(()=>{
this.createdEchart7()
})
}
}
});
},
// 第二个选择
getEchartsData(val) {
getEchartsData() {
selectDeepExcavationCurrentDataListApi({
measurePointNumber: this.checkList,
relaId: this.relaId,
sensorSn: val ,
sensorSn: this.checkList2 ,
projectSn: this.projectSn,
startTime: this.dateTime != null ? this.dateTime[0] : "",
endTime: this.dateTime != null ? this.dateTime[1] : ""
endTime: this.dateTime != null ? this.dateTime[1] : "",
pageNo:this.pageNo1,
pageSize:this.pageSize1,
}).then(res => {
console.log("有数据吗", res.result);
// this.echartData7.unit = res.result.unit
console.log('第二个选择时的单位',this.echartData7.unit)
if (res.code == 200 && res.result) {
this.total1 = res.result.data.total
this.tableData2 = res.result.data.records;
@ -1815,34 +1825,31 @@ export default {
xAxis: [],
data: []
};
// 单位
this.echartData7.unit = res.result.unit
res.result.data.records.forEach(item => {
this.echartData7.xAxis.unshift(item.receiveTime);
this.echartData7.data.push(item.data);
this.echartData7.data.unshift(item.data);
});
console.log('===========', this.echartData7.xAxis[0].split(' ')[0])
this.$nextTick(() => {
this.createdEchart7();
});
}
});
},
checkDateTime(val) {
checkDateTime() {
if (this.checkList == "" || this.checkList2 == "") {
this.$message({
message: "请先选择传感器名称和编号哦！",
type: "warning"
});
}
console.log(val);
this.selectDeepExcavationCurrentDataList();
this.selectDeepExcavationCurrentDataList(this.checkList2);
}
},
watch: {
firstSelect: {
handler(newval, oldval) {
if (newval != oldval) {
this.checkList2 = "",
this.getEchartsData();
}
},
@ -2257,7 +2264,6 @@ export default {
.search-box {
display: flex;
justify-content: space-between;
margin-bottom: 20px;
.left-nav {
display: flex;
align-items: center;
@ -2289,7 +2295,7 @@ export default {
}
#echart7 {
width: 100%;
height: 230px;
height: 235px;
}
}
.table-box {

1
src/views/projectFront/laborManage/assessmentCentent.vue
View File

@ -21,7 +21,6 @@
<el-input
v-model="seekForm.searchName"
:placeholder="
$t('message.laborMange.placeholder2') +
$t('message.laborMange.eventOrName')
"
></el-input>