diff --git a/src/assets/img/nav5.png b/src/assets/img/nav5.png
new file mode 100644
index 0000000..55dce5a
Binary files /dev/null and b/src/assets/img/nav5.png differ
diff --git a/src/assets/img/nav5_act.png b/src/assets/img/nav5_act.png
new file mode 100644
index 0000000..c347420
Binary files /dev/null and b/src/assets/img/nav5_act.png differ
diff --git a/src/views/page/largeScreen.vue b/src/views/page/largeScreen.vue
index b7a2929..1d25cc4 100644
--- a/src/views/page/largeScreen.vue
+++ b/src/views/page/largeScreen.vue
@@ -23,7 +23,7 @@
大数据平台
@@ -138,7 +138,8 @@
+ " v-for="(item, index) in dataList" :key="index" :style="styleItem"
+ @click="getCurrent(index, item)">
{{ item.greenhouseName + '温室' }}
@@ -174,23 +175,33 @@
1#风机
- {{ fanStatus.status[0] == 1 ? '打开' : '关闭' }}
+ {{ fanStatus.status[0] == 1 ? '打开' :
+ '关闭'
+ }}
2#风机
- {{ fanStatus.status[1] == 1 ? '打开' : '关闭' }}
+ {{ fanStatus.status[1] == 1 ? '打开' :
+ '关闭'
+ }}
3#风机
- {{ fanStatus.status[2] == 1 ? '打开' : '关闭' }}
+ {{ fanStatus.status[2] == 1 ? '打开' :
+ '关闭'
+ }}
4#风机
- {{ fanStatus.status[3] == 1 ? '打开' : '关闭' }}
+ {{ fanStatus.status[3] == 1 ? '打开' :
+ '关闭'
+ }}
5#风机
- {{ fanStatus.status[4] == 1 ? '打开' : '关闭' }}
+ {{ fanStatus.status[4] == 1 ? '打开' :
+ '关闭'
+ }}
@@ -662,28 +673,15 @@ export default {
}
},
mounted() {
- new Swiper(".middle_disasterWarningAnalysis", {
- slidesPerView: 4,
- spaceBetween: 10,
- navigation: {
- nextEl: ".right_button",
- prevEl: ".left_button",
- },
- });
- new Swiper(".mySwiper_video", {
- loop: true,
- navigation: {
- nextEl: ".swiper-button-next_video",
- prevEl: ".swiper-button-prev_video",
- },
- });
+
+
this.drag_boxHandler()
- // this.timer_ = setTimeout(() => {
- // this.$router.push({ path: '/largeScreen1' })
- // }, 6000);
+ this.timer_ = setTimeout(() => {
+ this.$router.push({ path: '/largeScreen1' })
+ }, 8000);
this.login()
@@ -694,8 +692,9 @@ export default {
this.getNowTime()
}, 1000)
},
- destroyed() {
- this.timer_ = null
+ beforeDestroy() {
+ clearInterval(this.timer_) && this.timer_
+ // this.timer_ = null
},
methods: {
// 根据用户id查询对应的设备大数据信息
@@ -703,6 +702,17 @@ export default {
this.api.Bigdata_getAllControl(userid).then(res => {
// console.log('根据用户id查询对应的设备大数据信息', res);
this.dataList = res.data.data
+ setTimeout(() => {
+ new Swiper(".middle_disasterWarningAnalysis", {
+ slidesPerView: 4,
+ spaceBetween: 10,
+ navigation: {
+ nextEl: ".right_button",
+ prevEl: ".left_button",
+ },
+ });
+ }, 100);
+
if (res.status === 200) {
res.data.data.forEach(el => {
// this.get_weather_echart_data(el.deviceId)
@@ -823,6 +833,20 @@ export default {
this.getVideoData(item.cameraSerialNumber, item.cameraChannelNumber, index)
// this.getVideoData("L18357958", "5")
+ setTimeout(() => {
+ new Swiper(".mySwiper_video", {
+ // loop: true,
+ autoplay: true,
+ autoplay: {
+ disableOnInteraction: false,
+ delay: 3000
+ },
+ navigation: {
+ nextEl: ".swiper-button-next_video",
+ prevEl: ".swiper-button-prev_video",
+ },
+ });
+ }, 100);
}
})
// console.log(this.get_sel_eqbyid_list);
@@ -965,7 +989,7 @@ export default {
this.$router.push({ path: '/realTime' });
},
- getCurrent(index,item) {
+ getCurrent(index, item) {
this.current = index;
// console.log(item,'00000000000000');
this.get_readControl_getState(item.deviceId)
diff --git a/src/views/page/largeScreen1.vue b/src/views/page/largeScreen1.vue
index 6eca68a..d78c067 100644
--- a/src/views/page/largeScreen1.vue
+++ b/src/views/page/largeScreen1.vue
@@ -546,9 +546,9 @@ export default {
mounted() {
this.drag_boxHandler()
- // this.timer1 = setTimeout(() => {
- // this.$router.push({ path: '/largeScreen' })
- // }, 20000);
+ this.timer1 = setTimeout(() => {
+ this.$router.push({ path: '/largeScreen' })
+ }, 24000);
@@ -565,10 +565,12 @@ export default {
}
}, 3000)
},
- destroyed() {
- this.timer = null;
- this.timer1 = null;
- this.timer2 = null
+ beforeDestroy() {
+ clearInterval(this.timer1) && this.timer1
+ clearInterval(this.timer2) && this.timer2
+ // this.timer = null;
+ // this.timer1 = null;
+ // this.timer2 = null
},
methods: {
// 根据用户id查询对应的设备大数据信息