From 0b2d16e19451037ba2e42ef2e6b8e33fb712594b Mon Sep 17 00:00:00 2001
From: pangdundun <664790274@qq.com>
Date: Fri, 17 Nov 2023 19:26:35 +0800
Subject: [PATCH] ~

---
 src/views/page/largeScreen.vue  |  8 +++++---
 src/views/page/largeScreen1.vue | 22 +++++++++-------------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/views/page/largeScreen.vue b/src/views/page/largeScreen.vue
index 1d25cc4..d6600cd 100644
--- a/src/views/page/largeScreen.vue
+++ b/src/views/page/largeScreen.vue
@@ -679,9 +679,7 @@ export default {
 
     this.drag_boxHandler()
 
-    this.timer_ = setTimeout(() => {
-      this.$router.push({ path: '/largeScreen1' }) 
-    }, 8000);
+
 
 
     this.login()
@@ -938,6 +936,10 @@ export default {
       let userInfo = JSON.parse(localStorage.getItem('userInfo'));
       this.dataInit(userInfo.userid)
       this.get_sel_eqbyid(userInfo.userid)
+
+      this.timer_ = setTimeout(() => {
+        this.$router.push({ path: '/largeScreen1' })
+      }, 30000);
     },
 
     createVideoNew(accessToken, url, index) {
diff --git a/src/views/page/largeScreen1.vue b/src/views/page/largeScreen1.vue
index d78c067..f39b55c 100644
--- a/src/views/page/largeScreen1.vue
+++ b/src/views/page/largeScreen1.vue
@@ -185,7 +185,7 @@ export default {
       left_: 2,
 
       popContentList: [],
-      popContentCurrent: 5,
+      popContentCurrent: 0,
 
       typeList: [{
         label: '无意义的传感器',
@@ -546,11 +546,6 @@ export default {
   mounted() {
     this.drag_boxHandler()
 
-    this.timer1 = setTimeout(() => {
-      this.$router.push({ path: '/largeScreen' })
-    }, 24000);
-
-
 
     // this.timer = setInterval(() => {
     //   this.dialogVisible = !this.dialogVisible
@@ -562,11 +557,12 @@ export default {
       this.popContentCurrent++
       if (this.popContentCurrent > 5) {
         this.popContentCurrent = 0
+        this.$router.push({ path: '/largeScreen' })
       }
     }, 3000)
   },
   beforeDestroy() {
-    clearInterval(this.timer1) && this.timer1
+    // clearInterval(this.timer1) && this.timer1
     clearInterval(this.timer2) && this.timer2
     // this.timer = null;
     // this.timer1 = null;
@@ -605,27 +601,27 @@ export default {
       if (name == '二号') {
         // this.top_ = 1;
         // this.left_ = 6.2
-        return 'top:1rem;left:8rem'
+        return 'top:1rem;left:6.2rem'
       } else if (name == '一号') {
         // this.top_ = 3.5;
         // this.left_ = 3.8
-        return 'top:3.5rem;left:4.8rem'
+        return 'top:3.5rem;left:3.8rem'
       } else if (name == '3号') {
         // this.top_ = 2;
         // this.left_ = 9
-        return 'top:2rem;left:11.5rem'
+        return 'top:2rem;left:9rem'
       } else if (name == '4号') {
         // this.top_ = 2;
         // this.left_ = 9.3
-        return 'top:2rem;left:14rem'
+        return 'top:2rem;left:9.3rem'
       } else if (name == '5') {
         // this.top_ = 3.5;
         // this.left_ = 6.5
-        return 'top:6.5rem;left:10.5rem'
+        return 'top:3.5rem;left:6.5rem'
       } else if (name == '6') {
         // this.top_ = 0.8;
         // this.left_ = 7.2
-        return 'top:0.8rem;left:11rem'
+        return 'top:0.8rem;left:7.2rem'
       }
     },