From 79f70fd075dd6d6288f458832be849fc64664448 Mon Sep 17 00:00:00 2001
From: pangdundun <664790274@qq.com>
Date: Thu, 16 Nov 2023 15:07:31 +0800
Subject: [PATCH 1/4] ~
---
src/views/page/largeScreen.vue | 64 ++++++++++++++++++++++++---------
src/views/page/largeScreen1.vue | 12 +++----
2 files changed, 54 insertions(+), 22 deletions(-)
diff --git a/src/views/page/largeScreen.vue b/src/views/page/largeScreen.vue
index 01542eb..4f749ef 100644
--- a/src/views/page/largeScreen.vue
+++ b/src/views/page/largeScreen.vue
@@ -150,41 +150,48 @@
-
+
-
卷膜天窗
+
风机
-
打开
+
{{ fanStatus.open == 1 ? '自动控制' : '手动控制' }}
位置50%
-
菜单
+
菜单
-
+
1#风机
- 开启
+ {{ fanStatus.status[0] == 1 ? '打开' : '关闭' }}
2#风机
- 开启
+ {{ fanStatus.status[1] == 1 ? '打开' : '关闭' }}
3#风机
- 开启
+ {{ fanStatus.status[2] == 1 ? '打开' : '关闭' }}
4#风机
- 开启
+ {{ fanStatus.status[3] == 1 ? '打开' : '关闭' }}
5#风机
- 开启
+ {{ fanStatus.status[4] == 1 ? '打开' : '关闭' }}
- 6#风机
- 开启
+
+
+
{{ item.name }}
+
+
{{ item.open == 1 ? '自动控制' : '手动控制' }}
+
+
位置{{ item.progress }}%
+
菜单
+
@@ -262,7 +269,12 @@ export default {
// 获取摄像头得地址 Copy
getVideoDataList: [],
- url: ''
+ url: '',
+
+ fanStatus: {
+ name: '风机', open: 0, status: []
+ },
+ statusList: [],
}
},
mounted() {
@@ -285,9 +297,9 @@ export default {
this.drag_boxHandler()
- // this.timer_ = setTimeout(() => {
- // this.$router.push({ path: '/largeScreen1' })
- // }, 6000);
+ this.timer_ = setTimeout(() => {
+ this.$router.push({ path: '/largeScreen1' })
+ }, 6000);
this.login()
@@ -420,10 +432,30 @@ export default {
})
},
+ padString(str, length) {
+ return str.padStart(length, '0');
+ },
+
+
// 控制器状态值获取 Copy
get_readControl_getState(deviceId) {
this.api.readControl_getState(deviceId).then(res => {
console.log('控制器状态值获取 Copy', res);
+ if (res.data.code == 200) {
+ this.fanStatus.open = res.data.data['1023']
+ this.fanStatus.status = []
+ var num = res.data.data['1024']
+ var num1 = this.padString(num.toString(2), 5)
+ var openListNew = []
+ openListNew = num1.split("")
+ this.fanStatus.status = openListNew.reverse()
+ this.statusList = []
+ for (var i = 0; i < 4; i++) {
+ var statusData = { name: `顶卷膜${i + 1}`, open: res.data.data[(1025 + (i * 3))], progress: res.data.data[(1027 + (i * 3))], index: res.data.data[(1026 + (i * 3))] }
+ this.statusList.push(statusData)
+ }
+ console.log(this.statusList);
+ }
})
},
diff --git a/src/views/page/largeScreen1.vue b/src/views/page/largeScreen1.vue
index 83000c8..6333a83 100644
--- a/src/views/page/largeScreen1.vue
+++ b/src/views/page/largeScreen1.vue
@@ -191,15 +191,15 @@ export default {
mounted() {
this.drag_boxHandler()
- // this.timer1 = setTimeout(() => {
- // this.$router.push({ path: '/largeScreen' })
- // }, 20000);
+ this.timer1 = setTimeout(() => {
+ this.$router.push({ path: '/largeScreen' })
+ }, 20000);
- // this.timer = setInterval(() => {
- // this.dialogVisible = !this.dialogVisible
- // }, 3000);
+ this.timer = setInterval(() => {
+ this.dialogVisible = !this.dialogVisible
+ }, 3000);
this.login()
From 3140c05744576f46d269b234b6df2cc7ccb969a8 Mon Sep 17 00:00:00 2001
From: pangdundun <664790274@qq.com>
Date: Thu, 16 Nov 2023 15:43:23 +0800
Subject: [PATCH 2/4] ~
---
src/views/page/largeScreen.vue | 26 ++++++++++++++++++++------
src/views/page/largeScreen1.vue | 12 ++++++------
2 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/src/views/page/largeScreen.vue b/src/views/page/largeScreen.vue
index 4f749ef..ef322ca 100644
--- a/src/views/page/largeScreen.vue
+++ b/src/views/page/largeScreen.vue
@@ -11,11 +11,11 @@