Merge pull request '~' (#78) from pc-master into portal

Reviewed-on: #78
portal
xiaomeng 2023-12-18 08:17:57 +00:00
commit 7402397d13
2 changed files with 32 additions and 2 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 994 KiB

View File

@ -1,5 +1,7 @@
<template> <template>
<div class="home"> <div class="home">
<div class="park" @click="handlerOther">{{other_show ? '退':''}}</div>
<div class="other" v-show="other_show"></div>
<div class="kuang"> <div class="kuang">
<div class="title">温室智慧云数据统计</div> <div class="title">温室智慧云数据统计</div>
<!-- <div class="auto_play"> <!-- <div class="auto_play">
@ -410,6 +412,7 @@ export default {
}, },
data() { data() {
return { return {
other_show:false,
list: [], list: [],
device_item_current: 0, device_item_current: 0,
menu_current: false, menu_current: false,
@ -888,6 +891,10 @@ export default {
clearInterval(this.timer_) && this.timer_; clearInterval(this.timer_) && this.timer_;
}, },
methods: { methods: {
handlerOther(){
this.other_show = !this.other_show
},
// id // id
dataInit(userid, limitUserId) { dataInit(userid, limitUserId) {
this.api.Bigdata_getAllControl(userid).then((res) => { this.api.Bigdata_getAllControl(userid).then((res) => {
@ -920,8 +927,8 @@ export default {
this.getWeatherData(2023042214250027); this.getWeatherData(2023042214250027);
} else if (limitUserId == 2) { } else if (limitUserId == 2) {
// //
this.get_weather_echart_data(2023112911050004); this.get_weather_echart_data(2023072517320001);
this.get_thisWeekTemperature_echart_data(2023112911050004); this.get_thisWeekTemperature_echart_data(2023072517320001);
this.get_environmentData(2023112911050004); this.get_environmentData(2023112911050004);
this.get_readControl_getState(2023112911050004); this.get_readControl_getState(2023112911050004);
this.getWeatherData(2023112911050004); this.getWeatherData(2023112911050004);
@ -1426,6 +1433,29 @@ export default {
padding-bottom: 0.1rem; padding-bottom: 0.1rem;
position: relative; position: relative;
.park{
position: absolute;
top: .2rem;
right: .65rem;
z-index: 99999;
color: #fff;
font-size: .2rem;
font-family: Microsoft YaHei;
font-weight: bold;
color: #7ABAFF;
}
.other{
width: 100%;
height: 100%;
position: fixed;
top: -2px;
left: 0;
z-index: 9999;
background: url('../../assets/img/map2.jpg') center no-repeat;
background-size: 100% 100%;
}
.kuang { .kuang {
width: 100%; width: 100%;
height: 100%; height: 100%;