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

Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/dhp/zhgdyun into dev-xiaomi

Browse Source
This commit is contained in:
Luck-Xiaomi 2022-08-26 18:02:21 +08:00
commit 35f8f8a016
5 changed files with 2216 additions and 1975 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

2
src/assets/js/api/deepFoundationPitManage.js
View File

@ -14,7 +14,7 @@ export const selectMeasurePointListApi = data => post('xmgl/deepExcavationMeasur
export const addDeepExcavationMeasurePointApi = data => post('xmgl/deepExcavationMeasurePoint/add', data); //添加深基坑-测点信息
export const deleteDeepExcavationMeasurePointApi = data => post('xmgl/deepExcavationMeasurePoint/delete', data); //删除深基坑-测点信息
export const getDetailDeepExcavationApi = data => get('/xmgl/deepExcavationMeasurePoint/getDetailsByMeasurePointNumber', data); //测点信息-测点管理-详情
export const getSensorListApi = data => post('/xmgl/deepExcavationSensor/getSensorListByMeasurePointNumber', data); //通过测点编号查询传感器列表
export const getSensorListApi = data => get('/xmgl/deepExcavationSensor/getSensorListByMeasurePointNumber', data); //通过测点编号查询传感器列表
export const selectDeepExcavationSensorTypeListApi = data => post('xmgl/deepExcavationSensorType/selectDeepExcavationSensorTypeList', data); //列表查询深基坑-传感器类型信息

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

@ -479,7 +479,7 @@
<!-- 报警状态 -->
<el-table-column :label="$t('message.deepFoundConfig.alarmStatus')">
<template slot-scope="scope">
<span
<!-- <span
:class="{'alarm_status1': scope.row.alarmState == '0',
'alarm_status2': scope.row.alarmState == 2,
'alarm_status3': scope.row.alarmState == 1,
@ -489,6 +489,17 @@
? $t('message.deepFoundConfig.warning'):scope.row.alarmState == 1
? $t('message.deepFoundConfig.alarm'):scope.row.alarmState == 3
? $t('message.deepFoundConfig.control'):""}}
</span> -->
<span
:class="{'alarm_status1': scope.row.alarmState == 1,
'alarm_status2': scope.row.alarmState == 2,
'alarm_status3': scope.row.alarmState == 3,
'alarm_status4': scope.row.alarmState == 4}"
>
{{scope.row.alarmState == 1 ? '正常': scope.row.alarmState == 2
? '超报警' :scope.row.alarmState == 3
? '超控制':scope.row.alarmState == 4
? '变化速率报警':""}}
</span>
</template>
</el-table-column>
@ -621,20 +632,20 @@
: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">
<span
:class="{'alarm_status1': scope.row.alarmState == '0',
:class="{'alarm_status1': scope.row.alarmState == 1,
'alarm_status2': scope.row.alarmState == 2,
'alarm_status3': scope.row.alarmState == 1,
'alarm_status4': scope.row.alarmState == 3}"
'alarm_status3': scope.row.alarmState == 3,
'alarm_status4': scope.row.alarmState == 4}"
>
{{scope.row.alarmState == '0' ? $t('message.deepFoundConfig.normal'): scope.row.alarmState == 2
? $t('message.deepFoundConfig.alarm'):scope.row.alarmState == 1
? $t('message.deepFoundConfig.warning'):scope.row.alarmState == 3
? $t('message.deepFoundConfig.control'):""}}
{{scope.row.alarmState == 1 ? '正常': scope.row.alarmState == 2
? '超报警' :scope.row.alarmState == 3
? '超控制':scope.row.alarmState == 4
? '变化速率报警':""}}
</span>
</template>
</el-table-column>
@ -919,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
@ -1177,24 +1193,24 @@ export default {
formTitle: "",
innerVisible: false,
dialogImageUrl: "",
safeLvList: [
{
label: "一级",
value: 1
},
{
label: "二级",
value: 2
},
{
label: "三级",
value: 3
},
{
label: "四级",
value: 4
}
],
// safeLvList: [
// {
// label: "一级",
// value: 1
// },
// {
// label: "二级",
// value: 2
// },
// {
// label: "三级",
// value: 3
// },
// {
// label: "四级",
// value: 4
// }
// ],
rules: {
engineeringName: [
{ required: true, message: "请输入基坑名称", trigger: "blur" }
@ -1511,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;
@ -2113,7 +2131,7 @@ export default {
}
console.log(this.currentTableData);
}
let nowTime = this.selectNowDate();
// let nowTime = this.selectNowDate();
// this.acquisitionTime = [nowTime.split(' ')[0] + ' ' + '00:00:00',nowTime]
this.selectDeepExcavationCurrentData();
this.showActiveDetail = true;
@ -2511,26 +2529,26 @@ export default {
}
.alarm_status1 {
padding: 4px 6px;
background: #44d7b6;
color: #fefefe;
// background: #44d7b6;
color: #44d7b6;
border-radius: 3px;
}
.alarm_status2 {
padding: 4px 6px;
background: #7953f6;
color: #fefefe;
// background: #7953f6;
color: #f76462;
border-radius: 3px;
}
.alarm_status3 {
padding: 4px 6px;
background: #f67f52;
color: #fefefe;
// background: #f67f52;
color: #f76462;
border-radius: 3px;
}
.alarm_status4 {
padding: 4px 6px;
background: #5484f6;
color: #fefefe;
// background: #5484f6;
color: #f76462;
border-radius: 3px;
}
.formBox {

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

File diff suppressed because it is too large Load Diff