深基坑(测点管理):告警信息项目监测列表更改
This commit is contained in:
parent
d6b32f7211
commit
347c69a252
@ -51,11 +51,11 @@ export default {
|
||||
color: #c5c7cc;
|
||||
.num1 {
|
||||
position: absolute;
|
||||
top: 46%;
|
||||
top: 45%;
|
||||
left: 43%;
|
||||
}
|
||||
.text {
|
||||
margin-top: 10%;
|
||||
margin-top: 5%;
|
||||
font-size: 14px;
|
||||
width: 100%;
|
||||
text-align: center;
|
||||
|
||||
@ -267,7 +267,11 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- 警情 -->
|
||||
<el-table-column :label="$t('message.deepFoundConfig.sirens')">
|
||||
<el-table-column
|
||||
:label="$t('message.deepFoundConfig.sirens')"
|
||||
align="center"
|
||||
width="60"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<!-- '报警':'正常' -->
|
||||
<span>{{scope.row.alarmType == 1? $t('message.deepFoundConfig.alarm'):$t('message.deepFoundConfig.normal')}}</span>
|
||||
@ -277,14 +281,20 @@
|
||||
<el-table-column
|
||||
prop="measurePointNum"
|
||||
:label="$t('message.deepFoundConfig.pointCount')"
|
||||
align="center"
|
||||
width="100"
|
||||
></el-table-column>
|
||||
<!-- 近7天预警数 -->
|
||||
<!-- 近七天超控制数 -->
|
||||
<el-table-column
|
||||
prop="warningNum"
|
||||
:label="$t('message.deepFoundConfig.warningNum7')"
|
||||
prop="superControlNumber"
|
||||
width="130"
|
||||
label="近七天超控制数"
|
||||
align="center"
|
||||
></el-table-column>
|
||||
<!-- 近7天报警数 -->
|
||||
<el-table-column prop="alarmNum" :label="$t('message.deepFoundConfig.alarmNum7')"></el-table-column>
|
||||
<!-- 近七天超报警数 -->
|
||||
<el-table-column prop="superAlarmNumber" label="近七天超报警数" width="130" align="center"></el-table-column>
|
||||
<!-- 近7天超速率数 -->
|
||||
<el-table-column prop="rateAlarmNumber" width="130" align="center" label="近7天超速率数"></el-table-column>
|
||||
</el-table>
|
||||
<!-- <el-pagination
|
||||
class="pagerBox"
|
||||
@ -573,7 +583,8 @@ export default {
|
||||
option1: {},
|
||||
echartData: [
|
||||
{ value: 0, name: "超出控制值" },
|
||||
{ value: 0, name: "超出报警值" }
|
||||
{ value: 0, name: "超出报警值" },
|
||||
{ value: 0, name: "超出速率值" }
|
||||
],
|
||||
chart2: Object,
|
||||
option2: {},
|
||||
@ -804,12 +815,16 @@ export default {
|
||||
if (res.code == 200 && res.result) {
|
||||
this.echartData[0].value = 0;
|
||||
this.echartData[1].value = 0;
|
||||
this.echartData[2].value = 0;
|
||||
res.result.forEach(item => {
|
||||
this.echartData[0].value += item.controlNum;
|
||||
this.echartData[1].value += item.alarmNum;
|
||||
this.echartData[0].value += item.superControlNumber; // 超控制
|
||||
this.echartData[1].value += item.superAlarmNumber; // 超报警
|
||||
this.echartData[2].value += item.rateAlarmNumber; // 超速率
|
||||
});
|
||||
this.echartDataTotal =
|
||||
this.echartData[0].value + this.echartData[1].value;
|
||||
this.echartData[0].value +
|
||||
this.echartData[1].value +
|
||||
this.echartData[2].value;
|
||||
}
|
||||
this.createdEchart1();
|
||||
});
|
||||
@ -980,6 +995,11 @@ export default {
|
||||
// 超出报警值
|
||||
name: this.$t("message.deepFoundConfig.overAlarmNum"),
|
||||
icon: "circle"
|
||||
},
|
||||
{
|
||||
// 超出速率值
|
||||
name: "超出速率值",
|
||||
icon: "circle"
|
||||
}
|
||||
],
|
||||
formatter: name => {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user