Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master
孙萌
commit
31a3ee0da4
|
|
@ -2,13 +2,13 @@
|
|||
<div class="home">
|
||||
<div class="kuang">
|
||||
<div class="title">温室智慧云数据统计</div>
|
||||
<div class="auto_play">
|
||||
<!-- <div class="auto_play">
|
||||
<span :class="autoPlay ? '' : 'act'" @click="autoPlay1">手动播放</span>
|
||||
<span :class="autoPlay ? 'act' : ''" @click="autoPlay2">自动播放</span>
|
||||
</div>
|
||||
<div class="yuan">
|
||||
</div> -->
|
||||
<!-- <div class="yuan">
|
||||
<img src="../../assets/img/big.png" alt="" />
|
||||
</div>
|
||||
</div> -->
|
||||
<div class="calendar" v-if="time">
|
||||
<img src="../../assets/img/calendar.png" alt="" />
|
||||
<span>{{ getNowTime() }}</span>
|
||||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -6,7 +6,10 @@
|
|||
<div class="yuan" @click="toBack">
|
||||
<img src="../../assets/img/small.png" alt="" />
|
||||
</div>
|
||||
|
||||
<div class="auto_play">
|
||||
<span :class="autoPlay ? '' : 'act'" @click="autoPlay1">手动播放</span>
|
||||
<span :class="autoPlay ? 'act' : ''" @click="autoPlay2">自动播放</span>
|
||||
</div>
|
||||
<div class="calendar">
|
||||
<img src="../../assets/img/calendar.png" alt="" />
|
||||
<span>{{ getNowTime() }}</span>
|
||||
|
|
@ -79,17 +82,9 @@
|
|||
<template>
|
||||
<!-- <div class="pop_content" :style="getTopOrLeft(item.greenhouseName)" :key="index"
|
||||
v-if="popContentCurrent == index ? true : false"> -->
|
||||
<div
|
||||
class="pop_content"
|
||||
:style="getTopOrLeft(item.id)"
|
||||
v-show="popContentCurrent == item.id ? true : false"
|
||||
>
|
||||
<img
|
||||
class="close_img"
|
||||
src="../../assets/img/close.png"
|
||||
alt=""
|
||||
@click="cancelHandler"
|
||||
/>
|
||||
<div class="pop_content" :style="getTopOrLeft(item.id)"
|
||||
v-show="popContentCurrent == item.id ? true : false">
|
||||
<img class="close_img" src="../../assets/img/close.png" alt="" @click="cancelHandler" />
|
||||
<div class="p_video">
|
||||
<img :src="item.greenhouseImage" alt="" />
|
||||
</div>
|
||||
|
|
@ -116,20 +111,12 @@
|
|||
</div>
|
||||
<div class="line" style="margin-top: 0.2rem"></div>
|
||||
<div class="icon_item scroll">
|
||||
<div
|
||||
class="icon_item_child"
|
||||
v-for="(item1, index1) in item.childList"
|
||||
:key="index1"
|
||||
>
|
||||
<div class="icon_item_child" v-for="(item1, index1) in item.childList" :key="index1">
|
||||
<!-- <img :src="item.formula" alt=""> -->
|
||||
<img
|
||||
:src="
|
||||
require('../../assets/image/real-time-' +
|
||||
<img :src="require('../../assets/image/real-time-' +
|
||||
item1.formula +
|
||||
'.png')
|
||||
"
|
||||
alt=""
|
||||
/>
|
||||
" alt="" />
|
||||
<div>
|
||||
<span>{{ item1.environmentDataId }}</span>
|
||||
<span>{{
|
||||
|
|
@ -668,6 +655,24 @@ export default {
|
|||
}
|
||||
},
|
||||
|
||||
autoPlay1() {
|
||||
let that = this
|
||||
this.autoPlay = false;
|
||||
clearInterval(that.timer2) && this.timer2;
|
||||
localStorage.setItem("autoPlay", JSON.stringify(this.autoPlay));
|
||||
},
|
||||
autoPlay2() {
|
||||
this.autoPlay = true;
|
||||
localStorage.setItem("autoPlay", JSON.stringify(this.autoPlay));
|
||||
this.timer2 = setInterval(() => {
|
||||
this.popContentCurrent++;
|
||||
if (this.popContentCurrent > 7) {
|
||||
this.popContentCurrent = 0;
|
||||
// this.$router.push({ path: "/largeScreen" });
|
||||
}
|
||||
}, 3000);
|
||||
},
|
||||
|
||||
// 数据单位
|
||||
getTypeList(val) {
|
||||
let typeList1 = [];
|
||||
|
|
@ -708,7 +713,7 @@ export default {
|
|||
console.log('this.popContentCurrent', this.popContentCurrent);
|
||||
if (this.popContentCurrent > 7) {
|
||||
this.popContentCurrent = 0;
|
||||
this.$router.push({ path: "/largeScreen" });
|
||||
// this.$router.push({ path: "/largeScreen" });
|
||||
}
|
||||
}, 3000);
|
||||
}
|
||||
|
|
@ -850,17 +855,52 @@ export default {
|
|||
opacity: 0.89;
|
||||
text-shadow: 0.01 0.1rem 0.2rem rgba(0, 51, 103, 0.25);
|
||||
|
||||
background: linear-gradient(
|
||||
to bottom,
|
||||
background: linear-gradient(to bottom,
|
||||
#ffffff 45%,
|
||||
#e9f8ff 90%,
|
||||
#77baff 100%
|
||||
);
|
||||
#77baff 100%);
|
||||
-webkit-background-clip: text;
|
||||
-webkit-text-fill-color: transparent;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.auto_play {
|
||||
height: 0.56rem;
|
||||
position: absolute;
|
||||
top: 0.53rem;
|
||||
left: 1.4rem;
|
||||
z-index: 99999999;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
>span {
|
||||
width: 0.8rem;
|
||||
height: 0.3rem;
|
||||
background: rgba(14, 91, 165, 0.1);
|
||||
border: 1px solid rgba(97, 152, 209, 0.65);
|
||||
margin-right: 0.1rem;
|
||||
font-size: 0.18rem;
|
||||
font-family: MicrosoftYaHei;
|
||||
font-weight: 400;
|
||||
color: #70d0ee;
|
||||
text-align: center;
|
||||
line-height: 0.3rem;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.act {
|
||||
background: linear-gradient(-35deg,
|
||||
#56a8d5 0%,
|
||||
rgba(0, 55, 110, 0.75) 50%,
|
||||
#56a8d5 100%);
|
||||
border: 1px solid rgba(122, 225, 255, 0.75);
|
||||
font-size: 0.18rem;
|
||||
font-family: MicrosoftYaHei;
|
||||
font-weight: 400;
|
||||
color: #fff;
|
||||
}
|
||||
}
|
||||
|
||||
.yuan {
|
||||
width: 0.56rem;
|
||||
height: 0.56rem;
|
||||
|
|
@ -935,25 +975,21 @@ export default {
|
|||
top: 0;
|
||||
left: 0;
|
||||
z-index: 99;
|
||||
-webkit-mask-image: linear-gradient(
|
||||
90deg,
|
||||
-webkit-mask-image: linear-gradient(90deg,
|
||||
transparent 0%,
|
||||
blue 7%,
|
||||
blue 87%,
|
||||
transparent 97%
|
||||
);
|
||||
transparent 97%);
|
||||
|
||||
.map1 {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
// background: url('../assets/img/map.png') center no-repeat;
|
||||
// background-size: 100% 100%;
|
||||
-webkit-mask-image: linear-gradient(
|
||||
transparent 4%,
|
||||
-webkit-mask-image: linear-gradient(transparent 4%,
|
||||
blue 15%,
|
||||
blue 86%,
|
||||
transparent 100%
|
||||
);
|
||||
transparent 100%);
|
||||
overflow: hidden;
|
||||
position: absolute;
|
||||
|
||||
|
|
@ -961,23 +997,19 @@ export default {
|
|||
width: 100%;
|
||||
height: 100%;
|
||||
position: absolute;
|
||||
-webkit-mask-image: linear-gradient(
|
||||
90deg,
|
||||
-webkit-mask-image: linear-gradient(90deg,
|
||||
transparent 4%,
|
||||
blue 18%,
|
||||
blue 88%,
|
||||
transparent 100%
|
||||
);
|
||||
transparent 100%);
|
||||
|
||||
.drag_img {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
-webkit-mask-image: linear-gradient(
|
||||
transparent 0%,
|
||||
-webkit-mask-image: linear-gradient(transparent 0%,
|
||||
blue 13%,
|
||||
blue 73%,
|
||||
transparent 97%
|
||||
);
|
||||
transparent 97%);
|
||||
}
|
||||
|
||||
.pole_item_4 {
|
||||
|
|
|
|||
Loading…
Reference in New Issue