From 60cb809cf19c1aa10c5c9de69c466f9513c55682 Mon Sep 17 00:00:00 2001 From: selia-zx <1771203023@qq.com> Date: Wed, 5 Nov 2025 17:25:47 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=B3=BB=E7=BB=9F=E6=8E=A7=E5=88=B6-?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A2=91=E7=8E=87=E6=89=8B=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=202.1=E3=80=812=E5=8F=B7=E4=B8=BB=E6=9C=BA=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=9C=E7=A8=8B=E5=BC=80=E5=85=B3=E6=9C=BA?= =?UTF-8?q?=E3=80=81=E5=86=B7=E5=86=BB=E6=B0=B4=E8=AE=BE=E5=AE=9A=E5=80=BC?= =?UTF-8?q?=E3=80=81=E7=94=B5=E6=B5=81=E8=B4=9F=E8=BD=BD=E9=99=90=E5=88=B6?= =?UTF-8?q?=E5=80=BC=EF=BC=8C=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/centerairC/sysControl/index.vue | 31 +-- .../centerairC/sysControl/listHeader.vue | 159 ++++--------- .../centerairC/sysControl/vavleheader.vue | 107 --------- .../sysMonitor/components/hostChart.vue | 39 ++-- .../sysMonitor/components/loadData.vue | 14 +- .../centerairC/sysMonitor/hostDetails.vue | 213 ++++++++++++++---- 6 files changed, 258 insertions(+), 305 deletions(-) diff --git a/src/views/centerairC/sysControl/index.vue b/src/views/centerairC/sysControl/index.vue index bc66bf6..3428d83 100644 --- a/src/views/centerairC/sysControl/index.vue +++ b/src/views/centerairC/sysControl/index.vue @@ -86,6 +86,7 @@ @@ -187,7 +188,8 @@ export default { // 手动控制 else if ( child.paramType === "2" && - !child.name.includes("阀") + !child.name.includes("阀") && + child.name.includes("启停") ) { deviceItem.controlText = Number(child.value) == 0 ? false : true; @@ -217,6 +219,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 +269,24 @@ export default { } // 记录阀关到位状态 if ( - child.name.includes("阀关到位") && + child.name.endsWith("关到位") && Number(child.value) == 0 ) { valveClosed = false; } else if ( - child.name.includes("阀关到位") && + child.name.endsWith("关到位") && Number(child.value) == 1 ) { valveClosed = true; } // 记录阀开到位的状态 if ( - child.name.includes("阀开到位") && + child.name.endsWith("开到位") && Number(child.value) == 0 ) { valveOpened = false; } else if ( - child.name.includes("阀开到位") && + child.name.endsWith("开到位") && Number(child.value) == 1 ) { valveOpened = true; @@ -414,16 +425,6 @@ export default { diff --git a/src/views/centerairC/sysControl/vavleheader.vue b/src/views/centerairC/sysControl/vavleheader.vue index 4c4ddbb..f971c5c 100644 --- a/src/views/centerairC/sysControl/vavleheader.vue +++ b/src/views/centerairC/sysControl/vavleheader.vue @@ -125,111 +125,4 @@ export default { diff --git a/src/views/centerairC/sysMonitor/components/hostChart.vue b/src/views/centerairC/sysMonitor/components/hostChart.vue index 05640c3..a385144 100644 --- a/src/views/centerairC/sysMonitor/components/hostChart.vue +++ b/src/views/centerairC/sysMonitor/components/hostChart.vue @@ -100,11 +100,11 @@ export default { name4 = names[3] || ""; } }); - console.log("this.chartData1", this.chartData1); - console.log("this.chartData2", this.chartData2); - console.log("this.chartData3", this.chartData3); - console.log("this.chartData4", this.chartData4); - console.log("this.chartData5", this.chartData5); + // console.log("this.chartData1", this.chartData1); + // console.log("this.chartData2", this.chartData2); + // console.log("this.chartData3", this.chartData3); + // console.log("this.chartData4", this.chartData4); + // console.log("this.chartData5", this.chartData5); this.$nextTick(() => { // 计算双y轴最大最小值， var Min1 = 0, @@ -264,6 +264,7 @@ export default { if (chartRef) { // 初始化图表的代码 this.chartInstance = echarts.init(this.$refs.chart_ref); + const titleFontSize = this.$refs.chart_ref.offsetWidth / 130; this.option = { tooltip: { trigger: "axis", @@ -273,7 +274,7 @@ export default { for (var i = 0, l = params.length; i < l; i++) { var seriesName = params[i].seriesName; var value = params[i].value; - console.log("打印颜色", params[i].color) + // console.log("打印颜色", params[i].color) var marker = ' .historyCharts { width: 100%; - height: 4rem; + height: 4.4rem; } - \ No newline at end of file + + diff --git a/src/views/centerairC/sysMonitor/components/loadData.vue b/src/views/centerairC/sysMonitor/components/loadData.vue index dc031d7..9b29255 100644 --- a/src/views/centerairC/sysMonitor/components/loadData.vue +++ b/src/views/centerairC/sysMonitor/components/loadData.vue @@ -3,12 +3,8 @@
- - + diff --git a/src/views/centerairC/sysMonitor/hostDetails.vue b/src/views/centerairC/sysMonitor/hostDetails.vue index bf92232..a083e66 100644 --- a/src/views/centerairC/sysMonitor/hostDetails.vue +++ b/src/views/centerairC/sysMonitor/hostDetails.vue @@ -90,7 +90,14 @@ alt="" /> -
+
@@ -122,18 +129,33 @@
-
- 冷冻供水温度: +
+ 远程开关机: + + +
+
+ 冷冻水设定值: ℃
-
- 需求设定值: +
+ 电流负载限制值: { + let param = null; + if (item) { + param = 1; + } else { + param = 0; + } + this.hadleOperationConrol(itemId, param); + }) + .catch(() => { + // 用户取消操作，恢复开关状态 + console.log("item后", item); + item = !item; + console.log("item原始", item); + this.remoteSwitch = item; + console.log("this.remoteSwitch", this.remoteSwitch); + console.log("不请求后台"); + }); + }, hadleOperationConrol(id, param) { let data = { id: id, param: param, }; console.log("操作参数", data); - operationConrol([data]) - .then((res) => { - if (res.code == 200) { - this.$modal.msgSuccess("指令下发成功!"); - // 开启 loading 效果 - this.loading = true; - // 更新所有设备状态; - setTimeout(() => { - this.getPolicyList().finally(() => { - // 关闭 loading 效果 - this.loading = false; - }); - }, 5000); - } else { - // this.$modal.msgError("操作失败"); - console.log("应该更新状态的"); - // 更新所有设备状态; - this.getPolicyList(); - } - }) - .catch((error) => { - console.log("请求发生错误，更新设备状态", error); - // 更新所有设备状态; - this.getPolicyList(); - }); + // operationConrol([data]) + // .then((res) => { + // if (res.code == 200) { + // this.$modal.msgSuccess("指令下发成功!"); + // // 开启 loading 效果 + // this.loading = true; + // // 更新所有设备状态; + // setTimeout(() => { + // this.getPolicyList().finally(() => { + // // 关闭 loading 效果 + // this.loading = false; + // }); + // }, 5000); + // } else { + // // this.$modal.msgError("操作失败"); + // console.log("应该更新状态的"); + // // 更新所有设备状态; + // this.getPolicyList(); + // } + // }) + // .catch((error) => { + // console.log("请求发生错误，更新设备状态", error); + // // 更新所有设备状态; + // this.getPolicyList(); + // }); }, }, }; @@ -837,14 +905,20 @@ export default { .startClass { z-index: 10; position: absolute; - top: 2.9rem; - left: 3.4rem; width: 0.18rem; height: 0.18rem; border-radius: 50%; animation: blink 1s infinite; background-color: #38fc52 !important; } + .startClass1 { + top: 2.9rem; + left: 3.4rem; + } + .startClass2 { + top: 2.3rem; + left: 3.2rem; + } .water-flow3 { z-index: 10; position: absolute; @@ -1195,3 +1269,48 @@ export default { } } +