@@ -133,6 +134,7 @@
class="host-img2"
src="../../../assets/images/host-img.png"
alt=""
+ v-if="hostListRunClass(1)"
:class="{ moveClass: hostListRunClass(1) }"
/>
@@ -176,6 +178,7 @@
class="host-img3"
src="../../../assets/images/host-img2.png"
alt=""
+ v-if="hostListRunClass(2)"
:class="{ moveClass: hostListRunClass(2) }"
/>
@@ -215,18 +218,21 @@
class="cooling-img1"
src="../../../assets/images/pump-fan.png"
alt=""
+ v-if="coolingPumpRunClass(0)"
:class="{ moveClass2: coolingPumpRunClass(0) }"
/>
@@ -237,18 +243,21 @@
class="freezing-img1"
src="../../../assets/images/pump-fan.png"
alt=""
+ v-if="freezingPumpRunClass(0)"
:class="{ moveClass2: freezingPumpRunClass(0) }"
/>
@@ -258,34 +267,39 @@
-
+
-
+
{
- if (res.code == 200) {
- console.log("一键启停返回信息", res);
- this.oneKeyButtonId = res.data.id;
- if (Number(res.data.curValue) == 0) {
- this.isShowOn = false;
- } else {
- this.isShowOn = true;
- }
- }
+ return new Promise((resolve, reject) => {
+ let data = {
+ systemType: 0,
+ paramType: "23",
+ };
+ oneKeyButton(data)
+ .then((res) => {
+ console.log("一键启停返回信息", res);
+ if (res.code === 200) {
+ this.oneKeyButtonId = res.data.id;
+ if (Number(res.data.curValue) == 0) {
+ this.isShowOn = false;
+ } else {
+ this.isShowOn = true;
+ }
+ } else {
+ this.oneKeyButtonId = "";
+ this.isShowOn = false;
+ }
+ // 成功时解析 Promise
+ resolve(res);
+ })
+ .catch((error) => {
+ // 失败时拒绝 Promise
+ reject(error);
+ });
});
},
// 一键启停按钮
@@ -434,8 +461,15 @@ export default {
.then((res) => {
if (res.code == 200) {
this.$modal.msgSuccess("操作成功");
+ // 开启 loading 效果
+ this.loading = true;
// 更新状态;
- this.getOneKeyButton();
+ setTimeout(() => {
+ this.getOneKeyButton().finally(() => {
+ // 关闭 loading 效果
+ this.loading = false;
+ });
+ }, 6000);
} else {
this.getOneKeyButton();
}
@@ -654,7 +688,7 @@ export default {
// 否则代表运行状态中的不运行
return false;
},
- // 冷却塔风机运行状态
+ // 冷却塔风机运行状态,index为多少号风机,0表示1号风机;item表示风机x
coolingTowerRunClass(index, item) {
// 检查 coolingTower 长度是否足够
if (this.coolingTower.length <= index) {
@@ -671,23 +705,37 @@ export default {
// 创建一个新数组，用于存储 paramType === 1 的对象
const filteredProperties = [];
+ let filterItem = {};
for (let i = 0; i < properties.length; i++) {
// console.log('properties[i].paramType',properties[i].paramType)
if (properties[i].paramType === "1") {
filteredProperties.push(properties[i]);
+ // filterItem = properties[i]
}
}
+ // // 将处理后的对象添加到 deviceList 中
+ // if (Object.keys(filterItem).length > 1) {
+ // filteredProperties.push(filterItem);
+ // }
console.log("paramType为1的对象", filteredProperties);
+ console.log("index, item", index, item);
// 根据 index 和 item 生成目标属性名称
const towerNumber = index + 1;
- const targetPropertyName = `${towerNumber}号冷却塔风机${item}运行状态`;
-
+ const targetPropertyName = `${towerNumber}号冷却塔风机${item}运行`;
+ // console.log("targetPropertyName",targetPropertyName)
// 在新数组中查找与目标名称匹配的对象，并检查其 collectValue 是否不为 "0.00"
for (let i = 0; i < filteredProperties.length; i++) {
if (
- filteredProperties[i].name === targetPropertyName &&
+ filteredProperties[i].collectName === targetPropertyName &&
Number(filteredProperties[i].collectValue) !== 0
) {
+ if (index === 0 && item === 1) {
+ console.log(
+ "返回的true",
+ filteredProperties[i].collectName === targetPropertyName &&
+ Number(filteredProperties[i].collectValue) !== 0
+ );
+ }
return true;
}
}
@@ -710,29 +758,30 @@ export default {
let valveOpenFeedbackFound = false;
let valveCloseFeedbackFound = false;
-
// 遍历 properties 数组
for (let i = 0; i < properties.length; i++) {
const item = properties[i];
if (item.paramType === "7") {
- // 阀开反馈是开启
+ // console.log("item.collectName", item.collectName);
+ // console.log("item.collectValue", item.collectValue);
+ // 阀开到位是开启
if (
- item.collectName.includes("阀开反馈") &&
- Number(item.collectValue) !== 0
+ item.collectName.includes("阀开到位") &&
+ Number(item.collectValue) == 1
) {
valveOpenFeedbackFound = true;
}
- // 阀关反馈是关闭
+ // 阀关到位是关闭
if (
- item.collectName.includes("阀关反馈") &&
- Number(item.collectValue) === 0
+ item.collectName.includes("阀关到位") &&
+ Number(item.collectValue) == 0
) {
valveCloseFeedbackFound = true;
}
}
}
- // 当阀开反馈和阀关反馈的条件都满足时返回 true ,才是真正的阀门开启,其他都是阀门关闭
+ // 当阀开到位和阀关到位的条件都满足时返回 true ,才是真正的阀门开启,其他都是阀门关闭
return valveOpenFeedbackFound && valveCloseFeedbackFound;
},
// 冷冻蝶阀启停状态
@@ -755,16 +804,16 @@ export default {
for (let i = 0; i < properties.length; i++) {
const item = properties[i];
if (item.paramType === "7") {
- // 阀开反馈是开启
+ // 阀开到位是开启
if (
- item.collectName.includes("阀开反馈") &&
+ item.collectName.includes("阀开到位") &&
Number(item.collectValue) !== 0
) {
valveOpenFeedbackFound = true;
}
- // 阀关反馈是关闭
+ // 阀关到位是关闭
if (
- item.collectName.includes("阀关反馈") &&
+ item.collectName.includes("阀关到位") &&
Number(item.collectValue) === 0
) {
valveCloseFeedbackFound = true;
@@ -772,7 +821,7 @@ export default {
}
}
- // 当阀开反馈和阀关反馈的条件都满足时返回 true ,才是真正的阀门开启,其他都是阀门关闭
+ // 当阀开到位和阀关到位的条件都满足时返回 true ,才是真正的阀门开启,其他都是阀门关闭
return valveOpenFeedbackFound && valveCloseFeedbackFound;
},
// 冷却蝶阀启停状态
@@ -795,25 +844,25 @@ export default {
for (let i = 0; i < properties.length; i++) {
const item = properties[i];
if (item.paramType === "7") {
- // 阀开反馈是开启
+ // 阀开到位是开启
if (
- item.collectName.includes("阀开反馈") &&
+ item.collectName.includes("阀开到位") &&
Number(item.collectValue) !== 0
) {
valveOpenFeedbackFound = true;
}
- // 阀关反馈是关闭
+ // 阀关到位是关闭
if (
- item.collectName.includes("阀关反馈") &&
+ item.collectName.includes("阀关到位") &&
Number(item.collectValue) === 0
) {
valveCloseFeedbackFound = true;
- // console.log("冷冻蝶阀阀关反馈应该是true才对呀");
+ // console.log("冷冻蝶阀阀关到位应该是true才对呀");
}
}
}
- // 当阀开反馈和阀关反馈的条件都满足时返回 true ,才是真正的阀门开启,其他都是阀门关闭
+ // 当阀开到位和阀关到位的条件都满足时返回 true ,才是真正的阀门开启,其他都是阀门关闭
return valveOpenFeedbackFound && valveCloseFeedbackFound;
},
},
@@ -899,8 +948,8 @@ export default {
.towerValve1 {
z-index: 10;
position: absolute;
- top: 1.87rem;
- left: 4.2rem;
+ top: 1.08rem;
+ left: 4.23rem;
width: 0.15rem;
height: 0.15rem;
background-color: #ebebeb;
@@ -909,8 +958,8 @@ export default {
.towerValve2 {
z-index: 10;
position: absolute;
- top: 1.72rem;
- left: 5rem;
+ top: 0.98rem;
+ left: 4.99rem;
width: 0.15rem;
height: 0.15rem;
background-color: #ebebeb;
@@ -919,8 +968,8 @@ export default {
.towerValve3 {
z-index: 10;
position: absolute;
- top: 1.54rem;
- left: 5.86rem;
+ top: 0.84rem;
+ left: 5.87rem;
width: 0.15rem;
height: 0.15rem;
background-color: #ebebeb;
@@ -1012,7 +1061,7 @@ export default {
z-index: 10;
position: absolute;
top: 4.62rem;
- left: 2.68rem;
+ left: 2.8rem;
width: 0.3rem;
height: 0.3rem;
transform-style: preserve-3d;
@@ -1022,7 +1071,7 @@ export default {
z-index: 10;
position: absolute;
top: 4.1rem;
- left: 4.3rem;
+ left: 4.36rem;
width: 0.3rem;
height: 0.3rem;
transform-style: preserve-3d;
@@ -1032,7 +1081,7 @@ export default {
z-index: 10;
position: absolute;
top: 3.64rem;
- left: 6rem;
+ left: 5.98rem;
width: 0.3rem;
height: 0.3rem;
transform-style: preserve-3d;
@@ -1354,7 +1403,7 @@ export default {
color: #20ebfa;
font-weight: bold;
font-family: DIN;
- font-size: 0.20rem;
+ font-size: 0.2rem;
}
}
@@ -1428,6 +1477,8 @@ export default {
font-size: 0.24rem;
color: #20ebfa;
font-weight: bold;
+ }
+ .on-animation {
animation: rotateZ 5s linear infinite;
transition: 0.6s; /* 设置过渡时间，控制翻转速度 */
transform-style: preserve-3d; /* 保持子元素的 3D 效果 */
@@ -1446,8 +1497,8 @@ export default {
}
}
/* 鼠标悬停时移除动画 */
-.offClass:hover .off-bg {
+ .offClass:hover .on-animation {
animation: none;
-}
+ }
}
diff --git a/src/views/centerairC/sysMonitor/index2.vue b/src/views/centerairC/sysMonitor/index2.vue
new file mode 100644
index 0000000..e51eb32
--- /dev/null
+++ b/src/views/centerairC/sysMonitor/index2.vue
@@ -0,0 +1,1504 @@
+
+
+
+
+
+
+ 室外温度：
+ {{ weatherObj.temperature }}
+ ℃
+
+
+ 室外湿度：
+ {{ weatherObj.humidity }}
+ %
+
+
+ 室外含湿：
+ {{ weatherObj.humidityRatio }}
+ g/kg
+
+
+ 室外焓值：
+ {{ weatherObj.enthalpy }}
+ kj/kg
+
+
+ 室外露点：
+ {{ weatherObj.dewPointTemp }}
+ ℃
+
+
+ 室外湿球：
+ {{ weatherObj.wetBulbTemp }}
+ ℃
+
+
+
+
+
+
+
+
+
+
+ {{ hostList[0].deviceName }}
+
+
+
+
+
+ 1#冷却水流:
+ 接通
+ 断开
+
+
+
+ 1#冷冻水流:
+ 接通
+ 断开
+
+
+
+
+
+ {{ hostList[1].deviceName }}
+
+
+
+
+
+ 2#冷却水流:
+ 接通
+ 断开
+
+
+
+ 2#冷冻水流:
+ 接通
+ 断开
+
+
+
+
+
+
+ {{ hostList[2].deviceName }}
+
+
+
+
+
+
+
+
+ 3#冷却水流:
+ 接通
+ 断开
+
+
+
+ 3#冷冻水流:
+ 接通
+ 断开
+
+
+
+
+
+
+
1#
+
2#
+
3#
+
+
+
+
+
1#
+
2#
+
3#
+
+
+
+
+
3#
+
2#
+
1#
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/centerairC/timeSwitch/index.vue b/src/views/centerairC/timeSwitch/index.vue
new file mode 100644
index 0000000..75c8f8c
--- /dev/null
+++ b/src/views/centerairC/timeSwitch/index.vue
@@ -0,0 +1,458 @@
+
+
+
+
定时开关机功能
+
+
+
定时名称
+
定时开机
+
定时关机
+
启动状态
+
+
+
{{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/components/waterTank.vue b/src/views/components/waterTank.vue
index 34b8c13..cbe8ebe 100644
--- a/src/views/components/waterTank.vue
+++ b/src/views/components/waterTank.vue
@@ -3,12 +3,7 @@
-
+
@@ -38,89 +33,80 @@ export default {
.monitor-container {
position: relative;
display: inline-block;
+ width: 1.2rem;
+ height: 1.2rem;
}
.monitor-img3 {
width: 1.2rem;
height: 1.3rem;
+ position: absolute;
+ top: -10px;
+ left: 0;
}
-.waves {
+.water {
position: absolute;
bottom: 0;
left: 0;
width: 100%;
/* 修改颜色表示，添加透明度 */
- background-color: rgba(23, 106, 201, 0.1);
+ background-color: rgba(23, 106, 201);
overflow: hidden;
- .wave {
- position: absolute;
- left: 0;
- top: 0;
- width: 100%;
- height: 100%;
- background: url(../../assets/images/wave.png);
- background-size: 200% 100%;
- }
- .wave1 {
- opacity: 1;
- top: 0;
- z-index: 1000;
- animation: animate 4s linear infinite;
- }
- .wave2 {
- opacity: 0.5;
- top: 0.2rem;
- z-index: 999;
- animation: animate2 4s linear infinite;
- }
- .wave3 {
- opacity: 0.2;
- top: 0.3rem;
- z-index: 999;
- animation: animate 2s linear infinite;
- }
- .wave4 {
- opacity: 0.7;
- top: 0.4rem;
- z-index: 999;
- animation: animate2 2s linear infinite;
- }
-}
-@keyframes animate{
- 0%{
- background-position-x: 110px;
- }
- 100%{
- background-position-x: 0px;
- }
-}
-@keyframes animate2{
- 0%{
- background-position-x: 0px;
- }
- 100%{
- background-position-x: 110px;
- }
}
@media (min-width: 1400px) and (max-width: 1620px) {
+ .monitor-container {
+ width: 110px !important;
+ height: 110px !important;
+ }
.monitor-img3 {
width: 110px !important;
height: 120px !important;
}
+ .water {
+ width: 110px !important;
+ }
}
@media (min-width: 1240px) and (max-width: 1400px) {
+ .monitor-container {
+ width: 90px !important;
+ height: 90px !important;
+ }
.monitor-img3 {
width: 90px !important;
height: 100px !important;
}
+ .water {
+ width: 90px !important;
+ }
}
-@media (max-width: 1240px) {
+@media (min-width: 720px) and (max-width: 1240px){
+ .monitor-container {
+ width: 100px !important;
+ height: 100px !important;
+ }
.monitor-img3 {
width: 100px !important;
height: 110px !important;
}
+ .water {
+ width: 100px !important;
+ }
+}
+
+@media (max-width: 720px) {
+ .monitor-container {
+ width: 80px !important;
+ height: 80px !important;
+ }
+ .monitor-img3 {
+ width: 80px !important;
+ height: 90px !important;
+ }
+ .water {
+ width: 80px !important;
+ }
}
diff --git a/src/views/hotWater/waterControl/index.vue b/src/views/hotWater/waterControl/index.vue
index 217b9ca..ffbce89 100644
--- a/src/views/hotWater/waterControl/index.vue
+++ b/src/views/hotWater/waterControl/index.vue
@@ -1,5 +1,5 @@
+ 
+
+ 
+
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
+ 
+ 
+
+ 
+ 
+
+ 
+ 
+ 
+ 
+ 
+
+ 
+
+ 
+