From 2fd78c1a21c0f19344f110c68148438cfbe3b105 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E8=90=8C?= <525441437@qq.com> Date: Mon, 20 Nov 2023 09:22:29 +0800 Subject: [PATCH 1/3] 1 --- src/assets/img/删 除.png | Bin 0 -> 400 bytes src/assets/img/查看.png | Bin 0 -> 480 bytes src/views/page/sensorSet-con.vue | 6 +++--- 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 src/assets/img/删 除.png create mode 100644 src/assets/img/查看.png diff --git a/src/assets/img/删 除.png b/src/assets/img/删 除.png new file mode 100644 index 0000000000000000000000000000000000000000..e4ba66512727c29a9b122719938d008ff34ebcab GIT binary patch literal 400 zcmV;B0dM|^P)Px$N=ZaPR5(wy(!Gw3Q541T--?0}ACd8q8Qq9tI*D$gB1SXSD7XNH`0OZ5G!hEa zQAxxt=nzAKS|dV2=L$?B3dz`VCg%}(y>FuNl>1r#bJkgV#h9lAHYt0+!R&S1>8t-a9mi!tg3F|Y?8wRco8c}W~yomKe~8plJ8Zu zJIQ)~)^d_VeU`bYsoww;t|f^4o)YT8&W-o)z-@-8Q?F6uu uzZGRQ$;$6~RaM*BLht9KOV@F)x%vg_bCiUvs`yO+0000Px$nn^@KR5(wC(?6)sQ5eVZ*T=skxr@T8i2MmTT-FxagobP$g`*}Xk=Q%NBwbpjxDAr>UKH?7U zCiycnKEofawNLc{%-j0BEhPz%#7I7hJ<*{Ki(C#zy?Yfh13dkRjkc z4&e#LlYE_?rL{I6mvIK4u_nonib-p2N6%iD>fqZ5303Js?8mtzmxh3=y~OiLE{?j~ zrS9$0UM1Nw1U$e&>`GF77`a+&3-KN0##p&h5=!?TY)|rHHbAeUv@gK2B$EZ0z;T>N zQZ~+3!3Mm>`y}PqpovFtvksDMngehhC(Gs}W$ge^R@RWL!<8gu)qktCHjZ1p2b+_8 z7y!DiZK&Z`j7PYD=a@v5U0Lg^RfD!W$-5~)htwOmjg>vHrmz4@`~GL2#O3&eeFd3% z3mr0sQ#Fk>RK433e6QqTNw2Vy{DX{YS|8teW!3bU)>`$dWY*(*I}$L58*96BXa55A WHI+;TqL+UF0000 -
+
-
传感器类型
+
传感器类型 （4-20ma传感器）
-- 2.40.1 From f88a36a07d39a5b94de03dc01cf04a80bb9eaa13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E8=90=8C?= <525441437@qq.com> Date: Mon, 20 Nov 2023 10:14:41 +0800 Subject: [PATCH 2/3] 1 --- src/views/page/status.vue | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/src/views/page/status.vue b/src/views/page/status.vue index 173f154..e60893e 100644 --- a/src/views/page/status.vue +++ b/src/views/page/status.vue @@ -35,8 +35,8 @@
-
进水泵
-
配肥泵
+
进水泵
+
配肥泵
@@ -328,7 +328,6 @@ export default { typeList.forEach((el, index) => { if (el.value == this.inputData1[typeCode]) { - console.log(this.inputData1[typeCode], 111, el.countType); countType = el.countType } }) @@ -502,23 +501,22 @@ export default { } } } - console.log(this.right2Index, 123); }, //进水泵和出水泵状态 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) + 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 -- 2.40.1 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 3/3] ~ --- 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%; -- 2.40.1