From 3f04ee521b0bb8378528c462f7f29e77ead7cd3f Mon Sep 17 00:00:00 2001 From: pangdundun <664790274@qq.com> Date: Tue, 21 Nov 2023 15:36:22 +0800 Subject: [PATCH] ~ --- src/views/page/largeScreen.vue | 54 ++++---- src/views/page/largeScreen1.vue | 214 ++++++++++++++++++-------------- 2 files changed, 150 insertions(+), 118 deletions(-) diff --git a/src/views/page/largeScreen.vue b/src/views/page/largeScreen.vue index 93cdc762..8bc2fb91 100644 --- a/src/views/page/largeScreen.vue +++ b/src/views/page/largeScreen.vue @@ -2,13 +2,13 @@
{{ getNowTime() }}
@@ -316,7 +316,7 @@ export default {
player: null,
// 自动跳转和手动跳转切换
- autoPlay: false, //false 手动切换 true 自动切换
+ //autoPlay: false, //false 手动切换 true 自动切换
typeList: [
{
@@ -943,29 +943,29 @@ export default {
this.dataInit(userInfo.userid);
this.get_sel_eqbyid(userInfo.userid);
- this.autoPlay = JSON.parse(localStorage.getItem("autoPlay"));
- console.log(this.autoPlay);
- if (this.autoPlay == false) {
- clearInterval(this.timer_) && this.timer_;
- } else {
- this.timer_ = setTimeout(() => {
- this.$router.push({ path: "/largeScreen1" });
- }, 20000);
- }
+ // this.autoPlay = JSON.parse(localStorage.getItem("autoPlay"));
+ // console.log(this.autoPlay);
+ // if (this.autoPlay == false) {
+ // clearInterval(this.timer_) && this.timer_;
+ // } else {
+ // this.timer_ = setTimeout(() => {
+ // this.$router.push({ path: "/largeScreen1" });
+ // }, 20000);
+ // }
},
- autoPlay1() {
- this.autoPlay = false;
- clearInterval(this.timer_) && this.timer_;
- localStorage.setItem("autoPlay", JSON.stringify(this.autoPlay));
- },
- autoPlay2() {
- this.autoPlay = true;
- localStorage.setItem("autoPlay", JSON.stringify(this.autoPlay));
- this.timer_ = setTimeout(() => {
- this.$router.push({ path: "/largeScreen1" });
- }, 20000);
- },
+ // autoPlay1() {
+ // this.autoPlay = false;
+ // clearInterval(this.timer_) && this.timer_;
+ // localStorage.setItem("autoPlay", JSON.stringify(this.autoPlay));
+ // },
+ // autoPlay2() {
+ // this.autoPlay = true;
+ // localStorage.setItem("autoPlay", JSON.stringify(this.autoPlay));
+ // this.timer_ = setTimeout(() => {
+ // this.$router.push({ path: "/largeScreen1" });
+ // }, 20000);
+ // },
createVideoNew(accessToken, url, index) {
// console.log(accessToken, url, index, 111);
@@ -1309,7 +1309,7 @@ export default {
width: 4rem;
height: calc(100% - 0.66rem);
box-sizing: border-box;
- padding-top: 0.56rem;
+ // padding-top: 0.56rem;
position: absolute;
top: 0.56rem;
left: 0.66rem;
diff --git a/src/views/page/largeScreen1.vue b/src/views/page/largeScreen1.vue
index 6e22f025..e3ab2d3c 100644
--- a/src/views/page/largeScreen1.vue
+++ b/src/views/page/largeScreen1.vue
@@ -6,7 +6,10 @@
{{ getNowTime() }}
@@ -22,15 +25,15 @@
- 控制中心
-
-
+ 控制中心
+
+
{{ item.greenhouseName }}温室
@@ -51,7 +54,7 @@
+