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 | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/views/screen/temperature/monitor/index.vue b/src/views/screen/temperature/monitor/index.vue index 0ffcbff..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 + } + }) }) } @@ -173,10 +179,10 @@ <div class="item-btn"> <el-button size="large" type="success" @click="setMonitorData(item)">应用</el-button> </div> - <div class="item-error" v-if="Number(item.waterTemperature) < Number(item.lowWaterLevel) || Number(item.waterTemperature) > Number(item.tallWaterLevel)"> + <div class="item-error" v-if="[1,2].includes(item.errorType)"> <img src="@/assets/images/warning.png" alt="" /> - <div v-if="Number(item.waterTemperature) < Number(item.lowWaterLevel)">水温达到下限值</div> - <div v-else-if="Number(item.waterTemperature) > Number(item.tallWaterLevel)">水温达到上限值</div> + <div v-if="item.errorType === 1">水温达到下限值</div> + <div v-else-if="item.errorType === 2">水温达到上限值</div> </div> </div> </div> -- Gitblit v1.9.3