diff --git a/.env.development b/.env.development
index 8e968ab..e9b040a 100644
--- a/.env.development
+++ b/.env.development
@@ -9,7 +9,7 @@ ENV = 'development'
# 后台
# VUE_APP_BASE_API = 'http://192.168.1.222:8080'
# 云端
-VUE_APP_BASE_API = 'http://106.55.173.225:8090'
+VUE_APP_BASE_API = 'http://106.55.173.225:8091'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/src/views/centerairC/sysControl/index.vue b/src/views/centerairC/sysControl/index.vue
index bc66bf6..6be1e67 100644
--- a/src/views/centerairC/sysControl/index.vue
+++ b/src/views/centerairC/sysControl/index.vue
@@ -86,6 +86,7 @@
@@ -217,6 +218,15 @@ export default {
deviceItem.localRemote =
Number(child.value) == 0 ? "本地" : "远程";
}
+ // 频率-手自动切换
+ else if (
+ child.paramType === "40" &&
+ !child.name.includes("阀")
+ ) {
+ deviceItem.frequencyAutotext =
+ Number(child.value) == 0 ? false : true;
+ deviceItem.frequencyAutotextId = child.id;
+ }
// 频率调节
else if (
child.paramType === "3" &&
@@ -258,24 +268,24 @@ export default {
}
// 记录阀关到位状态
if (
- child.name.includes("阀关到位") &&
+ child.name.includes("关到位") &&
Number(child.value) == 0
) {
valveClosed = false;
} else if (
- child.name.includes("阀关到位") &&
+ child.name.includes("关到位") &&
Number(child.value) == 1
) {
valveClosed = true;
}
// 记录阀开到位的状态
if (
- child.name.includes("阀开到位") &&
+ child.name.includes("开到位") &&
Number(child.value) == 0
) {
valveOpened = false;
} else if (
- child.name.includes("阀开到位") &&
+ child.name.includes("开到位") &&
Number(child.value) == 1
) {
valveOpened = true;
diff --git a/src/views/centerairC/sysControl/listHeader.vue b/src/views/centerairC/sysControl/listHeader.vue
index 8a7d77d..0bc599f 100644
--- a/src/views/centerairC/sysControl/listHeader.vue
+++ b/src/views/centerairC/sysControl/listHeader.vue
@@ -7,6 +7,7 @@
手动控制
本地远程状态
故障报警
+ 频率手自动切换
频率调节
频率反馈
运行时间
@@ -55,6 +56,20 @@
{{ item.warnText }}
+
+
+
+
+
@@ -108,7 +123,7 @@ export default {
// this.currentFocusIndex = "";
},
handleEnter(item, event) {
- console.log("请求后端");
+ console.log("请求后端", item);
// 失去焦点
event.target.blur();
this.$confirm(
@@ -121,7 +136,6 @@ export default {
}
)
.then(() => {
- // 触发自定义事件 operationControl，并传递两个参数
this.$emit("operationControl", item.frequencyId, item.frequencySet);
})
.catch(() => {
@@ -189,6 +203,36 @@ export default {
console.log("不请求后台");
});
},
+ // 频率-手自动切换
+ handleFrequencyAutomaticText(item) {
+ this.$confirm(
+ `确定要切换"${item.name}"的频率手自动状态为:${
+ item.frequencyAutotext ? "手动" : "自动 吗?"
+ }`,
+ "提示",
+ {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ }
+ )
+ .then(() => {
+ // 这里调用请求函数
+ console.log("请求后台", item.frequencyAutotext);
+ let param = null;
+ if (item.frequencyAutotext) {
+ param = 1;
+ } else {
+ param = 0;
+ }
+ this.$emit("operationControl", item.frequencyAutotextId, param);
+ })
+ .catch(() => {
+ // 用户取消操作，恢复开关状态
+ item.frequencyAutotext = !item.frequencyAutotext;
+ console.log("不请求后台");
+ });
+ },
},
};
diff --git a/src/views/centerairC/sysMonitor/hostDetails.vue b/src/views/centerairC/sysMonitor/hostDetails.vue
index 450dd3c..2302b8c 100644
--- a/src/views/centerairC/sysMonitor/hostDetails.vue
+++ b/src/views/centerairC/sysMonitor/hostDetails.vue
@@ -163,12 +163,12 @@
-
+ > -->
-
+ > -->
@@ -370,11 +370,21 @@ export default {
// 主机参数分开两列
this.leftHostData = [];
this.rightHostData = [];
+ // 筛选去掉特定 paramType 的数据
+ this.rightHostData = this.hostData.filter((item) => {
+ return !["2", "21", "20", "6", "5", "22", "26"].includes(
+ Number(item.paramType)
+ );
+ });
+ // // 根据 ordernum 进行排序
+ // this.rightHostData.sort((a, b) => {
+ // return Number(a.ordernum) - Number(b.ordernum);
+ // });
this.hostData.forEach((item) => {
- // 右边主机参数 温度12
- if (item.paramType === "12") {
- this.rightHostData.push(item);
- }
+ // // 右边主机参数 温度12
+ // if (item.paramType === "12") {
+ // this.rightHostData.push(item);
+ // }
//左边主机参数 根据不同的 paramType 处理 showValue
if (item.paramType === "6") {
// 运行状态
@@ -404,10 +414,13 @@ export default {
// 遍历数组
for (let i = 0; i < this.compressorData.length; i++) {
const item = this.compressorData[i];
- if (item.paramType === '1' && Number(item.curValue) === 0) {
+ if (item.paramType === "1" && Number(item.curValue) === 0) {
item.curValue = "停止";
- console.log("压缩机停止了啊是0···················")
- }else if (item.paramType === '1' && Number(item.curValue) === 1){
+ console.log("压缩机停止了啊是0···················");
+ } else if (
+ item.paramType === "1" &&
+ Number(item.curValue) === 1
+ ) {
item.curValue = "运行";
}
}
@@ -795,7 +808,7 @@ export default {
}
}
.detail-bottom {
- height: 5rem;
+ // height: 5rem;
margin-top: 0.3rem;
margin-left: 0.25rem;
display: flex;
@@ -804,9 +817,9 @@ export default {
.hostStatus {
display: flex;
flex-direction: column;
- justify-content: flex-end;
- width: 3rem;
- margin-bottom: 1.5rem;
+ justify-content: flex-start;
+ width: 3rem !important;
+ margin-top: 1.5rem;
.hostStatus-li {
background-color: #25455a;
color: #c0dffc;
@@ -816,7 +829,11 @@ export default {
letter-spacing: 0.02rem;
display: flex;
flex-direction: row;
+ flex-wrap: nowrap;
align-items: flex-start;
+ span {
+ white-space: nowrap;
+ }
}
}
.detail-data {
@@ -840,17 +857,18 @@ export default {
}
}
.detail-data-bottom {
- width: 100%;
- padding: 0.1rem 0.3rem;
+ // width: 100%;
+ // padding: 0.1rem 0.3rem;
z-index: 0;
display: flex;
flex-direction: row;
flex-wrap: wrap;
- align-items: flex-start;
+ align-items: stretch;
justify-content: flex-start;
.detail-data-li {
// width: 100%;
margin-right: 0.1rem;
+ margin-bottom: 0.15rem !important;
position: relative;
color: #c0dffc;
font-family: Arial, sans-serif;
@@ -997,20 +1015,24 @@ export default {
}
}
.hostparams {
- width: 7.6rem;
+ width: 7rem;
.detail-data-bottom {
- padding-left: 0.5rem;
+ // padding-left: 0.5rem;
.detail-data-li {
- width: 3.2rem;
+ // width: 3.2rem;
+ width: calc(50% - 0.2rem) !important;
+ margin: 0 0.1rem;
}
}
}
.compressor {
width: 7.6rem;
.detail-data-bottom {
- padding-left: 0.75rem;
+ // padding-left: 0.75rem;
.detail-data-li {
- width: 3rem;
+ // width: 3.4rem;
+ width: calc(50% - 0.2rem) !important;
+ margin: 0 0.1rem;
}
}
}
diff --git a/src/views/centerairC/sysMonitor/monitorCenter.vue b/src/views/centerairC/sysMonitor/monitorCenter.vue
index c1d8540..d8c27be 100644
--- a/src/views/centerairC/sysMonitor/monitorCenter.vue
+++ b/src/views/centerairC/sysMonitor/monitorCenter.vue
@@ -516,10 +516,10 @@
:class="{ startClass: towerValveInControlClass(0) }"
>
-
+ > -->
-
+ > -->
{{ freezingOutWater }}m³/h
-
{{ freezingInPre }}kpa
-
{{ freezingOutPre }}kpa
+
{{ coolingInTem }}℃
{{ coolingOutTem }}℃
@@ -592,6 +592,9 @@
connect: hostAndCoolingControlClass(this.coolingInletBuild),
}"
>
+
+ {{ getValueByType(this.coolingInletBuild, "13") }}bar
+
客房供冷进水阀:
@@ -601,13 +604,16 @@
connect: hostAndCoolingControlClass(this.coolingInletGuest),
}"
>
+
+ {{ getValueByType(this.coolingInletGuest, "13") }}bar
+
@@ -620,6 +626,9 @@
connect: hostAndCoolingControlClass(this.coolingOutletBuild),
}"
>
+
+ {{ getValueByType(this.coolingOutletBuild, "13") }}bar
+
客房供冷出水阀:
@@ -629,13 +638,16 @@
connect: hostAndCoolingControlClass(this.coolingOutletGuest),
}"
>
+
+ {{ getValueByType(this.coolingOutletGuest, "13") }}bar
+
@@ -646,6 +658,9 @@
class="break"
:class="{ connect: hostAndCoolingControlClass(this.hotInletBuild) }"
>
+
+ {{ getValueByType(this.hotInletBuild, "13") }}bar
+
客房供暖进水阀:
@@ -653,13 +668,16 @@
class="break"
:class="{ connect: hostAndCoolingControlClass(this.hotInletGuest) }"
>
+
+ {{ getValueByType(this.hotInletGuest, "13") }}bar
+
@@ -672,6 +690,9 @@
connect: hostAndCoolingControlClass(this.hotOutletBuild),
}"
>
+
+ {{ getValueByType(this.hotOutletBuild, "13") }}bar
+
客房供暖出水阀:
@@ -681,13 +702,16 @@
connect: hostAndCoolingControlClass(this.hotOutletGuest),
}"
>
+
+ {{ getValueByType(this.hotOutletGuest, "13") }}bar
+
@@ -1123,19 +1147,6 @@ export default {
this.freezingManifoldData();
break;
case "18":
- let buildOutData = row.values;
- buildOutData.forEach((item) => {
- if (item.deviceName.includes("供冷")) {
- this.coolingOutletBuild.push(item);
- }
- if (item.deviceName.includes("供暖")) {
- this.hotOutletBuild.push(item);
- }
- });
- console.log("裙楼供冷出水阀", this.coolingOutletBuild);
- console.log("裙楼供暖出水阀", this.hotOutletBuild);
- break;
- case "19":
let buildInData = row.values;
buildInData.forEach((item) => {
if (item.deviceName.includes("供冷")) {
@@ -1148,20 +1159,20 @@ export default {
console.log("裙楼供冷进水阀", this.coolingInletBuild);
console.log("裙楼供暖进水阀", this.hotInletBuild);
break;
- case "20":
- let guestOutData = row.values;
- guestOutData.forEach((item) => {
+ case "19":
+ let buildOutData = row.values;
+ buildOutData.forEach((item) => {
if (item.deviceName.includes("供冷")) {
- this.coolingOutletGuest.push(item);
+ this.coolingOutletBuild.push(item);
}
if (item.deviceName.includes("供暖")) {
- this.hotOutletGuest.push(item);
+ this.hotOutletBuild.push(item);
}
});
- console.log("客房供冷出水阀", this.coolingOutletGuest);
- console.log("客房供暖出水阀", this.hotOutletGuest);
+ console.log("裙楼供冷出水阀", this.coolingOutletBuild);
+ console.log("裙楼供暖出水阀", this.hotOutletBuild);
break;
- case "21":
+ case "20":
let guestInData = row.values;
guestInData.forEach((item) => {
if (item.deviceName.includes("供冷")) {
@@ -1174,6 +1185,19 @@ export default {
console.log("客房供冷进水阀", this.coolingInletGuest);
console.log("客房供暖进水阀", this.hotInletGuest);
break;
+ case "21":
+ let guestOutData = row.values;
+ guestOutData.forEach((item) => {
+ if (item.deviceName.includes("供冷")) {
+ this.coolingOutletGuest.push(item);
+ }
+ if (item.deviceName.includes("供暖")) {
+ this.hotOutletGuest.push(item);
+ }
+ });
+ console.log("客房供冷出水阀", this.coolingOutletGuest);
+ console.log("客房供暖出水阀", this.hotOutletGuest);
+ break;
default:
break;
}
@@ -1445,8 +1469,10 @@ export default {
// console.log("targetPropertyName",targetPropertyName)
// 在新数组中查找与目标名称匹配的对象，并检查其 collectValue 是否不为 "0.00"
for (let i = 0; i < filteredProperties.length; i++) {
+ const collectName = filteredProperties[i].collectName;
if (
- filteredProperties[i].collectName === targetPropertyName &&
+ collectName.includes(`${towerNumber}号冷却塔风机${item}`) &&
+ collectName.includes("运行") &&
Number(filteredProperties[i].collectValue) !== 0
) {
if (index === 0 && item === 1) {
@@ -1500,9 +1526,13 @@ export default {
// console.log("targetPropertyName",targetPropertyName)
// 在新数组中查找与目标名称匹配的对象，并检查其 collectValue 是否不为 "0.00"
for (let i = 0; i < filteredProperties.length; i++) {
- if (filteredProperties[i].collectName === targetPropertyName) {
+ const collectName = filteredProperties[i].collectName;
+ if (
+ collectName.includes(`${towerNumber}号冷却塔风机${item}`) &&
+ collectName.includes("频率反馈")
+ ) {
// 动态构造 coolingTowerHz 相关属性名
- const coolingTowerHzPropertyName = `coolingTowerHz${towerNumber}${item}`;
+ const coolingTowerHzPropertyName = `coolingTowerHz${towerNumber}`;
// console.log(
// "coolingTowerHzPropertyName---",
// coolingTowerHzPropertyName
@@ -1511,6 +1541,10 @@ export default {
const value = Number(filteredProperties[i].collectValue);
// 使用方括号语法动态设置属性值
this[coolingTowerHzPropertyName] = value;
+ // console.log(
+ // "coolingTowerHzPropertyName])",
+ // coolingTowerHzPropertyName
+ // );
// console.log("Number(filteredProperties[i].collectValue)", value);
return true;
}
@@ -1542,14 +1576,14 @@ export default {
// console.log("item.collectValue", item.collectValue);
// 阀开到位是开启
if (
- item.collectName.includes("阀开到位") &&
+ item.collectName.includes("开到位") &&
Number(item.collectValue) == 1
) {
valveOpenFeedbackFound = true;
}
// 阀关到位是关闭
if (
- item.collectName.includes("阀关到位") &&
+ item.collectName.includes("关到位") &&
Number(item.collectValue) == 0
) {
valveCloseFeedbackFound = true;
@@ -1583,14 +1617,14 @@ export default {
// console.log("item.collectValue", item.collectValue);
// 阀开到位是开启
if (
- item.collectName.includes("阀开到位") &&
+ item.collectName.includes("开到位") &&
Number(item.collectValue) == 1
) {
valveOpenFeedbackFound = true;
}
// 阀关到位是关闭
if (
- item.collectName.includes("阀关到位") &&
+ item.collectName.includes("关到位") &&
Number(item.collectValue) == 0
) {
valveCloseFeedbackFound = true;
@@ -1623,14 +1657,14 @@ export default {
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;
@@ -1663,14 +1697,14 @@ export default {
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;
@@ -1739,6 +1773,11 @@ export default {
}
return false;
},
+ // 裙楼、客房的进出水压力
+ getValueByType(arr, targetType) {
+ const targetItem = arr.find((item) => item.paramType === targetType);
+ return targetItem ? targetItem.collectValue : 0;
+ },
// 报警列表
getAlarnStatus() {
let data = {
@@ -2642,7 +2681,7 @@ export default {
color: #ffffff;
position: absolute;
top: 0.95rem;
- left: 7.16rem;
+ left: 7.22rem;
font-weight: bold;
transform: rotateX(20deg) rotateY(-25deg) rotateZ(-2deg);
}
@@ -2807,7 +2846,7 @@ export default {
font-size: 0.2rem;
// color: rgb(18, 155, 209);
// color: rgb(147, 204, 236);
- color: rgb(144, 167, 197);
+ color: #ffffff;
background-image: url(../../../assets/images/border1.png);
background-size: 100% 100%;
background-repeat: no-repeat;
@@ -2851,7 +2890,7 @@ export default {
align-items: flex-start;
justify-content: flex-start;
font-size: 0.2rem;
- color: rgb(144, 167, 197);
+ color: #ffffff;
background-image: url(../../../assets/images/border4.png);
background-size: 100% 100%;
background-repeat: no-repeat;
@@ -2870,7 +2909,7 @@ export default {
font-style: italic;
font-weight: bold;
line-height: 0.6rem;
- color: rgba(209, 214, 223, 1);
+ color: #ffffff;
padding-left: 0.5rem;
margin-bottom: 0.01rem;
margin-left: 0.4rem;
@@ -3056,7 +3095,7 @@ export default {
z-index: 10;
position: absolute;
top: 1.2rem;
- right: 4.5rem;
+ right: 3.8rem;
font-size: 0.16rem;
}
.coolingIn-line {
@@ -3069,15 +3108,15 @@ export default {
.coolingIn-vavle {
z-index: 10;
position: absolute;
- top: 2.0rem;
- right: 3.6rem;
+ top: 2rem;
+ right: 2.8rem;
font-size: 0.16rem;
}
.hotIn-vavle {
z-index: 10;
position: absolute;
- top: 3.1rem;
- right: -0.5rem;
+ top: 2.93rem;
+ right: -0.65rem;
font-size: 0.16rem;
}
.hotIn-line {
@@ -3090,8 +3129,8 @@ export default {
.hotOut-vavle {
z-index: 10;
position: absolute;
- top: 3.96rem;
- right: -0.8rem;
+ top: 3.77rem;
+ right: -0.9rem;
font-size: 0.16rem;
}
.hotOut-line {
@@ -3101,6 +3140,12 @@ export default {
right: 3.1rem;
font-size: 0.16rem;
}
+ .outInre {
+ font-size: 0.16rem;
+ font-weight: bold;
+ color: #ffffff;
+ margin-left: 0.1rem;
+ }
}
// @media (min-width: 1240px) and (max-width: 1440px) {
// }