From ee447e1d7f43d8be297df37ebe23b9c768799064 Mon Sep 17 00:00:00 2001 From: mh Date: Thu, 5 Jun 2025 17:46:54 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E6=8E=A7=E7=95=8C=E9=9D=A2=E3=80=81?= =?UTF-8?q?=E4=B8=BB=E6=9C=BA=E8=AF=A6=E6=83=85=E3=80=81=E6=B8=A9=E6=B9=BF?= =?UTF-8?q?=E5=BA=A6=E5=9B=BE=E8=A1=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/aircAndWindc/awSysMonitor/index.vue | 2 +- src/views/centerairC/sysControl/index.vue | 3 +- .../centerairC/sysMonitor/hostDetails.vue | 47 ++++++++++++++++--- .../centerairC/sysMonitor/monitorCenter.vue | 2 +- src/views/temSys/temMonitor/index.vue | 28 +++++------ 5 files changed, 58 insertions(+), 24 deletions(-) diff --git a/src/views/aircAndWindc/awSysMonitor/index.vue b/src/views/aircAndWindc/awSysMonitor/index.vue index 6a9d185..54ab96a 100644 --- a/src/views/aircAndWindc/awSysMonitor/index.vue +++ b/src/views/aircAndWindc/awSysMonitor/index.vue @@ -984,7 +984,7 @@ export default { // 关闭 loading 效果 this.loading = false; }); - }, 5000); + }, 500); } else { // this.$modal.msgError("操作失败"); console.log("应该更新状态的"); diff --git a/src/views/centerairC/sysControl/index.vue b/src/views/centerairC/sysControl/index.vue index 12e8327..6789e5b 100644 --- a/src/views/centerairC/sysControl/index.vue +++ b/src/views/centerairC/sysControl/index.vue @@ -188,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; diff --git a/src/views/centerairC/sysMonitor/hostDetails.vue b/src/views/centerairC/sysMonitor/hostDetails.vue index dab932e..840bfdf 100644 --- a/src/views/centerairC/sysMonitor/hostDetails.vue +++ b/src/views/centerairC/sysMonitor/hostDetails.vue @@ -382,10 +382,10 @@ export default { Number(item.paramType) ); }); - // // 根据 ordernum 进行排序 - // this.rightHostData.sort((a, b) => { - // return Number(a.ordernum) - Number(b.ordernum); - // }); + // 根据 ordernum 进行排序 + this.rightHostData.sort((a, b) => { + return Number(a.orderNum) - Number(b.orderNum); + }); this.hostData.forEach((item) => { // // 右边主机参数 温度12 // if (item.paramType === "12") { @@ -497,10 +497,43 @@ export default { hostListClass(paramType) { for (let i = 0; i < this.hostData.length; i++) { const item = this.hostData[i]; - if (item.paramType === paramType && Number(item.curValue) !== 0) { - return true; - } + if (item.paramType === paramType && typeof item.curValue === "string" && /[\u4e00-\u9fa5]/.test(item.curValue)) { + switch (item.paramType) { + case "1": // 运行状态 + if (item.curValue === '运行') { + return true; + } + break; + case "2": // 启停 + if (item.curValue === '启动' && item.otherName.includes('启停')) { + return true; + } + break; + case "5": // 故障 + if (item.curValue === '正常') { + return true; + } + break; + case "6": // 手自动切换 + if (item.curValue === '自动') { + return true; + } + break; + case "22": // 本地远程切换 + if (item.curValue === '远程') { + return true; + } + break; + default: + return false; + break; + } + } else { + if (item.paramType === paramType && Number(item.curValue) !== 0) { + return true; + } } + } // 否则 return false; }, diff --git a/src/views/centerairC/sysMonitor/monitorCenter.vue b/src/views/centerairC/sysMonitor/monitorCenter.vue index 695cd29..b443669 100644 --- a/src/views/centerairC/sysMonitor/monitorCenter.vue +++ b/src/views/centerairC/sysMonitor/monitorCenter.vue @@ -1304,7 +1304,7 @@ export default { // 遍历 properties 数组，如果当前对象paramType === 2并且item.collectValue !== "0.00"则便是启停控制中的开启 for (let i = 0; i < properties.length; i++) { const item = properties[i]; - if (item.paramType === "2" && Number(item.collectValue) !== 0) { + if (item.paramType === "2" && Number(item.collectValue) !== 0 && item.collectName.includes('启停')) { return true; } } diff --git a/src/views/temSys/temMonitor/index.vue b/src/views/temSys/temMonitor/index.vue index 913b9df..e39a19a 100644 --- a/src/views/temSys/temMonitor/index.vue +++ b/src/views/temSys/temMonitor/index.vue @@ -559,19 +559,15 @@ export default { type: "line", // 拐点大小 symbolSize: 8, - data: this.chartData1, - name: "温度", + data: this.chartData2, + name: "湿度", //折线颜色 itemStyle: { - color: "#1a69f1", //折线点的颜色 - }, - lineStyle: { - color: "#1a69f1", //折线点的颜色 + color: "#00CED1", //折线的颜色 }, smooth: false, // 不显示折线点 showSymbol: true, - // 区域填充样式，添加渐变背景 areaStyle: { color: { type: "linear", @@ -582,11 +578,11 @@ export default { colorStops: [ { offset: 0, - color: "rgba(26, 105, 241, 0.5)", // 渐变起始颜色 + color: "rgba(0, 206, 209, 0.5)", // 渐变起始颜色 }, { offset: 1, - color: "rgba(26, 105, 241, 0)", // 渐变结束颜色 + color: "rgba(0, 206, 209, 0)", // 渐变结束颜色 }, ], global: false, // 缺省为 false @@ -597,15 +593,19 @@ export default { type: "line", // 拐点大小 symbolSize: 8, - data: this.chartData2, - name: "湿度", + data: this.chartData1, + name: "温度", //折线颜色 itemStyle: { - color: "#00CED1", //折线的颜色 + color: "#1a69f1", //折线点的颜色 + }, + lineStyle: { + color: "#1a69f1", //折线点的颜色 }, smooth: false, // 不显示折线点 showSymbol: true, + // 区域填充样式，添加渐变背景 areaStyle: { color: { type: "linear", @@ -616,11 +616,11 @@ export default { colorStops: [ { offset: 0, - color: "rgba(0, 206, 209, 0.5)", // 渐变起始颜色 + color: "rgba(26, 105, 241, 0.5)", // 渐变起始颜色 }, { offset: 1, - color: "rgba(0, 206, 209, 0)", // 渐变结束颜色 + color: "rgba(26, 105, 241, 0)", // 渐变结束颜色 }, ], global: false, // 缺省为 false