xiaomeng
/
wszhyWx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master

pull/92/head
孙萌 2024-01-12 17:14:34 +08:00
parent 20fd598b90 36a2253445
commit 1d5ab85ee0
1 changed files with 48 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/views/page/largeScreen.vue
View File

@ -38,7 +38,7 @@
</div> </div>
</div> </div>
<div class="content"> <div class="content">
<div class="left"> <div class="left" v-show="limitUserId != 5">
<div class="weatherStation"></div> <div class="weatherStation"></div>
<div class="weather"> <div class="weather">
@ -104,6 +104,26 @@
></div> ></div>
</div> </div>
</div> </div>
<div class="left" v-show="limitUserId == 5" style="height: calc(100% - 0.9rem);">
<div class="environmentData" style="height: 100%;overflow: hidden;">
<div class="e_title">温室环境数据</div>
<div class="detail" style="height: 100%;">
<vue-seamless
class="e_content e_content1"
:data="list"
:class-option="defaultOption"
>
<div class="item" v-for="(el, index) in list" :key="index">
<img :src="el.img" alt="" />
<div class="item_child">
<span>{{ el.name }}</span>
<span>{{ el.num }}</span>
</div>
</div>
</vue-seamless>
</div>
</div>
</div>
<div class="middle"> <div class="middle">
<div class="map"> <div class="map">
<div class="map1"> <div class="map1">
@ -455,7 +475,7 @@ export default {
defaultOption() { defaultOption() {
return { return {
step: 0.3, // 数值越大速度滚动越快 step: 0.3, // 数值越大速度滚动越快
limitMoveNum: 8, // 开始无缝滚动的数据量 this.dataList.length limitMoveNum: this.limitUserId != 5 ? 8 : 18, // 开始无缝滚动的数据量 this.dataList.length
hoverStop: true, // 是否开启鼠标悬停stop hoverStop: true, // 是否开启鼠标悬停stop
direction: 1, // 0向下 1向上 2向左 3向右 direction: 1, // 0向下 1向上 2向左 3向右
openWatch: true, // 开启数据实时监控刷新dom openWatch: true, // 开启数据实时监控刷新dom
@ -933,8 +953,11 @@ export default {
], ],
}; };
}, },
mounted() { beforeMount(){
this.login(); this.login();
},
mounted() {
// this.login();
this.getTime(); this.getTime();
@ -989,11 +1012,11 @@ export default {
this.getWeatherData(2023112911050004); this.getWeatherData(2023112911050004);
}else if (limitUserId == 5) { }else if (limitUserId == 5) {
// 石门 // 石门
this.get_weather_echart_data(2023042214250070); // this.get_weather_echart_data(2023042214250070);
this.get_thisWeekTemperature_echart_data(2023042214250070); // this.get_thisWeekTemperature_echart_data(2023042214250070);
this.get_environmentData(2023042214250070); this.get_environmentData(2023042214250070);
this.get_readControl_getState(2023042214250070); this.get_readControl_getState(2023042214250070);
this.getWeatherData(2023042214250070); // this.getWeatherData(2023042214250070);
} }
} }
}); });
@ -1250,7 +1273,6 @@ export default {
// id == 1 丽水; // id == 1 丽水;
// id == 5 石门; // id == 5 石门;
this.limitUserId = (res.data.data.filter(el=>el.id == 2 || el.id == 1 || el.id == 5))[0].id; this.limitUserId = (res.data.data.filter(el=>el.id == 2 || el.id == 1 || el.id == 5))[0].id;
if (this.limitUserId == 1) { if (this.limitUserId == 1) {
this.drag_boxHandler(); this.drag_boxHandler();
this.dataInit(userId, this.limitUserId); this.dataInit(userId, this.limitUserId);
@ -1549,11 +1571,29 @@ export default {
<style lang="scss"> <style lang="scss">
.environmentData { .environmentData {
.e_content { .e_content {
> div { > div {
width: 100% !important; width: 100% !important;
> div { > div {
width: 100% !important; width: 100% !important;
display: flex;
flex-wrap: wrap;
}
}
}
.e_content1{
height: 100%;
> div {
width: 100% !important;
height: 100%;
> div {
width: 100% !important;
height: 100%;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
} }
@ -1900,7 +1940,7 @@ export default {
.e_content { .e_content {
width: 100%; width: 100%;
height: 2.53rem; //height: 2.53rem;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;