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-26 09:13:33 +08:00
parent d6f574e146
commit 7d7dc1d0c3
5 changed files with 45 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
dist.zip
View File

Binary file not shown.

BIN
src/assets/images/pointl.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 624 B

8
src/store/index.js
View File

@ -45,8 +45,8 @@ export default new Vuex.Store({
// UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试
// FILEURL:'http://10.0.1.43:6023/image/',//测试
BASEURL: baseUrl ? baseUrl : window.location.protocol + '//' + window.location.host + '/', //
// UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', //
// FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口
UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', //
FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口
/* 2022-05-16 */
// tag: 部署河南项目时，需要打开这两行代码
// UPLOADURL: 'http://124.71.178.44:100/upload/image',
@ -56,8 +56,8 @@ export default new Vuex.Store({
// UPLOADURL: 'http://192.168.34.125:6023/upload/image',
// FILEURL: 'http://192.168.34.125:6023/image/',
// 邱平毅的
UPLOADURL: 'http://192.168.34.216:6023/upload/image',
FILEURL: 'http://192.168.34.216:6023/image/',
// UPLOADURL: 'http://192.168.34.216:6023/upload/image',
// FILEURL: 'http://192.168.34.216:6023/image/',
// UPLOADURL:'http://'+"61.190.32.219:9050"+'/upload/image',//正式
// FILEURL:'http://'+"61.190.32.219:9050"+'/image/',//正式

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

@ -632,7 +632,7 @@
:label="item.targetName"
></el-table-column>
<!-- 采集时间 -->
<el-table-column prop="receiveTime" :label="$t('message.deepFoundConfig.gatherTime')"></el-table-column>
<!-- <el-table-column prop="receiveTime" :label="$t('message.deepFoundConfig.gatherTime')"></el-table-column> -->
<!-- 报警状态 -->
<el-table-column :label="$t('message.deepFoundConfig.alarmStatus')">
<template slot-scope="scope">
@ -930,12 +930,17 @@
<i class="el-icon-error" @click="item.showDetail = false"></i>
<div class="point-title">{{item.measurePointName}}</div>
<div class="point-content">
<!-- <div v-for="(item2,index2) in item.detailList" :key="index2">
<p>传感器编号：{{item2.sensorSn}}</p>
<p>传感器名称：{{item2.sensorTypeName == null ? '无' : item2.sensorTypeName }}</p>
<p>采集时间：{{item2.receiveTime == null ? '无' : item2.receiveTime}}</p>
</div> -->
<p
v-for="(item2,index2) in item.detailList"
:key="index2"
>{{item2.keyName}}：{{item.currentdata[item2.key]}}</p>
<!-- 采集时间： -->
<p>{{$t('message.deepFoundConfig.gatherTime')}}：{{item.currentdata['receiveTime']}}</p>
<!-- <p>{{$t('message.deepFoundConfig.gatherTime')}}：{{item.currentdata['receiveTime']}}</p> -->
</div>
</div>
<div
@ -1522,19 +1527,21 @@ export default {
planeFigureId: val.id,
deepExcavationId: val.deepExcavationId
}).then(res => {
console.log(res);
console.log('点点点',res);
if (res.code == 200) {
res.result.forEach(item => {
item.status = "block";
(item.transform = ""), (item.showDetail = false);
let arr = [];
let obj = JSON.parse(item.dataField);
for (let key in obj) {
arr.push({
key: key,
keyName: obj[key]
});
}
// let obj = JSON.parse(item.dataField);
// let obj = item.sensorlist
// for (let key in obj) {
// arr.push({
// key: key,
// keyName: obj[key]
// });
// }
item.detailList = arr;
});
this.pointList = res.result;

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

@ -146,17 +146,23 @@
:class="{'left': item.left, 'bottom': item.bottom}"
v-show="item.isShow"
>
<div class="point-title">{{item.measurePointName}}</div>
<div class="point-title">
<p>测点编号：{{item.measurePointName }}</p>
<p>测点名称：{{ item.monitorTypeName}}</p>
</div>
<vue-scroll style="height: 200px">
<div class="point-content">
<div v-for="(item2,index2) in item.sensorlist" :key="index2">
<p>传感器编号：{{item2.sensorSn}}</p>
<p>传感器类型：{{item2.sensorTypeName == null ? '无' : item2.sensorTypeName }}</p>
<p>采集时间：{{item2.receiveTime == null ? '无' : item2.receiveTime}}</p>
</div>
<!-- 检测类型 -->
<p>{{$t('message.deepFoundConfig.detectionType')}}：{{item.monitorTypeName}}</p>
<!-- <p>{{$t('message.deepFoundConfig.detectionType')}}：{{item.monitorTypeName}}</p>
<p
v-for="(item2,index2) in item.pointData"
:key="index2"
>{{item2.label}}：{{item2.value}}</p>
<!-- 采集时间 -->
<p>{{$t('message.deepFoundConfig.gatherTime')}}：{{item.dataCreateTime}}</p>
>{{item2.label}}：{{item2.value}}</p>-->
</div>
</vue-scroll>
</div>
@ -814,19 +820,19 @@ export default {
if (res.code == 200 && res.result) {
res.result.forEach(item => {
item.isShow = false;
item.status = item.currentdata.alarmState
? item.currentdata.alarmState
: 0;
item.pointName = item.currentdata.measuringPointName;
item.dataCreateTime = item.currentdata.receiveTime;
let obj = JSON.parse(item.dataField);
// item.status = item.currentdata.alarmState
// ? item.currentdata.alarmState
// : 0;
item.pointName = item.measurePointName;
// item.dataCreateTime = item.currentdata.receiveTime;
// let obj = JSON.parse(item.dataField);
let arr = [];
for (let key in obj) {
arr.push({
value: item.currentdata[key],
label: obj[key]
});
}
// for (let key in obj) {
// arr.push({
// value: item.currentdata[key],
// label: obj[key]
// });
// }
item.pointData = arr;
});
this.pointList = res.result;
@ -1925,6 +1931,7 @@ export default {
top: 0;
left: 0;
.point-item {
background-image: url("~@/assets/images/pointl.png");
position: absolute;
span {
width: 16px;