From 9db095d1e177be6f90c031297e0d4ef9fc66ee40 Mon Sep 17 00:00:00 2001 From: pangdundun <664790274@qq.com> Date: Mon, 20 Nov 2023 10:46:32 +0800 Subject: [PATCH] ~ --- src/views/page/largeScreen1.vue | 289 ++++++++++++++++---------------- 1 file changed, 148 insertions(+), 141 deletions(-) diff --git a/src/views/page/largeScreen1.vue b/src/views/page/largeScreen1.vue index a7e0195..3a090fd 100644 --- a/src/views/page/largeScreen1.vue +++ b/src/views/page/largeScreen1.vue @@ -21,122 +21,126 @@
-
-
- - 2#温室 -
- -
-
-
- - 1#温室 -
- -
-
-
- - 3#温室 -
- -
-
-
- - 控制中心 -
- -
-
-
- - 4#温室 -
- -
-
-
- - 5#温室 -
- -
-
-
- - 6#温室 -
- -
+
+
+ + 控制中心 +
+ +
+
+ - - +
@@ -229,7 +233,7 @@ export default { left_: 2, popContentList: [], - popContentCurrent: -1, + popContentCurrent: 0, // 自动跳转和手动跳转切换 autoPlay: false, //false 手动切换 true 自动切换 @@ -611,7 +615,7 @@ export default { // 根据用户id查询对应的设备大数据信息 dataInit(userid) { this.api.Bigdata_getAllControl(userid).then((res) => { - // console.log("根据用户id查询对应的设备大数据信息", res); + console.log("根据用户id查询对应的设备大数据信息", res); this.popContentList = res.data.data; this.popContentList = this.popContentList.map((item) => { return { @@ -632,26 +636,27 @@ export default { }); }, - getTopOrLeft(name) { - if (name == "二号") { - // return "top:1rem;left:6.2rem"; - return "top:50%;left:50%;transform: translate(-50%,-50%);"; - } else if (name == "一号") { - // return "top:3.5rem;left:3.8rem"; - return "top:50%;left:50%;transform: translate(-50%,-50%);"; - } else if (name == "3号") { - // return "top:2rem;left:9rem"; - return "top:50%;left:50%;transform: translate(-50%,-50%);"; - } else if (name == "4号") { - // return "top:2rem;left:9.3rem"; - return "top:50%;left:50%;transform: translate(-50%,-50%);"; - } else if (name == "5") { - // return "top:3.5rem;left:6.5rem"; - return "top:50%;left:50%;transform: translate(-50%,-50%);"; - } else if (name == "6") { - // return "top:0.8rem;left:7.2rem"; - return "top:50%;left:50%;transform: translate(-50%,-50%);"; - } + getTopOrLeft() { + return "top:50%;left:50%;transform: translate(-50%,-50%);"; + // if (name == "二号") { + // // return "top:1rem;left:6.2rem"; + // return "top:50%;left:50%;transform: translate(-50%,-50%);"; + // } else if (name == "一号") { + // // return "top:3.5rem;left:3.8rem"; + // return "top:50%;left:50%;transform: translate(-50%,-50%);"; + // } else if (name == "3号") { + // // return "top:2rem;left:9rem"; + // return "top:50%;left:50%;transform: translate(-50%,-50%);"; + // } else if (name == "4号") { + // // return "top:2rem;left:9.3rem"; + // return "top:50%;left:50%;transform: translate(-50%,-50%);"; + // } else if (name == "5") { + // // return "top:3.5rem;left:6.5rem"; + // return "top:50%;left:50%;transform: translate(-50%,-50%);"; + // } else if (name == "6") { + // // return "top:0.8rem;left:7.2rem"; + // return "top:50%;left:50%;transform: translate(-50%,-50%);"; + // } }, // 数据单位 @@ -685,12 +690,13 @@ export default { let that = this; this.autoPlay = JSON.parse(localStorage.getItem("autoPlay")); - this.popContentCurrent = 0; + // this.popContentCurrent = 0; if (this.autoPlay == false) { clearInterval(that.timer2) && this.timer2; } else { this.timer2 = setInterval(() => { this.popContentCurrent++; + console.log('this.popContentCurrent',this.popContentCurrent); if (this.popContentCurrent > 7) { this.popContentCurrent = 0; this.$router.push({ path: "/largeScreen" }); @@ -728,6 +734,7 @@ export default { // }, handlerPop(id) { + console.log(id); this.popContentCurrent = id; }, @@ -964,6 +971,12 @@ export default { ); } + .pole_item_4 { + position: absolute; + top: 43%; + left: 42%; + } + .pole_item { width: 1.45rem; height: 1.8rem; @@ -1024,24 +1037,18 @@ export default { } .pole_item4 { - position: absolute; - top: 43%; - left: 42%; - } - - .pole_item5 { position: absolute; top: 29%; left: 76%; } - .pole_item6 { + .pole_item5 { position: absolute; top: 61%; left: 62%; } - .pole_item7 { + .pole_item6 { position: absolute; top: 1%; left: 62%;