diff --git a/src/views/page/largeScreen.vue b/src/views/page/largeScreen.vue index 93cdc76..8bc2fb9 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 6e22f02..e3ab2d3 100644 --- a/src/views/page/largeScreen1.vue +++ b/src/views/page/largeScreen1.vue @@ -6,7 +6,10 @@
- +
+ 手动播放 + 自动播放 +
{{ getNowTime() }} @@ -22,15 +25,15 @@
-
- - 控制中心 -
- -
+
+ + 控制中心 +
+ +