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

深基坑(测点管理):告警信息项目监测列表更改

Browse Source
This commit is contained in:
骆乐 2022-09-06 16:42:42 +08:00
parent d6b32f7211
commit 347c69a252
3 changed files with 143 additions and 123 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/views/projectAdmin/zjsj/carbon/leftTop.vue
View File

@ -51,11 +51,11 @@ export default {
color: #c5c7cc; color: #c5c7cc;
.num1 { .num1 {
position: absolute; position: absolute;
top: 46%; top: 45%;
left: 43%; left: 43%;
} }
.text { .text {
margin-top: 10%; margin-top: 5%;
font-size: 14px; font-size: 14px;
width: 100%; width: 100%;
text-align: center; text-align: center;

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

@ -267,7 +267,11 @@
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
<!-- '报警':'正常' --> <!-- '报警':'正常' -->
<span>{{scope.row.alarmType == 1? $t('message.deepFoundConfig.alarm'):$t('message.deepFoundConfig.normal')}}</span> <span>{{scope.row.alarmType == 1? $t('message.deepFoundConfig.alarm'):$t('message.deepFoundConfig.normal')}}</span>
@ -277,14 +281,20 @@
<el-table-column <el-table-column
prop="measurePointNum" prop="measurePointNum"
:label="$t('message.deepFoundConfig.pointCount')" :label="$t('message.deepFoundConfig.pointCount')"
align="center"
width="100"
></el-table-column> ></el-table-column>
<!-- 近7天预警数 --> <!-- 近七天超控制数 -->
<el-table-column <el-table-column
prop="warningNum" prop="superControlNumber"
:label="$t('message.deepFoundConfig.warningNum7')" width="130"
label="近七天超控制数"
align="center"
></el-table-column> ></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-table>
<!-- <el-pagination <!-- <el-pagination
class="pagerBox" class="pagerBox"
@ -573,7 +583,8 @@ export default {
option1: {}, option1: {},
echartData: [ echartData: [
{ value: 0, name: "超出控制值" }, { value: 0, name: "超出控制值" },
{ value: 0, name: "超出报警值" } { value: 0, name: "超出报警值" },
{ value: 0, name: "超出速率值" }
], ],
chart2: Object, chart2: Object,
option2: {}, option2: {},
@ -804,12 +815,16 @@ export default {
if (res.code == 200 && res.result) { if (res.code == 200 && res.result) {
this.echartData[0].value = 0; this.echartData[0].value = 0;
this.echartData[1].value = 0; this.echartData[1].value = 0;
this.echartData[2].value = 0;
res.result.forEach(item => { res.result.forEach(item => {
this.echartData[0].value += item.controlNum; this.echartData[0].value += item.superControlNumber; // 超控制
this.echartData[1].value += item.alarmNum; this.echartData[1].value += item.superAlarmNumber; // 超报警
this.echartData[2].value += item.rateAlarmNumber; // 超速率
}); });
this.echartDataTotal = this.echartDataTotal =
this.echartData[0].value + this.echartData[1].value; this.echartData[0].value +
this.echartData[1].value +
this.echartData[2].value;
} }
this.createdEchart1(); this.createdEchart1();
}); });
@ -980,6 +995,11 @@ export default {
// 超出报警值 // 超出报警值
name: this.$t("message.deepFoundConfig.overAlarmNum"), name: this.$t("message.deepFoundConfig.overAlarmNum"),
icon: "circle" icon: "circle"
},
{
// 超出速率值
name: "超出速率值",
icon: "circle"
} }
], ],
formatter: name => { formatter: name => {
@ -1499,7 +1519,7 @@ export default {
chart6.setOption(this.option6); chart6.setOption(this.option6);
}, },
createdEchart7() { createdEchart7() {
if(this.tableData2.length != 0){ 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();