Browse Source

1、热泵显示设定温度整数,也只能输入整数;

2、循环泵添加本地远程信号;
3、传感器参数设置去掉数字量上下限;

Co-authored-by: Copilot <copilot@github.com>
dev
3067418132@qq.com 3 weeks ago
parent
commit
49eca822b2
  1. 29
      src/views/hotWater/waterControl/index.vue

29
src/views/hotWater/waterControl/index.vue

@ -72,7 +72,7 @@
<div class="words-li"> <div class="words-li">
<div class="ash">设定温度:</div> <div class="ash">设定温度:</div>
<div class="white"> <div class="white">
<el-input size="mini" v-model="item.tempSet" placeholder="请输入" @keyup.enter.native=" <el-input size="mini" v-model="item.tempSet" placeholder="请输入" step="1" @keyup.enter.native="
handleEnter( handleEnter(
item, item,
item.tempSet, item.tempSet,
@ -80,7 +80,7 @@
'设定温度', '设定温度',
'℃' '℃'
) )
" @input="handleInput(item)" @blur="handleBlur()"></el-input> " @input="handleInputInt(item)" @blur="handleBlur()"></el-input>
</div> </div>
</div> </div>
</div> </div>
@ -133,6 +133,14 @@
<div class="white">{{ item.runningTime }}</div> <div class="white">{{ item.runningTime }}</div>
<div class="white">小时</div> <div class="white">小时</div>
</div> </div>
<div class="words-li">
<div class="ash">本地远程信号:</div>
<el-tag size="mini" v-if="item.localRemoteStatus === '远程'" type="success">{{ item.localRemoteStatus
}}</el-tag>
<el-tag size="mini" v-else type="danger">{{
item.localRemoteStatus
}}</el-tag>
</div>
</div> </div>
</div> </div>
<!-- 裙楼供水泵高区供水泵中厨供水泵 --> <!-- 裙楼供水泵高区供水泵中厨供水泵 -->
@ -650,7 +658,7 @@
<div class="white" v-else-if="item.name.includes('压力')">bar</div> <div class="white" v-else-if="item.name.includes('压力')">bar</div>
<div class="white" v-else-if="item.name.includes('液位')"></div> <div class="white" v-else-if="item.name.includes('液位')"></div>
</div> </div>
<div class="words-li words-li4"> <!-- <div class="words-li words-li4">
<div class="ash">数字上限:</div> <div class="ash">数字上限:</div>
<el-input v-model="item.digitalMaxValue" size="mini" placeholder="请输入" @keyup.enter.native=" <el-input v-model="item.digitalMaxValue" size="mini" placeholder="请输入" @keyup.enter.native="
handleEnter( handleEnter(
@ -673,7 +681,7 @@
'' ''
) )
" @input="handleInput(item)" @blur="handleBlur()"></el-input> " @input="handleInput(item)" @blur="handleBlur()"></el-input>
</div> </div> -->
<div class="words-li words-li4"> <div class="words-li words-li4">
<div class="ash">设定上限值:</div> <div class="ash">设定上限值:</div>
<el-input <el-input
@ -984,8 +992,13 @@ export default {
// deviceItem // deviceItem
let deviceItem = { let deviceItem = {
...item, ...item,
tempSet:
(this.activeName.includes('热泵') && item.tempSet)
? Math.round(Number(item.tempSet))
: item.tempSet || '',
waterLevel: Number(item.waterLevel), waterLevel: Number(item.waterLevel),
runningStatus: Number(item.runningStatus) === 0 ? "停止" : "运行", // runningStatus: Number(item.runningStatus) === 0 ? "停止" : "运行", //
localRemoteStatus: Number(item.localRemoteStatus) == 0 ? "远程" : "本地", ///
hotPumpStatus: hotPumpStatus:
Number(item.switchStatus) === 0 Number(item.switchStatus) === 0
? false ? false
@ -1063,8 +1076,13 @@ export default {
// deviceItem // deviceItem
let deviceItem = { let deviceItem = {
...item, ...item,
tempSet:
(this.activeName.includes('热泵') && item.tempSet)
? Math.round(Number(item.tempSet))
: item.tempSet || '',
waterLevel: Number(item.waterLevel), waterLevel: Number(item.waterLevel),
runningStatus: Number(item.runningStatus) === 0 ? "停止" : "运行", // runningStatus: Number(item.runningStatus) === 0 ? "停止" : "运行", //
localRemoteStatus: Number(item.localRemoteStatus) === 0 ? "远程" : "本地", //
hotPumpStatus: hotPumpStatus:
Number(item.switchStatus) === 0 Number(item.switchStatus) === 0
? false ? false
@ -1311,6 +1329,9 @@ export default {
item.tempSet = parts[0] + "." + parts[1].slice(0, 2); item.tempSet = parts[0] + "." + parts[1].slice(0, 2);
} }
}, },
handleInputInt(item) {
item.tempSet = String(item.tempSet).replace(/[^\d]/g, "");
},
handleWaterInput(item) { handleWaterInput(item) {
item.waterLevelSet = String(item.waterLevelSet).replace(/[^\d.]/g, ""); item.waterLevelSet = String(item.waterLevelSet).replace(/[^\d.]/g, "");
// //

Loading…
Cancel
Save