From 9631059731ceb3e119101de3f7e27f6dd76da324 Mon Sep 17 00:00:00 2001
From: web <candymxq888@outlook.com>
Date: 星期三, 23 四月 2025 17:21:55 +0800
Subject: [PATCH] fix:修改水温报表，配置测试环境
---
src/views/screen/temperature/monitor/index.vue | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/src/views/screen/temperature/monitor/index.vue b/src/views/screen/temperature/monitor/index.vue
index aed73f9..1a04d92 100644
--- a/src/views/screen/temperature/monitor/index.vue
+++ b/src/views/screen/temperature/monitor/index.vue
@@ -32,7 +32,13 @@
// 获取监控点列表
const getMonitorList = () => {
pointApi().search({type: 1, page: 1, limit: 100, keywords: searchVal.value}).then(res => {
- monitorList.value = res.data.list.filter(el => el.parentId !== 0)
+ //0-未报警， 1-下限报警， 2-上限报警
+ monitorList.value = res.data.list.filter(el => el.parentId !== 0).map(item => {
+ return {
+ ...item,
+ errorType: Number(item.waterTemperature) < Number(item.lowWaterLevel) ? 1 : Number(item.waterTemperature) > Number(item.tallWaterLevel) ? 2 : 0
+ }
+ })
})
}
@@ -147,7 +153,7 @@
<el-select v-model="item.gatherIntervalTime">
<el-option :value="1" label="一分钟"/>
<el-option :value="2" label="两分钟"/>
- <el-option :value="3" label="五分钟"/>
+ <el-option :value="5" label="五分钟"/>
<el-option :value="10" label="十分钟"/>
</el-select>
</div>
@@ -156,7 +162,7 @@
<el-select v-model="item.historyIntervalTime">
<el-option :value="1" label="一分钟"/>
<el-option :value="2" label="两分钟"/>
- <el-option :value="3" label="五分钟"/>
+ <el-option :value="5" label="五分钟"/>
<el-option :value="10" label="十分钟"/>
</el-select>
</div>
@@ -165,7 +171,7 @@
<el-select v-model="item.newIntervalTime">
<el-option :value="1" label="一分钟"/>
<el-option :value="2" label="两分钟"/>
- <el-option :value="3" label="五分钟"/>
+ <el-option :value="5" label="五分钟"/>
<el-option :value="10" label="十分钟"/>
</el-select>
</div>
@@ -173,9 +179,11 @@
<div class="item-btn">
<el-button size="large" type="success" @click="setMonitorData(item)">应用</el-button>
</div>
- <!-- <div class="item-error">-->
- <!-- <img src="@/assets/images/warning.png" />-->
- <!-- </div>-->
+ <div class="item-error" v-if="[1,2].includes(item.errorType)">
+ <img src="@/assets/images/warning.png" alt="" />
+ <div v-if="item.errorType === 1">水温达到下限值</div>
+ <div v-else-if="item.errorType === 2">水温达到上限值</div>
+ </div>
</div>
</div>
</div>
@@ -297,9 +305,19 @@
width: 100%;
height: 100%;
background: rgba(0, 0, 0, 0.3);
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
img {
+ width: 70%;
+ }
+ div{
width: 100%;
+ text-align: center;
+ font-size: 3rem;
+ color: #f65252;
}
}
--
Gitblit v1.9.3