From d25457df51a8ea85799af2b049e6e5d1fb42b035 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E8=90=8C?= <525441437@qq.com>
Date: Fri, 26 Jan 2024 08:57:56 +0800
Subject: [PATCH] 1
---
src/views/page/status.vue | 43 ++++++++++++++++++++-------------------
1 file changed, 22 insertions(+), 21 deletions(-)
diff --git a/src/views/page/status.vue b/src/views/page/status.vue
index c232c5c..5c39c2c 100644
--- a/src/views/page/status.vue
+++ b/src/views/page/status.vue
@@ -35,8 +35,8 @@
@@ -140,7 +140,7 @@ export default {
data() {
return {
pageTimer: null,
- left1Act: -1,
+ left1Act: [0,0],
openType: '',
left2List: [
{
@@ -323,9 +323,9 @@ export default {
},
countType4(data) {
-var num = (data - 1000) / 10
-return num.toFixed(2)
-},
+ var num = (data - 1000) / 10
+ return num.toFixed(2)
+ },
getTypeData(dataCode, typeCode) {
var typeList = this.$store.state.typeList
@@ -509,19 +509,20 @@ return num.toFixed(2)
},
//进水泵和出水泵状态
getData30() {
- var number = this.padString(this.inputData['30'].toString(2), 2)
- if (Number(number[0])) {
- this.left1Act = 1
- }
- if (Number(number[1])) {
- this.left1Act = 0
- }
- if (Number(number[0])&&Number(number[1])) {
- this.left1Act = 3
- }
- else {
- this.left1Act = -1
- }
+ var number = this.padString(this.inputData['30'].toString(2), 2)
+ this.left1Act=number
+ // if (Number(number[0])) {
+ // this.left1Act = 1
+ // }
+ // if (Number(number[1])) {
+ // this.left1Act = 0
+ // }
+ // if (Number(number[0]) && Number(number[1])) {
+ // this.left1Act = 3
+ // }
+ // else {
+ // this.left1Act = -1
+ // }
},
dataInit() {
const that = this
@@ -546,7 +547,7 @@ return num.toFixed(2)
this.getData30() //数据30/进水出水泵
this.getData29()//数据29 启动方式/信号
-
+
this.getleft2List()//获取左下角数据
this.getrightList3()//获取又下角数据
this.getcenterBottom()//获取电磁阀
@@ -559,7 +560,7 @@ return num.toFixed(2)
week: week[this.inputData[5]],
time: h + ":" + m,
}
- this.$bus.$emit('refreshTime',time)
+ this.$bus.$emit('refreshTime', time)
} else {
this.$message.error(res.data.msg);
}
--
2.40.1