lijianfu
/
eemcs_ui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改热水监控页面弹框操作问题、循环泵管道大小

dev
selia-zx 3 weeks ago
parent
34d278afdf
commit
0aee18f999
3 changed files with 70 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      src/assets/flowimg/cycle-pipeline.gif
  2. BIN
      src/assets/flowimg/cycle-pipeline.png
  3. 88
      src/views/components/monitor/hotWaterMonitor.vue

BIN
src/assets/flowimg/cycle-pipeline.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 48 KiB

BIN
src/assets/flowimg/cycle-pipeline.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 30 KiB

88
src/views/components/monitor/hotWaterMonitor.vue
Unescape View File

@ -177,7 +177,8 @@
: require('../../../assets/flowimg/onlineweb.png') : require('../../../assets/flowimg/onlineweb.png')
" alt="" /> " alt="" />
<!-- 保温水箱2定位 --> <!-- 保温水箱2定位 -->
<img class="waterBox1" src="../../../assets/flowimg/waterBox.png" alt="" /> <img class="waterBox1" src="../../../assets/flowimg/waterBox.png"
@click="handleWaterBoxClick('主楼水箱2')" alt="" />
<!-- 温度定位2 --> <!-- 温度定位2 -->
<img class="tem1" src="../../../assets/flowimg/thermometer.png" alt="" /> <img class="tem1" src="../../../assets/flowimg/thermometer.png" alt="" />
@ -198,7 +199,8 @@
</div> </div>
<!-- 保温水箱1定位 --> <!-- 保温水箱1定位 -->
<img class="waterBox2" src="../../../assets/flowimg/waterBox.png" alt="" /> <img class="waterBox2" src="../../../assets/flowimg/waterBox.png"
@click="handleWaterBoxClick('主楼水箱1')" alt="" />
<!-- 温度定位1 --> <!-- 温度定位1 -->
<img class="tem2" src="../../../assets/flowimg/thermometer.png" alt="" /> <img class="tem2" src="../../../assets/flowimg/thermometer.png" alt="" />
<div class="temContainer2"> <div class="temContainer2">
@ -393,7 +395,7 @@
</div> </div>
<!-- 热泵操作弹框 --> <!-- 热泵操作弹框 -->
<el-dialog :title="hotPumpTitle" :visible.sync="hotPumpDialogVisible" width="450px" <el-dialog :title="hotPumpTitle" :visible.sync="hotPumpDialogVisible" width="450px" v-loading="dialogLoading"
:close-on-click-modal="false" :modal-append-to-body="true" :append-to-body="true" :z-index="9999" :close-on-click-modal="false" :modal-append-to-body="true" :append-to-body="true" :z-index="9999"
custom-class="hot-pump-dialog"> custom-class="hot-pump-dialog">
<div v-if="hotPumpOperateData" class="hot-pump-dialog-content"> <div v-if="hotPumpOperateData" class="hot-pump-dialog-content">
@ -412,7 +414,8 @@
</div> </div>
<!-- 补水液位1 --> <!-- 补水液位1 -->
<div class="dialog-item"> <div class="dialog-item"
v-show="hotPumpOperateData.waterLevelSet !== null && hotPumpOperateData.waterLevelSet !== undefined">
<label class="dialog-label">补水液位1：</label> <label class="dialog-label">补水液位1：</label>
<el-input size="mini" style="width:100px" v-model="hotPumpOperateData.waterLevelSet" <el-input size="mini" style="width:100px" v-model="hotPumpOperateData.waterLevelSet"
placeholder="请输入" @keyup.enter.native=" placeholder="请输入" @keyup.enter.native="
@ -427,7 +430,8 @@
<span class="unit">米</span> <span class="unit">米</span>
</div> </div>
<!-- 补水误差1 --> <!-- 补水误差1 -->
<div class="dialog-item"> <div class="dialog-item"
v-show="hotPumpOperateData.waterLevelErrorSet !== null && hotPumpOperateData.waterLevelErrorSet !== undefined">
<label class="dialog-label">补水误差1：</label> <label class="dialog-label">补水误差1：</label>
<el-input size="mini" style="width:100px" v-model="hotPumpOperateData.waterLevelErrorSet" <el-input size="mini" style="width:100px" v-model="hotPumpOperateData.waterLevelErrorSet"
placeholder="请输入" @keyup.enter.native=" placeholder="请输入" @keyup.enter.native="
@ -442,7 +446,8 @@
<span class="unit">米</span> <span class="unit">米</span>
</div> </div>
<!-- 补水液位2 --> <!-- 补水液位2 -->
<div class="dialog-item"> <div class="dialog-item"
v-show="hotPumpOperateData.waterLevelSet1 !== null && hotPumpOperateData.waterLevelSet1 !== undefined">
<label class="dialog-label">补水液位1：</label> <label class="dialog-label">补水液位1：</label>
<el-input size="mini" style="width:100px" v-model="hotPumpOperateData.waterLevelSet1" <el-input size="mini" style="width:100px" v-model="hotPumpOperateData.waterLevelSet1"
placeholder="请输入" @keyup.enter.native=" placeholder="请输入" @keyup.enter.native="
@ -457,7 +462,8 @@
<span class="unit">米</span> <span class="unit">米</span>
</div> </div>
<!-- 补水误差2 --> <!-- 补水误差2 -->
<div class="dialog-item"> <div class="dialog-item"
v-show="hotPumpOperateData.waterLevelErrorSet1 !== null && hotPumpOperateData.waterLevelErrorSet1 !== undefined">
<label class="dialog-label">补水误差1：</label> <label class="dialog-label">补水误差1：</label>
<el-input size="mini" style="width:100px" v-model="hotPumpOperateData.waterLevelErrorSet1" <el-input size="mini" style="width:100px" v-model="hotPumpOperateData.waterLevelErrorSet1"
placeholder="请输入" @keyup.enter.native=" placeholder="请输入" @keyup.enter.native="
@ -527,7 +533,7 @@
'设定温度', '设定温度',
'℃' '℃'
) )
" @input="handleInput(hotPumpOperateData)" @blur="handleBlur()"></el-input> " @input="handleWaterInput(hotPumpOperateData)" @blur="handleBlur()"></el-input>
<span class="unit">℃</span> <span class="unit">℃</span>
</div> </div>
</template> </template>
@ -572,6 +578,17 @@
<el-tag size="mini" v-else type="danger">不运行</el-tag> <el-tag size="mini" v-else type="danger">不运行</el-tag>
</div> </div>
<!-- 本地远程信号 -->
<div class="dialog-item">
<label class="dialog-label">本地远程信号：</label>
<el-tag size="mini" v-if="hotPumpOperateData.localRemoteStatus === '远程'" type="success">{{
hotPumpOperateData.localRemoteStatus
}}</el-tag>
<el-tag size="mini" v-else type="danger">{{
hotPumpOperateData.localRemoteStatus
}}</el-tag>
</div>
<!-- 累计运行时间 --> <!-- 累计运行时间 -->
<div class="dialog-item"> <div class="dialog-item">
<label class="dialog-label">累计运行：</label> <label class="dialog-label">累计运行：</label>
@ -594,6 +611,7 @@ export default {
data() { data() {
return { return {
loading: false, loading: false,
dialogLoading:false,
currentDate: new Date(), currentDate: new Date(),
nowTimer: null, nowTimer: null,
timer: null, // 用于存储定时器 ID timer: null, // 用于存储定时器 ID
@ -658,7 +676,7 @@ export default {
this.timer = setInterval(() => { this.timer = setInterval(() => {
this.baseMessgae(); this.baseMessgae();
this.sysStatus(); this.sysStatus();
}, 10000); }, 10 * 1000);
this.getSysBuild(); this.getSysBuild();
}, },
@ -981,7 +999,7 @@ export default {
systemType: "1", systemType: "1",
floorId: this.currentId, floorId: this.currentId,
}; };
waterMonitorList(data).then((res) => { return waterMonitorList(data).then((res) => {
console.log("系统状态返回", res); console.log("系统状态返回", res);
if (res.code == 200 && res.rows.length > 0) { if (res.code == 200 && res.rows.length > 0) {
this.tableData = []; this.tableData = [];
@ -1096,8 +1114,13 @@ export default {
if (matchedItem) { if (matchedItem) {
this.hotPumpOperateData = { this.hotPumpOperateData = {
...matchedItem, ...matchedItem,
tempSet:
(itemName.includes('热泵') && matchedItem.tempSet)
? Math.round(Number(matchedItem.tempSet))
: matchedItem.tempSet || '',
waterLevel: Number(matchedItem.waterLevel), waterLevel: Number(matchedItem.waterLevel),
runningStatus: Number(matchedItem.runningStatus) === 0 ? "停止" : "运行", //运行状态 runningStatus: Number(matchedItem.runningStatus) === 0 ? "停止" : "运行", //运行状态
localRemoteStatus: Number(matchedItem.localRemoteStatus) == 0 ? "远程" : "本地", //本地/远程控制状态
hotPumpStatus: hotPumpStatus:
Number(matchedItem.switchStatus) === 0 Number(matchedItem.switchStatus) === 0
? false ? false
@ -1251,6 +1274,9 @@ export default {
item.tempSet = parts[0] + "." + parts[1].slice(0, 2); item.tempSet = parts[0] + "." + parts[1].slice(0, 2);
} }
}, },
handleWaterInput(item) {
item.tempSet = String(item.tempSet).replace(/[^\d]/g, "");
},
// 失去焦点 // 失去焦点
handleBlur() { }, handleBlur() { },
hadleOperationConrol(id, param) { hadleOperationConrol(id, param) {
@ -1260,25 +1286,49 @@ export default {
}; };
console.log("操作参数", data); console.log("操作参数", data);
// 开启 loading 效果 // 开启 loading 效果
this.loading = true; this.dialogLoading = true;
console.log("开始调用 operationConrol API");
operationConrol([data]) operationConrol([data])
.then((res) => { .then((res) => {
console.log("operationConrol 返回结果:", res);
console.log("res.code:", res.code, "类型:", typeof res.code);
console.log("res.code == 200:", res.code == 200);
console.log("res.code === 200:", res.code === 200);
if (res.code == 200) { if (res.code == 200) {
console.log("进入 res.code == 200 分支");
this.$modal.msgSuccess("指令下发成功!"); this.$modal.msgSuccess("指令下发成功!");
// 更新所有设备状态; // 更新所有设备状态;
setTimeout(() => { setTimeout(() => {
console.log("1")
this.sysStatus().finally(() => { this.sysStatus().finally(() => {
// 更新操作数据
if (this.hotPumpTitle && this.currentPumpType) {
console.log("更新操作数据", this.hotPumpTitle, this.currentPumpType);
// 根据不同的设备类型获取对应的组名
let groupName = "";
if (this.currentPumpType === "hotpump") {
groupName = "热泵";
} else if (this.currentPumpType === "cyclepump") {
groupName = "贵宾楼循环泵";
} else if (this.currentPumpType === "waterBox") {
groupName = "水箱";
}
this.loadOperateData(groupName, this.hotPumpTitle);
}
// 关闭 loading 效果 // 关闭 loading 效果
this.loading = false; this.dialogLoading = false;
console.log("2")
}); });
}, 5000); }, 5000);
} else { } else {
console.log("进入 else 分支，res.code:", res.code);
// this.$modal.msgError("操作失败"); // this.$modal.msgError("操作失败");
console.log("应该更新状态的"); console.log("应该更新状态的");
// 更新所有设备状态; // 更新所有设备状态;
this.sysStatus().finally(() => { this.sysStatus().finally(() => {
// 关闭 loading 效果 // 关闭 loading 效果
this.loading = false; this.dialogLoading = false;
}); });
} }
}) })
@ -1287,7 +1337,7 @@ export default {
// 更新所有设备状态; // 更新所有设备状态;
this.sysStatus().finally(() => { this.sysStatus().finally(() => {
// 关闭 loading 效果 // 关闭 loading 效果
this.loading = false; this.dialogLoading = false;
}); });
}); });
}, },
@ -1651,14 +1701,14 @@ export default {
.text20 { .text20 {
position: absolute; position: absolute;
top: 3.4rem; top: 3.4rem;
left: 5.8rem; left: 5.4rem;
z-index: 1; z-index: 1;
} }
.text21 { .text21 {
position: absolute; position: absolute;
top: 3.4rem; top: 3.4rem;
left: 3rem; left: 2.8rem;
z-index: 1; z-index: 1;
} }
@ -1683,8 +1733,8 @@ export default {
.cycle-pipeline { .cycle-pipeline {
position: absolute; position: absolute;
top: 3.3rem; top: 3.3rem;
left: 5.3rem; left: 3.5rem;
width: 3rem; width: 4.4rem;
height: 1.5rem; height: 1.5rem;
z-index: 0; z-index: 0;
} }
@ -1944,6 +1994,7 @@ export default {
width: 2.16rem; width: 2.16rem;
height: 2.6rem; height: 2.6rem;
z-index: 2; z-index: 2;
cursor: pointer;
} }
.waterBox2 { .waterBox2 {
@ -1953,6 +2004,7 @@ export default {
width: 2.16rem; width: 2.16rem;
height: 2.6rem; height: 2.6rem;
z-index: 2; z-index: 2;
cursor: pointer;
} }
.waterBox3 { .waterBox3 {

Write Preview
Loading…
Cancel
Save