From c756e1978ac19b0f789a952b73ed27a2e3a2e015 Mon Sep 17 00:00:00 2001
From: 25604 <ljf25604@163.com>
Date: Tue, 3 Mar 2026 15:59:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BC=A0=E6=84=9F=E5=99=A8?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/hotWater/waterControl/index.vue | 139 +++++++++++++++++++++-
 1 file changed, 137 insertions(+), 2 deletions(-)

diff --git a/src/views/hotWater/waterControl/index.vue b/src/views/hotWater/waterControl/index.vue
index 066d5ca..0c4339b 100644
--- a/src/views/hotWater/waterControl/index.vue
+++ b/src/views/hotWater/waterControl/index.vue
@@ -706,6 +706,115 @@
                 </div> -->
               </div>
             </div>
+            <!-- 传感器参数设置 -->
+            <div class="monitor-flex-left" v-if="activeName === '传感器参数设置'">
+              <div class="control-bottom">
+                <div class="words-li words-li4">
+                  <div class="ash">上限:</div>
+                  <el-input
+                    v-model="item.engineeringMaxValue"
+                    size="mini"
+                    placeholder="请输入"
+                    @keyup.enter.native="
+                      handleEnter(
+                        item,
+                        item.engineeringMaxValue,
+                        item.engineeringMaxValueId,
+                        '上限',
+                        ''
+                      )
+                    "
+                    @input="handleInput(item)"
+                    @blur="handleBlur()"
+                  ></el-input>
+                </div>
+                <div class="words-li words-li4">
+                  <div class="ash">下限:</div>
+                  <el-input
+                    v-model="item.engineeringMinValue"
+                    size="mini"
+                    placeholder="请输入"
+                    @keyup.enter.native="
+                      handleEnter(
+                        item,
+                        item.engineeringMinValue,
+                        item.engineeringMinValueId,
+                        '下限',
+                        ''
+                      )
+                    "
+                    @input="handleInput(item)"
+                    @blur="handleBlur()"
+                  ></el-input>
+                </div>
+                <div class="words-li words-li4">
+                  <div class="ash">数字量上限:</div>
+                  <el-input
+                    v-model="item.digitalMaxValue"
+                    size="mini"
+                    placeholder="请输入"
+                    @keyup.enter.native="
+                      handleEnter(
+                        item,
+                        item.digitalMaxValue,
+                        item.digitalMaxValueId,
+                        '数字量上限',
+                        ''
+                      )
+                    "
+                    @input="handleInput(item)"
+                    @blur="handleBlur()"
+                  ></el-input>
+                </div>
+                <div class="words-li words-li4">
+                  <div class="ash">数字量下限:</div>
+                  <el-input
+                    v-model="item.digitalMinValue"
+                    size="mini"
+                    placeholder="请输入"
+                    @keyup.enter.native="
+                      handleEnter(
+                        item,
+                        item.digitalMinValue,
+                        item.digitalMinValueId,
+                        '数字量下限',
+                        ''
+                      )
+                    "
+                    @input="handleInput(item)"
+                    @blur="handleBlur()"
+                  ></el-input>
+                </div>
+                <div class="words-li words-li4">
+                  <div class="ash">校准值:</div>
+                  <el-input
+                    v-model="item.calibrationValue"
+                    size="mini"
+                    placeholder="请输入"
+                    @keyup.enter.native="
+                      handleEnter(
+                        item,
+                        item.calibrationValue,
+                        item.calibrationValueId,
+                        '校准值',
+                        ''
+                      )
+                    "
+                    @input="handleInput(item)"
+                    @blur="handleBlur()"
+                  ></el-input>
+                </div>
+                <div class="words-li words-li4">
+                  <div class="ash">当前值:</div>
+                  <div class="white">
+                    <span v-if="item.name.includes('温度')">{{ item.temp }}℃</span>
+                    <span v-else-if="item.name.includes('压力')">{{ item.pressure }}bar</span>
+                    <span v-else-if="item.name.includes('液位')">{{ item.waterLevel }}%</span>
+                    <span v-else>{{ item.temp }}</span>
+                  </div>
+                </div>
+              </div>
+            </div>
           </div>
         </div>
       </div>
@@ -915,6 +1024,19 @@ export default {
                 Number(item.handAutomaticSwitch) == 1 ? false : true, //手自动状态
               openSwitch: Number(item.openSwitch) == 0 ? false : true, //一键启动
               closeSwitch: Number(item.closeSwitch) == 0 ? false : true, //一键停止
+              // 传感器参数设置相关字段，确保初始化
+              engineeringMaxValue: item.engineeringMaxValue || '',
+              engineeringMaxValueId: item.engineeringMaxValueId || '',
+              engineeringMinValue: item.engineeringMinValue || '',
+              engineeringMinValueId: item.engineeringMinValueId || '',
+              digitalMaxValue: item.digitalMaxValue || '',
+              digitalMaxValueId: item.digitalMaxValueId || '',
+              digitalMinValue: item.digitalMinValue || '',
+              digitalMinValueId: item.digitalMinValueId || '',
+              calibrationValue: item.calibrationValue || '',
+              calibrationValueId: item.calibrationValueId || '',
+              middleValue: item.middleValue || '',
+              middleValueId: item.middleValueId || '',
             };
             // 将处理后的对象添加到 devicesList 中
             this.devicesList.push(deviceItem);
@@ -983,6 +1105,19 @@ export default {
                         Number(item.handAutomaticSwitch) == 0 ? false : true, //手自动状态
                       openSwitch: Number(item.openSwitch) == 0 ? false : true, //一键启动
                       closeSwitch: Number(item.closeSwitch) == 0 ? false : true, //一键停止
+                      // 传感器参数设置相关字段，确保初始化
+                      engineeringMaxValue: item.engineeringMaxValue || '',
+                      engineeringMaxValueId: item.engineeringMaxValueId || '',
+                      engineeringMinValue: item.engineeringMinValue || '',
+                      engineeringMinValueId: item.engineeringMinValueId || '',
+                      digitalMaxValue: item.digitalMaxValue || '',
+                      digitalMaxValueId: item.digitalMaxValueId || '',
+                      digitalMinValue: item.digitalMinValue || '',
+                      digitalMinValueId: item.digitalMinValueId || '',
+                      calibrationValue: item.calibrationValue || '',
+                      calibrationValueId: item.calibrationValueId || '',
+                      middleValue: item.middleValue || '',
+                      middleValueId: item.middleValueId || '',
                     };
                     // 将处理后的对象添加到 devicesList 中
                     this.devicesList.push(deviceItem);
@@ -1456,9 +1591,9 @@ export default {
               width: 36%;
             }
             .words-li4 {
-              width: 60%;
+              width: 45%;
               .ash {
-                width: 130px;
+                width: 80px;
               }
             }
             .words-li5 {